From 445cfc2c5cee3d8fc0f8f1ffae5b66d9c761e681 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 19:15:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 202 ++++++++++++++++++++++++++++++++------------------
1 files changed, 130 insertions(+), 72 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 5394b39..99252ff 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -39,25 +39,21 @@
v-decorator="['isStop', validatorRules.isStop]"
/>
</a-form-item>
-
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="璁惧缂栫爜"
+ <a-col :span="12">
+ <a-form-model-item
+ label="鎶ヤ慨浜�"
+ prop="name"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <a-input-search
- :disabled="disableSubmit"
- placeholder="璇烽�夋嫨璁惧锛�"
- enter-button
- @search="onSearchEquipmentList()"
- :read-only="true"
- v-decorator="['equipmentNum', validatorRules.equipmentNum]"
- />
- </a-form-item>
+ <a-input
+ v-decorator="['errUda2', validatorRules.errUda2]"
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ ></a-input>
+ </a-form-model-item>
</a-col>
<a-col :span="24/2">
<a-form-item
@@ -79,6 +75,22 @@
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
+ label="缁熶竴缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input-search
+ :disabled="disableSubmit"
+ placeholder="璇烽�夋嫨璁惧锛�"
+ enter-button
+ @search="onSearchEquipmentList()"
+ :read-only="true"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
label="璁惧鍚嶇О"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -91,6 +103,8 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="璁惧瑙勬牸"
@@ -105,6 +119,21 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="璁惧鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ enter-button
+ :read-only="true"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
<a-row
hidden
:gutter="24"
@@ -117,7 +146,7 @@
>
<a-input
:disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿/鍚嶇О/鍨嬪彿'"
v-decorator="['equipmentId', validatorRules.equipmentId ]"
/>
</a-form-item>
@@ -135,23 +164,8 @@
/>
</a-form-item>
</a-col>
- </a-row>
</a-row>
<a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="璁惧鍨嬪彿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- enter-button
- :read-only="true"
- v-decorator="['equipmentModel', validatorRules.equipmentModel]"
- />
- </a-form-item>
- </a-col>
<a-col :span="24/2">
<a-form-item
label="浣跨敤閮ㄩ棬"
@@ -174,37 +188,6 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
- label="绱ф�ョ▼搴�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨绱ф�ョ▼搴�'"
- :triggerChange="true"
- dictCode="urgency"
- v-decorator="['urgency', validatorRules.urgency]"
- />
- </a-form-item>
- </a-col> -->
- <!-- <a-col :span="24/2" v-show="false">
- <a-form-item
- label="鏁呴殰鍘熷洜"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="disableSubmit"
- enter-button
- v-decorator="['faultReason', validatorRules.faultReason]"
- />
- </a-form-item>
- </a-col> -->
- <!-- </a-row> -->
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
@@ -237,22 +220,67 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
- <a-col :span="24/2">
+ <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
- label="鏁呴殰鐓х墖"
+ label="鏄惁鍦ㄥ姞宸ラ浂浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-image-upload
- :disabled="disableSubmit"
- :isMultiple="true"
- v-decorator="['photo', {}]"
- ></j-image-upload>
-
+ <j-dict-select-tag
+ allow-clear
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�'"
+ :triggerChange="true"
+ @change="(e) => statusChange(e)"
+ dictCode="is_product"
+ v-decorator="['errUda1', validatorRules.errUda1]"
+ />
</a-form-item>
</a-col>
- </a-row> -->
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="鍔犲伐闆朵欢鍙�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :placeholder="disableSubmit?'':'璇疯緭鍏ュ姞宸ラ浂浠跺彿'"
+ v-decorator="['partNumber', validatorRules.partNumber ]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="鎵规鍙�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :placeholder="disableSubmit?'':'璇疯緭鍏ユ壒娆″彿'"
+ v-decorator="['batchNo', validatorRules.batchNo ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2" v-if="workingStatus">
+ <a-form-item
+ label="浠舵暟"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input-number
+ allow-clear
+ style="width: 100%;"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ欢鏁�'"
+ :min="1"
+ v-decorator="['quantity', validatorRules.quantity]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
</a-spin>
@@ -346,6 +374,32 @@
{ max: 1000, min:1,message: '鏈�澶氬彲鎻忚堪1000瀛�!' },
]
},
+ errUda1:{
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍦ㄥ姞宸ラ浂浠�!' },
+ ]
+ },
+ errUda2: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ユ姤淇汉!' },
+ { min:1,max:10, message: '闀垮害涓嶈兘澶т簬10涓瓧绗�!' },
+ ]
+ },
+ partNumber:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ラ浂浠跺浘鍙�!' },
+ ]
+ },
+ batchNo:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ユ壒娆″彿!' },
+ ]
+ },
+ quantity:{
+ rules: [
+ { required: true, message: '璇疯緭鍏ヤ欢鏁�!' },
+ ]
+ }
},
url: {
add: "/eam/equipmentReportRepair/add",
@@ -354,6 +408,7 @@
getNum:'/eam/sysIdentity/getNumNew'
},
dataSource: [],
+ workingStatus:false
}
},
@@ -372,6 +427,7 @@
getAction(this.url.getNum,param).then(res=>{
if(res.success){
modelDefault.num = res.result;
+ this.workingStatus = false;
modelDefault.faultTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
that.edit(modelDefault);
}
@@ -384,7 +440,7 @@
that.model = Object.assign({}, record);
that.visible = true;
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
+ that.form.setFieldsValue(pick(that.model,'errUda1' ,'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
});
if (record.id) {
this.codeDisable = true;
@@ -445,7 +501,9 @@
let record = data.record;
this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id, equipmentNum: record.num, equipmentModel: record.model, equipmentSpecification: record.specification, useDepartId: record.useId, departName: record.useId_dictText });
},
-
+ statusChange(val){
+ this.workingStatus=val==='no'?false:true;
+ }
},
}
</script>
--
Gitblit v1.9.3