From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
index d1b4a6a..84a7e25 100644
--- a/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
+++ b/src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue
@@ -15,27 +15,27 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="鐐规璁″垝缂栫爜"
+ label="鐐规鏂规缂栫爜"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�璁″垝缂栫爜'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ偣妫�鏂规缂栫爜'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
</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>
@@ -148,7 +148,7 @@
<a-input
:disabled=true
placeholder="璇疯緭鍏ュ浘鐗囧悕绉�"
- v-decorator="['name', {} ]"
+ v-decorator="['name', validatorRules.name ]"
/>
</a-form-item>
</a-col>
@@ -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']);
@@ -431,7 +432,6 @@
for (let i = 0; i < this.dataSource.length; i++) {
ids.push(this.dataSource[i].specialtyInspectionStandardId);
}
- debugger
let departId = dataDepartId.departId;
let inspectionCycleId = data.inspectionCycleId;
this.$refs.specialtyInspectionStandardModalForm.showModals(ids, departId, inspectionCycleId);
@@ -523,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
@@ -544,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锛氬浘鐗�
@@ -584,7 +590,7 @@
onDepartList() {
this.$refs.DepartList.list();
- this.$refs.DepartList.title = "閫夋嫨瀵硅薄閮ㄩ棬";
+ this.$refs.DepartList.title = "閫夋嫨浣跨敤閮ㄩ棬";
},
sendDepartRecord(data) {
this.dataSource = [];
--
Gitblit v1.9.3