From 9fbbbe80e6b48a3bd9544a24295971b8da9bc337 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 21 七月 2025 19:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/repair/modules/EamReportThreeNoSpareModal.Style#Drawer.vue |  141 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 106 insertions(+), 35 deletions(-)

diff --git "a/src/views/eam/repair/modules/EamReportThreeNoSpareModal.Style\043Drawer.vue" "b/src/views/eam/repair/modules/EamReportThreeNoSpareModal.Style\043Drawer.vue"
index 178cd65..00c1a60 100644
--- "a/src/views/eam/repair/modules/EamReportThreeNoSpareModal.Style\043Drawer.vue"
+++ "b/src/views/eam/repair/modules/EamReportThreeNoSpareModal.Style\043Drawer.vue"
@@ -1,76 +1,147 @@
 <template>
   <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <eam-report-three-no-spare-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></eam-report-three-no-spare-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">鍏抽棴</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">鎻愪氦</a-button>
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible">
+
+    <a-spin :spinning="confirmLoading">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
+      
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="鍒犻櫎鏍囪">
+          <a-input-number v-model="model.delFlag" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="causeAnalysis" label="鍘熷洜鍒嗘瀽">
+          <a-input placeholder="璇疯緭鍏ュ師鍥犲垎鏋�" v-model="model.causeAnalysis" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isTrainingEducation" label="鍩硅鏁欒偛;鏄� 鍚�">
+          <a-input placeholder="璇疯緭鍏ュ煿璁暀鑲�;鏄� 鍚�" v-model="model.isTrainingEducation" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="trainingFormat" label="鍩硅褰㈠紡">
+          <a-input placeholder="璇疯緭鍏ュ煿璁舰寮�" v-model="model.trainingFormat" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="trainingContent" label="鍩硅鍐呭">
+          <a-input placeholder="璇疯緭鍏ュ煿璁唴瀹�" v-model="model.trainingContent" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="trainingUser" label="鍩硅浜�">
+          <a-input placeholder="璇疯緭鍏ュ煿璁汉" v-model="model.trainingUser" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="trainingUserTime" label="鍩硅鏃堕棿">
+          <a-input placeholder="璇疯緭鍏ュ煿璁椂闂�" v-model="model.trainingUserTime" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportId" label="鎶ヤ慨ID">
+          <a-input placeholder="璇疯緭鍏ユ姤淇甀D" v-model="model.reportId" />
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧ID">
+          <a-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="model.equipmentId" />
+        </a-form-model-item>
+		
+      </a-form-model>
+    </a-spin>
+
+    <div class="drawer-bootom-button">
+      <a-button type="primary" @click="handleOk">纭畾</a-button>
+      <a-button type="primary" @click="handleCancel">鍙栨秷</a-button>
     </div>
   </a-drawer>
 </template>
 
 <script>
-
-  import EamReportThreeNoSpareForm from './EamReportThreeNoSpareForm'
+  import { httpAction } from '@/api/manage'
+  import moment from "moment"
 
   export default {
-    name: 'EamReportThreeNoSpareModal',
-    components: {
-      EamReportThreeNoSpareForm
-    },
+    name: "EamReportThreeNoSpareModal",
     data () {
       return {
         title:"鎿嶄綔",
-        width:800,
         visible: false,
-        disableSubmit: false
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules:{
+        },
+        url: {
+          add: "/eam/eamReportThreeNoSpare/add",
+          edit: "/eam/eamReportThreeNoSpare/edit",
+        },
       }
+    },
+    created () {
     },
     methods: {
       add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
+        //鍒濆鍖栭粯璁ゅ��
+        this.edit({});
       },
       edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
+        this.model = Object.assign({}, record);
+        this.visible = true;
       },
       close () {
         this.$emit('close');
         this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
+        this.$refs.form.clearValidate();
       },
       handleOk () {
-        this.$refs.realForm.submitForm();
+        const that = this;
+        // 瑙﹀彂琛ㄥ崟楠岃瘉
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }else{
+            return false;
+         }
+        })
       },
       handleCancel () {
         this.close()
-      }
+      },
+
+
     }
   }
 </script>
 
 <style lang="less" scoped>
-/** Button鎸夐挳闂磋窛 */
+  /**Button鎸夐挳闂磋窛*/
   .ant-btn {
     margin-left: 30px;
     margin-bottom: 30px;
     float: right;
   }
-  .drawer-footer{
+ /**鎶藉眽鎸夐挳鏍峰紡*/
+  .drawer-bootom-button {
     position: absolute;
     bottom: -8px;
     width: 100%;

--
Gitblit v1.9.3