Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/software/librarymanage/modal/PreviewMaterals.vue

@@ -68,7 +68,7 @@ export default {
         papertype: "A4",
         printername: "", // 打印机名称 为空则为默认打印机
         printertype: "url", // base64 ,normal,url
-        url: info.fileUrl, // url
+        url: this.api + info.samplePath, // url
         success: (res) => {
           if (res && res.code == "00000") {
             _this.$message.success("打印成功");

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -27,7 +27,7 @@
         <el-form-item label="事项编码">
           <el-input disabled size="small" v-model="form.matterNo"></el-input>
         </el-form-item>
-        <el-form-item v-if="!form.id" label="公共库" prop="pub">
+        <el-form-item label="公共库" prop="pub">
           <el-switch
             class="tableScopeSwitch"
             inactive-text="不加"

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -392,7 +392,6 @@ export default {
         this.leftTotal = total;
         this.recommendCount = recommendCount;
         this.$refs.leftTable.bodyWrapper.scrollTop = 0;
-        console.log(data);
       }
     },
     // 新增事项