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/mdc/base/modules/alarmManager/alarmManagerEdit.vue |   47 +++++++++++++++++++++++++++++++++--------------
 1 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
index 4186f79..54261aa 100644
--- a/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
+++ b/src/views/mdc/base/modules/alarmManager/alarmManagerEdit.vue
@@ -5,20 +5,20 @@
       <a-spin :spinning="confirmLoading">
         <a-form :form="form">
           <a-row :gutter="24">
-            <a-col :span="24">
-              <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <!--<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">-->
-                  <a-input :disabled='disabled'  placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>
-              </a-form-item>
-            </a-col>
+            <!--<a-col :span="24">-->
+              <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+                <!--&lt;!&ndash;<a-input v-decorator="['equipmentId', validatorRules.equipmentId]">&ndash;&gt;-->
+                  <!--<a-input :disabled='disabled'  placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>-->
+              <!--</a-form-item>-->
+            <!--</a-col>-->
             <a-col :span="24">
               <a-form-item label="鎶ヨ鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input  placeholder="璇疯緭鍏ユ姤璀﹀彿" v-decorator="['alarmCode', validatorRules.alarmCode]"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="鎶ヨ鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input  placeholder="璇疯緭鍏ユ姤璀︽弿杩�" v-decorator="['alarmDescription', validatorRules.alarmDescription]"></a-input>
+              <a-form-item label="鎶ヨ鍐呭" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input  placeholder="璇疯緭鍏ユ姤璀﹀唴瀹�" v-decorator="['alarmContent', validatorRules.alarmContent]"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span='24'>
@@ -31,7 +31,7 @@
             <a-col :span="24">
               <a-form-item label="鏄惁杩囨护" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <!--<j-switch  v-model="model.isUse"></j-switch>-->
-                <a-switch v-model="isUse"/>
+                <a-switch  v-model="isUse"/>
                 <!--<a-radio-group v-model="model.isUse">-->
                   <!--<a-radio :value="1">-->
                     <!--鏄�-->
@@ -103,10 +103,20 @@
           //     required: true, message: '璇烽�夋嫨鐝埗!',
           //   }],
           // },
+          alarmCode:{
+            rules: [{
+              required: true, message: '璇疯緭鍏ユ姤璀﹀彿!',
+            }],
+          },
+          alarmContent:{
+            rules: [{
+              required: true, message: '璇疯緭鍏ユ姤璀﹀唴瀹�!',
+            }],
+          },
         },
         url: {
           // add: '/mdc/alarmInfo/add',
-          edit: '/mdc/alarmInfo/edit',
+          edit: '/mdc/mdcAlarmInfo/edit',
           //椹卞姩绫诲瀷
           initShiftList: '/mdc/mdcequipment/driveTypeSelected',
         },
@@ -124,7 +134,8 @@
         this.model = Object.assign({}, record)
         this.visible = true
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'equipmentId', 'alarmCode', 'alarmDescription','driveType'))
+          this.isUse=record.isUse===0?true:false
+          this.form.setFieldsValue(pick(this.model, 'alarmCode', 'alarmContent','driveType'))
         })
       },
       initShiftList() {
@@ -146,7 +157,7 @@
           if (!err) {
             that.confirmLoading = true
             let formData = Object.assign(this.model, values)
-            formData.isUse = this.isUse ? "1" : "2"
+            formData.isUse = this.isUse ? "0" : "-1"
             let obj
             if (!this.model.id) {
               // obj = postAction(this.url.add, formData)
@@ -157,11 +168,19 @@
             }
             obj.then((res) => {
               if (res.success) {
-                that.$message.success("娣诲姞鎴愬姛")
+                // that.$message.success("娣诲姞鎴愬姛")
+                that.$notification.success({
+                  message:'娑堟伅',
+                  description:"淇敼鎴愬姛"
+                });
                 // that.$message.success(res.message)
                 that.$emit('ok', res.result)
               } else {
-                that.$message.warning(res.message)
+                // that.$message.warning(res.message)
+                that.$notification.warning({
+                  message:'娑堟伅',
+                  description:res.message
+                });
               }
             }).finally(() => {
               that.confirmLoading = false

--
Gitblit v1.9.3