From 80989ae609bb5dc01191a583a30f8d08ca4f31f3 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 11 十一月 2023 18:43:17 +0800
Subject: [PATCH] 中心  工区  工段修改

---
 src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 4c933fc..991fb92 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -31,7 +31,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item
-              label="瀵硅薄閮ㄩ棬"
+              label="浣跨敤閮ㄩ棬"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
@@ -42,14 +42,23 @@
                 @search="onDepartList()"
                 :read-only="true"
                 v-decorator="['useDepartName', validatorRules.useDepartName]"
-              /> -->
+              /> 
               <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                 :tree-data="treeData"
-                placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 tree-default-expand-all
                 v-decorator="['useId', validatorRules.useId ]"
+              />-->
+
+              <j-dict-select-tag
+                allow-clear
+                :disabled="disableSubmit"
+                :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'"
+                :triggerChange="true"
+                dictCode="sys_depart,depart_name,id,del_flag!='1'"
+                v-decorator="['useId', {}]"
               />
             </a-form-item>
           </a-col>
@@ -201,6 +210,7 @@
       rowKey='id'
       :columns="columns"
       :dataSource="dataSource"
+      :pagination="false"
     >
       <template
         v-for="col in columns"
@@ -320,21 +330,21 @@
           align: 'center',
           dataIndex: 'detectionStandard'
         },
-        {
-          title: '鍚堟牸鑼冨洿',
-          align: 'center',
-          dataIndex: 'acceptabilityLimit'
-        },
-        {
-          title: '鏂规硶',
-          align: 'center',
-          dataIndex: 'inspectionMethodName'
-        },
-        {
-          title: '宸ュ叿',
-          align: 'center',
-          dataIndex: 'inspectionTool'
-        },
+        // {
+        //   title: '鍚堟牸鑼冨洿',
+        //   align: 'center',
+        //   dataIndex: 'acceptabilityLimit'
+        // },
+        // {
+        //   title: '鏂规硶',
+        //   align: 'center',
+        //   dataIndex: 'inspectionMethodName'
+        // },
+        // {
+        //   title: '宸ュ叿',
+        //   align: 'center',
+        //   dataIndex: 'inspectionTool'
+        // },
         {
           title: '鍛ㄦ湡',
           align: 'center',
@@ -418,6 +428,7 @@
         revise: '/eam/inspectionStandard/revise',
         getReviseVersion: "/eam/inspectionStandard/getReviseVersion",
         loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
+        getNum: '/eam/sysIdentity/getNumNew'
       },
 
       dataSource: [],
@@ -458,6 +469,7 @@
 
     add() {
       this.edit({ dailyInspectionStandardDetaillist: [] })
+      this.getSeq()
     },
 
     edit(record) {
@@ -494,6 +506,14 @@
       }
     },
 
+    getSeq() {
+      getAction(this.url.getNum, { type: 'DailylnspectionStandard', length: 4 }).then(res => {
+        if (res.success) {
+          this.form.setFieldsValue({ "num": res.result })
+        }
+      })
+    },
+
     initOptions() {
       getAction(this.url.loadOptions).then(res => {
         if (res.success) {

--
Gitblit v1.9.3