From 1392d8f3def2c21e7a6fc15cf3f68fc1056ec0b6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 19:01:20 +0800
Subject: [PATCH] 三不原则

---
 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue |   90 ++++++++++++++++++++++++++++++--------------
 1 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index cb49c1c..6d15f94 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -8,7 +8,7 @@
             <a-col :span="24">
               <a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
                 <a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
-                                @search="deviceSearch" enter-button/>
+                                @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
               </a-form-item>
             </a-col>
           </a-row>
@@ -44,6 +44,7 @@
         </a-form>
       </a-spin>
       <device-calend-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-calend-list-model>
+      <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
     </a-modal>
   </div>
 </template>
@@ -62,10 +63,11 @@
   } from '@/api/api'
 
   import Calendar from 'vue-calendar-component';
+  import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'
 
   export default {
     name: 'ShiftInfoModel',
-    components: {DeviceCalendListModel,Calendar},
+    components: { SelectDeviceDrawer, DeviceCalendListModel,Calendar},
     props: {},
     data() {
       return {
@@ -115,11 +117,18 @@
         },
         confirmLoading: false,        form: this.$form.createForm(this),
         validatorRules: {
-          // shiftId:{
-          //   rules: [{
-          //     required: true, message: '璇烽�夋嫨鐝埗!',
-          //   }],
-          // },
+          equipmentId:{
+            rules:[
+              {
+                required:true,message:'璇烽�夋嫨璁惧缁�!'
+              }
+            ]
+          },
+          shiftId:{
+            rules: [{
+              required: true, message: '璇烽�夋嫨鐝埗!',
+            }],
+          }
         },
         url: {
           add: '/mdc/mdcDeviceCalendar/add',
@@ -232,9 +241,10 @@
         this.value = value;
       },
       deviceSearch() {
-        this.$refs.deviceRepairListModel.openPage()
-        this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
-        this.$refs.deviceRepairListModel.disableSubmit = false
+        this.$refs.selectDeviceDrawer.visible = true
+        this.$refs.selectDeviceDrawer.selectedRowKeys = []
+        this.$refs.selectDeviceDrawer.selectedRows = []
+        this.$refs.selectDeviceDrawer.checkedKeys = this.form.getFieldValue('equipmentId') ? this.form.getFieldValue('equipmentId').split(',') : []
       },
       getDeviceRows(val) {
         console.log("========",val);
@@ -300,27 +310,34 @@
           if (!err) {
             that.confirmLoading = true
             let formData = Object.assign(this.model, values)
-
             formData.dateList = this.sendDte
-            postAction(this.url.settingCalendar, formData).then((res) => {
-              if (res.success) {
-                // that.$message.success(res.message)
-                that.$notification.success({
-                  message:'娑堟伅',
-                  description:res.message
-                });
-                that.$emit('ok', res.result)
-              } else {
-                // that.$message.warning(res.message)
-                that.$notification.warning({
-                  message:'娑堟伅',
-                  description:res.message
-                });
-              }
-            }).finally(() => {
+            if(formData.dateList&&formData.dateList.length>0){
+              postAction(this.url.settingCalendar, formData).then((res) => {
+                if (res.success) {
+                  // that.$message.success(res.message)
+                  that.$notification.success({
+                    message:'娑堟伅',
+                    description:res.message
+                  });
+                  that.$emit('ok', res.result)
+                } else {
+                  // that.$message.warning(res.message)
+                  that.$notification.warning({
+                    message:'娑堟伅',
+                    description:res.message
+                  });
+                }
+              }).finally(() => {
+                that.confirmLoading = false
+                that.close()
+              })
+            }else{
               that.confirmLoading = false
-              that.close()
-            })
+              that.$notification.warning({
+                message:'娑堟伅',
+                description:'璇烽�夋嫨鐢熸晥鏃堕棿!'
+              });
+            }
           }
         })
       },
@@ -328,6 +345,21 @@
         this.close()
       },
 
+      /**
+       * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+       * @param data 宸查�夋嫨鐨勮澶�
+       */
+      selectOK(data) {
+        // let params = {}
+        // params.equipmentIdList = []
+        // for (var a = 0; a < data.length; a++) {
+        //   params.equipmentIdList.push(data[a])
+        // }
+        console.log('data=', data)
+        this.form.setFieldsValue({
+          equipmentId: data.join(',')
+        })
+      }
     }
   }
 </script>

--
Gitblit v1.9.3