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/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue index 06f9007..84a7e25 100644 --- a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue +++ b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue @@ -29,13 +29,13 @@ </a-col> <a-col :span="12"> <a-form-item - label="瀵硅薄閮ㄩ棬" + label="浣跨敤閮ㄩ棬" :labelCol="labelCol" :wrapperCol="wrapperCol" > <!-- <a-select :disabled="disableSubmit" - :placeholder="disableSubmit?'':'璇烽�夋嫨瀵硅薄閮ㄩ棬'" + :placeholder="disableSubmit?'':'璇烽�夋嫨浣跨敤閮ㄩ棬'" :options="this.departs" style="width: 100%" v-decorator="['departId', validatorRules.departId]" @@ -43,7 +43,7 @@ /> --> <a-input-search :disabled="disableSubmit" - placeholder="璇烽�夋嫨瀵硅薄閮ㄩ棬" + placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬" enter-button @search="onDepartList()" :read-only="true" @@ -107,14 +107,14 @@ > <a-col :span="12"> <a-form-item - label="瀵硅薄閮ㄩ棬Id" + label="浣跨敤閮ㄩ棬Id" :labelCol="labelCol" :wrapperCol="wrapperCol" > <a-input allow-clear :disabled="true" - :placeholder="disableSubmit?'':'璇疯緭鍏ュ璞¢儴闂╥d'" + :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'" v-decorator="['departId', validatorRules.departId ]" /> </a-form-item> @@ -298,7 +298,7 @@ dataIndex: 'version', }, { - title: '璁惧缂栫爜', + title: '缁熶竴缂栫爜', align: 'center', dataIndex: 'equipmentNum' }, @@ -340,11 +340,11 @@ form: this.$form.createForm(this), headers: {}, validatorRules: { - num: { - rules: [ - { required: true, message: '璇疯緭鍏ョ偣妫�璁″垝缂栫爜!' }, - ] - }, + // num: { + // rules: [ + // { required: true, message: '璇疯緭鍏ョ偣妫�璁″垝缂栫爜!' }, + // ] + // }, inspectionCycleId: { rules: [ { required: true, message: '璇烽�夋嫨鐐规鍛ㄦ湡!' }, @@ -352,7 +352,7 @@ }, useDepartName: { rules: [ - { required: true, message: '璇烽�夋嫨瀵硅薄閮ㄩ棬!' }, + { required: true, message: '璇烽�夋嫨浣跨敤閮ㄩ棬!' }, ] }, assignMode: { @@ -384,6 +384,7 @@ listByBusIdAndBusType: "/system/sysUploadRela/listByBusIdAndBusType", getInspectionCycle: "/eam/inspectionStandardDetail/getInspectionCycle", // getSysDeparts: "/eam/specialtyInspectionPlan/getSysDeparts", + getNum: '/eam/sysIdentity/getNumNew', }, dataSource: [], //鐢ㄤ簬灞曠ず鏂囦欢 @@ -419,7 +420,7 @@ selectInspectionProjects: function () { let dataDepartId = this.form.getFieldsValue(['departId']); if (dataDepartId.departId == "" || dataDepartId.departId == null || dataDepartId.departId == undefined) { - this.$message.warning("璇烽�夋嫨瀵硅薄閮ㄩ棬锛�"); + this.$message.warning("璇烽�夋嫨浣跨敤閮ㄩ棬锛�"); return } let data = this.form.getFieldsValue(['inspectionCycleId']); @@ -522,7 +523,7 @@ handleOk() { const that = this; // 瑙﹀彂琛ㄥ崟楠岃瘉 - that.form.validateFields((err, values) => { + that.form.validateFields(async (err, values) => { if (JSON.stringify(that.fileObject.file) == '{}' && that.uploadId == '' && that.fileList.length == 0) { that.$message.warning("璇蜂笂浼犳枃浠�"); return false @@ -543,7 +544,13 @@ method = 'put'; } let formData = Object.assign(that.model, values); - + if(!formData.num){ + await getAction(this.url.getNum, { type: 'SpecialtyInspectionPlan', length: '4' }).then((res) => { + if (res.success) { + formData.num = res.message; + } + }); + } formData.type = "inspection_path_photo"; formData.uploadId = that.uploadId; formData.fileType = "7";//鏂囦欢绫诲瀷 7锛氬浘鐗� @@ -583,7 +590,7 @@ onDepartList() { this.$refs.DepartList.list(); - this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬"; + this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬"; }, sendDepartRecord(data) { this.dataSource = []; -- Gitblit v1.9.3