From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收

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

diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 2100db5..6126aad 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -37,12 +37,12 @@
             >
               <!-- <a-input-search
                 :disabled="disableSubmit"
-                placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬"
+                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
                 enter-button
                 @search="onDepartList()"
                 :read-only="true"
                 v-decorator="['useDepartName', validatorRules.useDepartName]"
-              /> -->
+              /> 
               <a-tree-select
                 style="width: 100%"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -50,6 +50,15 @@
                 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>
@@ -99,21 +108,21 @@
               <a-input
                 allow-clear
                 :disabled="true"
-                :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+                :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栫爜/鍚嶇О/鍨嬪彿'"
                 v-decorator="['equipmentId', validatorRules.equipmentId ]"
               />
             </a-form-item>
           </a-col>
           <!-- <a-col :span="12">
             <a-form-item
-              label="瀵硅薄閮ㄩ棬Id"
+              label="浣跨敤閮ㄩ棬Id"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
               <a-input
                 allow-clear
                 :disabled="true"
-                :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞¢儴闂╥d'"
+                :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
                 v-decorator="['useId', validatorRules.useId ]"
               />
             </a-form-item>
@@ -466,7 +475,7 @@
     edit(record) {
       let that = this;
       that.getInspectionCycle()
-      that.initOptions();
+      // that.initOptions();
       that.dataSource = [];
       that.form.resetFields();
       that.model = Object.assign({}, record);
@@ -527,7 +536,7 @@
 
     onDepartList() {
       this.$refs.DepartList.list();
-      this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+      this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
     },
     sendDepartRecord(data) {
       this.dataSource = [];
@@ -554,10 +563,12 @@
           let obj;
           if (!this.model.id) {
             formData.versionStatus = '1'
+            formData.approvalStatus = '1'
             obj = postAction(this.url.add, formData);
           } else {
             if (this.isRevise) {
               formData.versionStatus = '1'
+              formData.approvalStatus = '1'
               obj = postAction(this.url.revise, formData);
             } else {
               obj = requestPut(this.url.edit, formData, { id: this.model.id });

--
Gitblit v1.9.3