Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/software/basics/BasicsSet.vue

@@ -56,7 +56,7 @@
           >+ 添加词汇</el-button
         >
       </div>
-      <div class="mt20">
+      <!-- <div class="mt20">
         <p class="title mb20">空白打印材料展示数量</p>
         <el-input
           size="small"
@@ -66,7 +66,7 @@
         >
           <template slot="suffix">个</template>
         </el-input>
-      </div>
+      </div> -->
       <div class="mt50">
         <el-button size="small" type="primary" @click="handleOk"
           >确定</el-button
@@ -84,13 +84,12 @@ export default {
   data() {
     return {
       siteId: local.getLocal("sampleSiteId")
-          ? local.getLocal("sampleSiteId")
-          : "",
+        ? local.getLocal("sampleSiteId")
+        : "",
       inputVisible: false,
       inputValue: "",
       baseSetInfo: {
         hotwords: [],
-        printDisplay: "",
       },
     };
   },
@@ -101,13 +100,11 @@ export default {
     // 获取基础设置
     async getBaseSetInfo() {
       let res = await getBaseSetInfo({
-          siteId: this.siteId
-    });
-      console.log("res:",res)
+        siteId: this.siteId,
+      });
       if (res.data.code === 1) {
-        console.log("len:",res.data.data.data)
-        if(res.data.data.data.length>0){
-          this.baseSetInfo.hotwords=res.data.data.data[0].hotwords.split(",")
+        if (res.data.data.data.length > 0) {
+          this.baseSetInfo.hotwords = res.data.data.data[0].hotwords.split(",");
           this.baseSetInfo.printDisplay = res.data.data.data[0].printDisplay;
         }
       }
@@ -142,7 +139,7 @@ export default {
       let res = await saveBaseSet({
         ...this.baseSetInfo,
         hotwords: this.baseSetInfo.hotwords.join(","),
-        siteId:this.siteId
+        siteId: this.siteId,
       });
       let { code, msg } = res.data;
       if (code === 1) {

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

@@ -154,7 +154,6 @@ export default {
     handleChange(val) {
       let name = this.departmentList.find((v) => v.deptNumber === val).name;
       this.form.deptName = name;
-      console.log(this.form.deptName);
     },
   },
 };