From 4152e5544886fddfd5e6e56f246603ad6beab1f0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 四月 2025 10:13:14 +0800
Subject: [PATCH] art: 设备管理-周保-查询条件添加

---
 src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue |   77 +++++++++++++++++++++++---------------
 1 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
index 8dee667..8c5b9f0 100644
--- a/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
@@ -33,7 +33,7 @@
         <a-row :gutter="24">
           <a-col :span="8">
             <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenanceDate" label="淇濆吇鏃ユ湡">
-              <a-date-picker placeholder="璇烽�夋嫨淇濆吇鏃ユ湡" v-model="model.maintenanceDate" format="YYYY-MM-DD"
+              <a-date-picker placeholder="璇烽�夋嫨璁″垝淇濆吇鏃ユ湡" v-model="model.maintenanceDate" format="YYYY-MM-DD"
                              style="width: 100%" />
             </a-form-model-item>
           </a-col>
@@ -96,7 +96,7 @@
       maintenanceCategory: 'WEEK_MAINTENANCE',
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 5 }
+        sm: { span: 6 }
       },
       wrapperCol: {
         xs: { span: 24 },
@@ -113,14 +113,17 @@
       confirmLoading: false,
       validatorRules: {
         equipmentId: [
-          {}
+          { required: true, message: '璇烽�夋嫨璁惧!' }
+        ],
+        maintenanceDate: [
+          { required: true, message: '璇烽�夋嫨璁″垝淇濆吇鏃ユ湡!' }
         ]
       },
       url: {
         add: '/eam/weekMaintenanceOrder/add',
         edit: '/eam/weekMaintenanceOrder/edit',
         standardDetail: '/eam/eamMaintenanceStandardDetail/queryList',
-        detail: '/eam/weekMaintenanceOrderDetail/queryList',
+        detail: '/eam/weekMaintenanceOrderDetail/queryList'
       },
       detail: {
         loading: false,
@@ -188,17 +191,18 @@
   methods: {
     add() {
       //鍒濆鍖栭粯璁ゅ��
-      this.model = {};
-      this.visible = true;
-      this.editable = false;
-      this.detail.dataSource = [];
+      this.model = {}
+      this.visible = true
+      this.editable = false
+      this.detail.dataSource = []
     },
     edit(record) {
+      // debugger
       this.model = Object.assign({}, record)
       this.visible = true
-      this.editable = true;
-      this.detail.dataSource = [];
-      this.loadDetail(record.id);
+      this.editable = true
+      this.detail.dataSource = []
+      this.loadDetail(record.id)
     },
     close() {
       this.$emit('close')
@@ -207,19 +211,18 @@
     },
     async handleOk() {
       const that = this
-      let errMap = await that.$refs.editableDetailTable.validateTable();
-      if(errMap){
-        this.$message.warning("鏁版嵁鏍￠獙澶辫触锛�");
-        return;
+      let errMap = await that.$refs.editableDetailTable.validateTable()
+      if (errMap) {
+        this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
+        return
       }
       // 瑙﹀彂琛ㄥ崟楠岃瘉
       this.$refs.form.validate(valid => {
         if (valid) {
-          debugger
-          let tableData = that.$refs.editableDetailTable.getTableData();
-          let removeData = that.$refs.editableDetailTable.getDeleteData();
-          that.model.tableDetailList = [...tableData];
-          that.model.removeDetailList = [...removeData];
+          let tableData = that.$refs.editableDetailTable.getTableData()
+          let removeData = that.$refs.editableDetailTable.getDeleteData()
+          that.model.tableDetailList = [...tableData]
+          that.model.removeDetailList = [...removeData]
 
           that.confirmLoading = true
           let httpurl = ''
@@ -251,10 +254,22 @@
       this.close()
     },
     autocompleteForm(selectObj) {
-      this.model.standardName = selectObj.standardName
-      this.model.maintenancePeriod = selectObj.maintenancePeriod
-      this.model.standardId = selectObj.id
-      this.loadStandardDetail(selectObj.id);
+      //鏍囧噯鍚嶇О锛屼繚鍏诲懆鏈熶笉鍒锋柊瑙ｅ喅鍔炴硶
+      //鍔炴硶涓�
+      const newObj = {
+        standardName: selectObj.standardName,
+        maintenancePeriod: selectObj.maintenancePeriod,
+        standardId : selectObj.id,
+      };
+      this.model = Object.assign({}, newObj, this.model)
+      //鍔炴硶浜�
+      // this.$set(this.model, 'standardName', selectObj.standardName)
+      // this.$set(this.model, 'maintenancePeriod', selectObj.maintenancePeriod)
+      // this.$set(this.model, 'standardId', selectObj.id)
+      // console.log('model', this.model)
+      if (!this.model.id) {
+        this.loadStandardDetail(selectObj.id)
+      }
     },
     //鍔犺浇璇︽儏鏁版嵁
     loadStandardDetail(standardId) {
@@ -273,13 +288,13 @@
     },
     //鏍囧噯閫夋嫨鍙樺寲
     loadDetail(orderId) {
-        if (orderId) {
-          getAction(this.url.detail, { orderId: orderId }).then(res => {
-            if (res.success) {
-              this.detail.dataSource = [...res.result]
-            }
-          })
-        }
+      if (orderId) {
+        getAction(this.url.detail, { orderId: orderId }).then(res => {
+          if (res.success) {
+            this.detail.dataSource = [...res.result]
+          }
+        })
+      }
     }
 
   }

--
Gitblit v1.9.3