优化

src/views/EquipmentTypeConfig/index.vue

@@ -88,10 +88,10 @@
             @submit.native.prevent
             style="height: 32px;"
           >
-            <el-form-item label="装备名称" prop="deviceName">
+            <el-form-item label="" prop="keyWord">
               <el-input
-                v-model="queryParams.deviceName"
+                v-model="queryParams.keyWord"
-                placeholder="请输入装备名称"
+                placeholder="请输入关键字"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
@@ -168,10 +168,10 @@
                 align="center"
                 show-overflow-tooltip
                 prop="level6"
-                label="装备名称"
+                label="类型分支"
                 min-width="200"
               />
-              <el-table-column
+              <!-- <el-table-column
                 align="center"
                 show-overflow-tooltip
                 prop="createBy"
@@ -198,7 +198,7 @@
                 prop="updateTime"
                 label="更新时间"
                 min-width="200"
-              />
+              /> -->
 
               <el-table-column align="center" fixed="right" min-width="200" label="操作">
                 <template slot-scope="scope">
@@ -654,7 +654,7 @@ export default {
         deptName: undefined,
         status: undefined,
         typeId: undefined,
-        deviceName: undefined,
+        keyWord: undefined,
         pageNum: 1,
         pageSize: 10
       },
@@ -1389,7 +1389,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
-      this.queryParams.deviceName = undefined
+      this.queryParams.keyWord = undefined
       this.queryParams.pageNum = 1
       this.queryParams.pageSize = 10
       this.getDeviceList()

src/views/index.vue

@@ -2903,8 +2903,8 @@ export default {
 .flowchart-container {
   background-image: url('../assets/images/index-bg.png');
   background-size: 100% 100%;
-  margin-top: 88px;
+  padding-top: 88px;
-  height: calc(100vh - 172px);
+  height: calc(100vh - 86px);
   display: flex;
   flex-direction: column;
   justify-content: center;

src/views/material/ma/type/index.vue

@@ -80,10 +80,10 @@
             @submit.native.prevent
             style="height: 32px;"
           >
-            <el-form-item label="规格型号" prop="typeName">
+            <el-form-item label="" prop="keyWord">
               <el-input
-                v-model="queryParams.typeName"
+                v-model="queryParams.keyWord"
-                placeholder="请输入规格型号"
+                placeholder="请输入关键字"
                 clearable
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
@@ -289,7 +289,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        typeName: undefined
+        keyWord: undefined
       },
 
       // 表单校验
@@ -387,6 +387,7 @@ export default {
       this.dateRange = []
       this.resetForm('queryForm')
       this.queryParams.typeId = undefined
+      this.queryParams.keyWord = undefined
       this.queryParams.pageNum = 1
       this.queryParams.pageSize = 10
       this.$refs.tree.setCurrentKey(null)

src/views/toolsManage/codeToolsLedger/index.vue

@@ -503,7 +503,7 @@ export default {
         identifyCode: [{ required: true, message: '请输入原始编码', trigger: 'blur' }],
         certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
         inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
-        purchaseInvoicesList: [{ required: true, message: '请上传采购发票', trigger: 'change' }],
+        // purchaseInvoicesList: [{ required: true, message: '请上传采购发票', trigger: 'change' }],
       },
       manufacturerSelect: [],
       // 上传相关配置（从FileUpload组件迁移）

src/views/toolsManage/toolsApplication/components/AddCode.vue

@@ -317,7 +317,7 @@ export default {
         { label: '原始编码', prop: 'identifyCode', width: 150, required: true },
         { label: '合格证', prop: 'certificates', width: 100, required: true },
         { label: '检测证书', prop: 'inspectionReports', width: 100, required: true },
-        { label: '发票', prop: 'purchaseInvoices', width: 100, required: true },
+        { label: '发票', prop: 'purchaseInvoices', width: 100 },
       ],
       dialogList: [],
       options: [],
@@ -479,10 +479,10 @@ export default {
             this.$message.error(`第${i + 1}行检测证书不能为空`)
             return
           }
-          if (item.purchaseInvoices.length == 0) {
+          // if (item.purchaseInvoices.length == 0) {
-            this.$message.error(`第${i + 1}行采购发票不能为空`)
+          //   this.$message.error(`第${i + 1}行采购发票不能为空`)
-            return
+          //   return
-          }
+          // }
         }
         this.isLoading = true
         if (!this.dialogForm.applyId) {