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/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
index 89b0747..10c1d18 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',
@@ -310,7 +307,7 @@
}]
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
width: '140px',
@@ -327,7 +324,7 @@
defaultValue: ''
},
{
- title: '濮斿鍗曚綅',
+ title: '澶栧鍗曚綅',
key: 'supplierId',
type: JVXETypes.slot,
disabled: true,
@@ -337,7 +334,7 @@
defaultValue: ''
},
{
- title: '濮斿鍗曚綅',
+ title: '澶栧鍗曚綅',
key: 'supplierId',
type: JVXETypes.hidden
},
@@ -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