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/malfunctionRepair/MalfunctionRepaireModal.vue | 294 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 202 insertions(+), 92 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index c22adfa..55d6708 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -19,7 +19,7 @@
:wrapperCol="wrapperCol"
>
<a-input
- :disabled="disableSubmit"
+ :disabled="true"
placeholder="璇疯緭鍏ュ崟鎹彿"
v-decorator="['num', validatorRules.num]"
/>
@@ -27,26 +27,55 @@
</a-col>
<a-col :span="24/2">
<a-form-item
- label="鏄惁鍋滄満缁翠慨"
+ label="鏄惁鍋滄満"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍋滄満缁翠慨'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍋滄満'"
:triggerChange="true"
dictCode="is_stop"
v-decorator="['isStop', validatorRules.isStop]"
/>
</a-form-item>
-
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item
+ label="鎶ヤ慨浜�"
+ prop="name"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ v-decorator="['errUda2', validatorRules.errUda2]"
+ placeholder="璇疯緭鍏ユ姤淇汉"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="鏁呴殰鏃堕棿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ :disabled="true"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD HH:mm:ss"
+ v-decorator="['faultTime', validatorRules.faultTime]"
+ />
+ </a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
- label="璁惧缂栫爜"
+ label="缁熶竴缂栧彿"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -62,24 +91,6 @@
</a-col>
<a-col :span="24/2">
<a-form-item
- label="鏁呴殰鏃堕棿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-date
- :disabled="disableSubmit"
- style="width: 100%"
- placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
- :showTime="true"
- dateFormat="YYYY-MM-DD HH:mm:ss"
- v-decorator="['faultTime', validatorRules.faultTime]"
- />
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="24/2">
- <a-form-item
label="璁惧鍚嶇О"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -92,6 +103,8 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="璁惧瑙勬牸"
@@ -106,39 +119,6 @@
/>
</a-form-item>
</a-col>
- <a-row
- hidden
- :gutter="24"
- >
- <a-col :span="12">
- <a-form-item
- label="璁惧Id"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
- v-decorator="['equipmentId', validatorRules.equipmentId ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item
- label="浣跨敤閮ㄩ棬Id"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
- v-decorator="['useDepartId', validatorRules.useDepartId ]"
- />
- </a-form-item>
- </a-col>
- </a-row>
- </a-row>
- <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="璁惧鍨嬪彿"
@@ -153,6 +133,39 @@
/>
</a-form-item>
</a-col>
+ </a-row>
+ <a-row
+ hidden
+ :gutter="24"
+ >
+ <a-col :span="12">
+ <a-form-item
+ label="璁惧Id"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿/鍚嶇О/鍨嬪彿'"
+ v-decorator="['equipmentId', validatorRules.equipmentId ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="浣跨敤閮ㄩ棬Id"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
+ v-decorator="['useDepartId', validatorRules.useDepartId ]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="浣跨敤閮ㄩ棬"
@@ -174,34 +187,18 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
- label="绱ф�ョ▼搴�"
+ label="鎶ヤ慨绫诲瀷"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- :disabled="disableSubmit"
- :placeholder="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]"
+ dictCode="report_repair_type"
+ v-decorator="['type', validatorRules.type]"
/>
</a-form-item>
</a-col>
@@ -238,22 +235,76 @@
</a-form-item>
</a-col>
</a-row>
- <!-- <a-row :gutter="24">
+ <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>
@@ -290,6 +341,8 @@
// import JImageUpload from '@/components/jeecg/JImage2Upload'
import EquipmentList from './EquipmentList'
import Vue from 'vue'
+import dayjs from 'dayjs'
+
export default {
name: "MalfunctionRepaireModal",
@@ -297,7 +350,8 @@
JMultiSelectTag,
Tooltip,
// JImageUpload,
- EquipmentList
+ EquipmentList,
+ dayjs
},
data() {
return {
@@ -338,14 +392,52 @@
{ required: true, message: '璇烽�夋嫨鏁呴殰鏃堕棿!' },
]
},
+ faultDescription: {
+ rules: [
+ { required: true, message: '璇锋弿杩版晠闅�!' },
+ { 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: '璇疯緭鍏ヤ欢鏁�!' },
+ // ]
+ // },
+ type: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鎶ヤ慨绫诲瀷!' },
+ ]
+ },
},
url: {
add: "/eam/equipmentReportRepair/add",
edit: "/eam/equipmentReportRepair/edit",
getSysDeparts: "/eam/equipment/getSysDeparts",
+ getNum: '/eam/sysIdentity/getNumNew'
},
-
dataSource: [],
+ workingStatus: false
}
},
@@ -354,9 +446,24 @@
},
methods: {
-
add() {
- this.edit({})
+ let that = this;
+
+ let param = {
+ type: 'EquipmentReportRepair',
+ length: 4
+ };
+ let modelDefault = {};
+ 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);
+ }
+ })
+
+
},
edit(record) {
let that = this;
@@ -365,7 +472,8 @@
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"));
+ that.form.setFieldsValue({ type: "1" });
});
if (record.id) {
this.codeDisable = true;
@@ -426,7 +534,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