Merge remote-tracking branch 'origin/main'

src/views/spares/manufacturerinfo.vue

@@ -125,6 +125,10 @@
             },
             {
               label: "执行标准",
+              prop: "executiveStandards",
+            },
+            {
+              label: "审批状态",
               prop: "approvalStatus",
               type: "select",
               dicUrl: "/api/daf-system/dict/dictionary?code=check_status",
@@ -132,6 +136,7 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+              disabled: true
             },
           ]
         },
@@ -158,6 +163,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.approvalStatus = 1;
         add(row).then(() => {
           done();
           this.onLoad(this.page);

src/views/spares/materialclassification.vue

@@ -65,6 +65,11 @@
               label: "物资分配码",
               prop: "code",
               search: true,
+              rules: [{
+                required: true,
+                message: "请输入物资分配码",
+                trigger: "blur"
+              }]
             },
             {
               label: "物资类型",
@@ -76,6 +81,11 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+              rules: [{
+                required: true,
+                message: "请输入物资分配码",
+                trigger: "blur"
+              }]
             },
             {
               label: "创建时间",

src/views/spares/supplierinfo.vue

@@ -123,8 +123,20 @@
               label: "经营范围",
               prop: "businessScope",
             },
+            {
+              label: "付款条约",
+              prop: "paymentTerms",
+            },
+            {
+              label: "价格条款",
+              prop: "priceTerms",
+            },
             {
               label: "执行标准",
+              prop: "executiveStandards",
+            },
+            {
+              label: "审批状态",
               prop: "approvalStatus",
               type: "select",
               dicUrl: "/api/daf-system/dict/dictionary?code=check_status",
@@ -132,14 +144,7 @@
                 label: "dictValue",
                 value: "dictKey"
               },
-            },
+              disabled: true
-            {
-              label: "付款条约",
-              prop: "paymentTerms",
-            },
-            {
-              label: "价格条款",
-              prop: "priceTerms",
             },
           ]
         },
@@ -166,6 +171,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.approvalStatus = 1;
         add(row).then(() => {
           done();
           this.onLoad(this.page);

src/views/spares/warehouse.vue

@@ -67,16 +67,28 @@
               label: "仓库编号",
               prop: "code",
               search: true,
+              disabled: true,
+              placeholder: '仓库编号',
             },
             {
               label: "仓库名称",
               search: true,
               prop: "name",
+              rules: [{
+                required: true,
+                message: "请输入仓库名称",
+                trigger: "blur"
+              }]
             },
             {
               label: "仓库地址",
               prop: "address",
               search: true,
+              rules: [{
+                required: true,
+                message: "请输入仓库地址",
+                trigger: "blur"
+              }]
             },
             {
               label: "仓库类型",
@@ -88,6 +100,11 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+              rules: [{
+                required: true,
+                message: "请输入仓库类型",
+                trigger: "blur"
+              }]
             },
             {
               label: "仓库责任人",
@@ -102,10 +119,20 @@
                 desc: 'code'
               },
               dicUrl: "/api/daf-user/listBySearch?search={{key}}",
+              rules: [{
+                required: true,
+                message: "请输入仓库责任人",
+                trigger: "blur"
+              }]
             },
             {
               label: "联系电话",
               prop: "contactNumber",
+              rules: [{
+                required: true,
+                message: "请输入联系电话",
+                trigger: "blur"
+              }]
             },
             {
               label: "审批状态",
@@ -116,6 +143,8 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+              placeholder: '审批状态',
+              disabled: true
             },
           ]
         },
@@ -142,6 +171,7 @@
     },
     methods: {
       rowSave(row, done, loading) {
+        row.approvalStatus = 1;
         add(row).then(() => {
           done();
           this.onLoad(this.page);

src/views/wel/index.vue

@@ -89,6 +89,7 @@
                 <div class="el-collapse-item">
                   <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
                 </div>
+                <br>
                 <div class="el-collapse-item">
                   <div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
                 </div>
@@ -98,6 +99,7 @@
                 <div class="el-collapse-item">
                   <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
                 </div>
+                <br>
                 <div class="el-collapse-item">
                   <div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
                 </div>
@@ -107,6 +109,7 @@
                 <div class="el-collapse-item">
                   <div class="el-collapse-item__header"><span class="el-collapse-span">一致性 Consistency</span></div>
                 </div>
+                <br>
                 <div class="el-collapse-item">
                   <div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
                 </div>
@@ -176,7 +179,7 @@
 
   .notification-container-audit {
     margin-top: 15px;
-    max-width: 96%;
+    max-width: 97%;
     padding: 14px;
     height: 475px;
     background-color: #f7f7f7;
@@ -187,14 +190,6 @@
     font-size: 24px;
     margin-bottom: 10px;
   }
-  .notification-content {
-    background-color: #fff; /* 白色内容背景 */
-    padding: 10px;
-    border-radius: 4px;
-  }
-  .notification-message {
-    font-size: 16px;
-  }
   .notification-title {
     font-size: 20px;
   }