From b008401dfa948e874ce1e340e669322d6c68c097 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 31 八月 2023 18:42:57 +0800
Subject: [PATCH] 专业点检标准、专业点检方案增加自动生成编码,项目性维修上传附件功能

---
 src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
index 89b0747..73205d1 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
@@ -97,10 +97,7 @@
               :wrapperCol='wrapperCol'
               prop='annex'
             >
-              <j-image-upload
-                :isMultiple="false"
-                v-model="model.annex"
-              ></j-image-upload>
+            <j-upload :returnUrl= "false" :isMultiple="false"  v-model="model.file" ></j-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span='12'>
@@ -215,10 +212,10 @@
 
 import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
 import { JVXETypes } from '@comp/jeecg/JVxeTable'
-import { getRefPromise, VALIDATE_FAILED } from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
 
 import JFormContainer from '@/components/jeecg/JFormContainer'
 import { getAction } from '@api/manage'
+import { VALIDATE_FAILED, getRefPromise, validateFormAndTables,validateFormModelAndTables} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
 
 export default {
   name: 'ProjectMaintenanceOrderForm',
@@ -543,6 +540,32 @@
   },
   methods: {
 
+    handleOk() {
+      this.model['annex'] = this.model.file[0].filePath;
+      /** 瑙﹀彂琛ㄥ崟楠岃瘉 */
+      this.getAllTable().then(tables => {
+        /** 涓�娆℃�ч獙璇佷富琛ㄥ拰鎵�鏈夌殑娆¤〃 */
+        return validateFormModelAndTables(this.$refs.form,this.model, tables)
+      }).then(allValues => {
+        /** 涓�娆℃�ч獙璇佷竴瀵逛竴鐨勬墍鏈夊瓙琛� */
+        return this.validateSubForm(allValues)
+      }).then(allValues => {
+        if (typeof this.classifyIntoFormData !== 'function') {
+          throw this.throwNotFunction('classifyIntoFormData')
+        }
+        let formData = this.classifyIntoFormData(allValues)
+        // 鍙戣捣璇锋眰
+        return this.request(formData)
+      }).catch(e => {
+        if (e.error === VALIDATE_FAILED) {
+          // 濡傛灉鏈夋湭閫氳繃琛ㄥ崟楠岃瘉鐨勫瓙琛紝灏辫嚜鍔ㄨ烦杞埌瀹冩墍鍦ㄧ殑tab
+          this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+        } else {
+          console.error(e)
+        }
+      })
+    },
+
     getSuppler() {
       getAction(this.url.supplierVoList).then((res) => {
         if (res.success) {

--
Gitblit v1.9.3