From 341d52f08b95e538691426b1e216064636b56eb6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 16 6月 2024 10:06:35 +0800
Subject: [PATCH] 修复

---
 iwara-scada-web/src/views/main/EquipmentBaseInfo/editForm.vue |   50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/iwara-scada-web/src/views/main/EquipmentBaseInfo/editForm.vue b/iwara-scada-web/src/views/main/EquipmentBaseInfo/editForm.vue
index 1a91468..1ed08dd 100644
--- a/iwara-scada-web/src/views/main/EquipmentBaseInfo/editForm.vue
+++ b/iwara-scada-web/src/views/main/EquipmentBaseInfo/editForm.vue
@@ -52,6 +52,14 @@
         <a-form-item label="璁惧鍒堕�犲晢" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="璇疯緭鍏ヨ澶囧埗閫犲晢" v-decorator="['equipmentManufacturer']" />
         </a-form-item>
+        <a-form-item label="娓呮礂娑叉坊鍔犳椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-date-picker
+            style="width: 100%"
+            placeholder="璇烽�夋嫨娓呮礂娑叉坊鍔犳椂闂�"
+            v-decorator="['detergentAddtime']"
+            @change="onChangeDetergentAddtimeTime"
+          />
+        </a-form-item>
         <a-form-item label="娓呮礂娑叉洿鎹㈡椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-date-picker
             style="width: 100%"
@@ -76,7 +84,14 @@
             v-decorator="['detergentChangeCycle']"
           />
         </a-form-item> -->
-
+        <a-form-item label="鍒囧墛娑叉坊鍔犳椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-date-picker
+            style="width: 100%"
+            placeholder="鍒囧墛娑叉竻娲楁恫娣诲姞鏃堕棿"
+            v-decorator="['cuttingFluidAddTime']"
+            @change="onChangeCuttingFluidAddTime"
+          />
+        </a-form-item>
         <a-form-item label="鍒囧墛娑叉洿鎹㈡椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-date-picker
             style="width: 100%"
@@ -136,7 +151,9 @@
       ProcessSelectData: [],
       record: {},
       detergentchangetimeDateString: '',
+      detergentAddtimeString:'',
       cuttingFluidChangeTimeDateString: '',
+      cuttingFluidAddTimeString: '',
       knifeToolChangeTimeDateString: '',
       visible: false,
       confirmLoading: false,
@@ -175,20 +192,22 @@
             record.detergentchangetime != null ? moment(record.detergentchangetime, 'YYYY-MM-DD') : '',
           cuttingFluidChangeTime:
             record.cuttingFluidChangeTime != null ? moment(record.cuttingFluidChangeTime, 'YYYY-MM-DD') : '',
+
+            detergentAddtime:
+            record.detergentAddtime != null ? moment(record.detergentAddtime, 'YYYY-MM-DD') : '',
+            cuttingFluidAddTime:
+            record.cuttingFluidAddTime != null ? moment(record.cuttingFluidAddTime, 'YYYY-MM-DD') : '',
+
           cuttingFluidChangeAlertThreshold: record.cuttingFluidChangeAlertThreshold,
           tactTime: record.tactTime
-          // knifeToolChangeTime: record.knifeToolChangeTime != null ? moment(record.knifeToolChangeTime, 'YYYY-MM-DD') : ''
-          // knifeToolChangeTime:moment(record.knifeToolChangeTime != null ? record.knifeToolChangeTime : "", 'YYYY-MM-DD'),
         })
 
         //瑙﹀彂浜嬩欢
         this.onChangedetergentchangetime(null,record.detergentchangetime != null ? dateFormat(record.detergentchangetime, 'YYYY-mm-dd') : '');
         this.onChangecuttingFluidchangetime(null,record.cuttingFluidChangeTime != null ? dateFormat(record.cuttingFluidChangeTime, 'YYYY-mm-dd') : '');
+        this.onChangeCuttingFluidAddTime(null,record.cuttingFluidAddTime != null ? dateFormat(record.cuttingFluidAddTime, 'YYYY-mm-dd') : '');
+        this.onChangeDetergentAddtimeTime(null,record.detergentAddtime != null ? dateFormat(record.detergentAddtime, 'YYYY-mm-dd') : '');
       })
-      // this.form.getFieldDecorator('detergentchangetime', { initialValue: moment(record.detergentchangetime, 'YYYY-MM-DD') })
-      // this.detergentchangetimeDateString = moment(record.detergentchangetime).format('YYYY-MM-DD')
-      // this.form.getFieldDecorator('knifeToolChangeTime', { initialValue: moment(record.knifeToolChangeTime, 'YYYY-MM-DD') })
-      // this.knifeToolChangeTimeDateString = moment(record.knifeToolChangeTime).format('YYYY-MM-DD')
     },
     handleSubmit() {
       const {
@@ -207,8 +226,14 @@
             }
           }
           values.detergentchangetime = this.detergentchangetimeDateString
-          this.record.detergentchangetime = this.detergentchangetimeDateString
+          this.record.detergentchangetime = this.detergentAddtimeString
+          this.record.detergentAddtime = this.detergentchangetimeDateString
           this.record.cuttingFluidChangeTime = this.cuttingFluidChangeTimeDateString
+          this.record.cuttingFluidAddTime = this.cuttingFluidAddTimeString
+
+          this.record.cuttingFluidAddTime = this.cuttingFluidAddTimeString
+          this.record.detergentAddtime = this.detergentAddtimeString
+
           // values.knifeToolChangeTime = this.knifeToolChangeTimeDateString
           // this.record.knifeToolChangeTime = this.knifeToolChangeTimeDateString
           EquipmentBaseInfoEdit(this.record)
@@ -234,9 +259,16 @@
       //debugger
       this.detergentchangetimeDateString = dateString
     },
+    onChangeDetergentAddtimeTime(date, dateString) {
+      //debugger
+      this.detergentAddtimeString = dateString
+    },
 
     onChangecuttingFluidchangetime(date, dateString) {
       this.cuttingFluidChangeTimeDateString = dateString
+    },
+    onChangeCuttingFluidAddTime(date, dateString) {
+      this.cuttingFluidAddTimeString = dateString
     },
     onChangeknifeToolChangeTime(date, dateString) {
       this.knifeToolChangeTimeDateString = dateString
@@ -246,7 +278,9 @@
       this.record.detergentchangetime = ''
       this.record.cuttingFluidChangeTime = ''
       this.detergentchangetimeDateString = ''
+      this.detergentAddtimeString = ''
       this.cuttingFluidChangeTimeDateString = ''
+      this.cuttingFluidAddTimeString = ''
       this.visible = false
     }
   }

--
Gitblit v1.9.3