From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 174 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 100 insertions(+), 74 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 42bafe9..5394b39 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -19,27 +19,31 @@
:wrapperCol="wrapperCol"
>
<a-input
- :disabled="disableSubmit"
+ :disabled="true"
placeholder="璇疯緭鍏ュ崟鎹彿"
v-decorator="['num', validatorRules.num]"
/>
</a-form-item>
</a-col>
<a-col :span="24/2">
- <!-- <a-form-item
+ <a-form-item
label="鏄惁鍋滄満缁翠慨"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鍋滄満缁翠慨'"
:triggerChange="true"
dictCode="is_stop"
v-decorator="['isStop', validatorRules.isStop]"
/>
- </a-form-item> -->
+ </a-form-item>
+
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
label="璁惧缂栫爜"
:labelCol="labelCol"
@@ -52,6 +56,22 @@
@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"
+ >
+ <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>
@@ -85,36 +105,36 @@
/>
</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
+ 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">
@@ -154,7 +174,7 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
label="绱ф�ョ▼搴�"
@@ -170,24 +190,21 @@
v-decorator="['urgency', validatorRules.urgency]"
/>
</a-form-item>
- </a-col>
- <a-col :span="24/2">
+ </a-col> -->
+ <!-- <a-col :span="24/2" v-show="false">
<a-form-item
- label="鏁呴殰鏃堕棿"
+ label="鏁呴殰鍘熷洜"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-date
+ <a-input
:disabled="disableSubmit"
- style="width: 100%"
- placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
- :showTime="true"
- dateFormat="YYYY-MM-DD HH:mm:ss"
- v-decorator="['faultTime', validatorRules.faultTime]"
+ enter-button
+ v-decorator="['faultReason', validatorRules.faultReason]"
/>
</a-form-item>
- </a-col>
- </a-row>
+ </a-col> -->
+ <!-- </a-row> -->
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item
@@ -219,25 +236,14 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="24">
+ </a-row>
+ <!-- <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
label="鏁呴殰鐓х墖"
- :labelCol="{span:3}"
- :wrapperCol="{span:21}"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
>
- <!-- <j-image-upload-self
- :isMultiple="false"
- v-decorator="['photo', {}]"
- @ok="uploadOk"
- >
- </j-image-upload-self> -->
- <!-- <j-image-upload
- :isMultiple="false"
- @ok="uploadOk"
- v-decorator="['photo', {}]"
- /> -->
<j-image-upload
:disabled="disableSubmit"
:isMultiple="true"
@@ -246,7 +252,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
</a-form>
</a-spin>
@@ -283,6 +289,8 @@
// import JImageUpload from '@/components/jeecg/JImage2Upload'
import EquipmentList from './EquipmentList'
import Vue from 'vue'
+import dayjs from 'dayjs'
+
export default {
name: "MalfunctionRepaireModal",
@@ -290,7 +298,8 @@
JMultiSelectTag,
Tooltip,
// JImageUpload,
- EquipmentList
+ EquipmentList,
+ dayjs
},
data() {
return {
@@ -316,11 +325,11 @@
{ required: true, message: '璇疯緭鍏ュ叆搴撳崟缂栧彿!' },
]
},
- // isStop: {
- // rules: [
- // { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
- // ]
- // },
+ isStop: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
+ ]
+ },
equipmentNum: {
rules: [
{ required: true, message: '璇烽�夋嫨璁惧!' },
@@ -331,13 +340,19 @@
{ required: true, message: '璇烽�夋嫨鏁呴殰鏃堕棿!' },
]
},
+ faultDescription:{
+ rules: [
+ { required: true, message: '璇锋弿杩版晠闅�!' },
+ { max: 1000, min:1,message: '鏈�澶氬彲鎻忚堪1000瀛�!' },
+ ]
+ },
},
url: {
add: "/eam/equipmentReportRepair/add",
edit: "/eam/equipmentReportRepair/edit",
getSysDeparts: "/eam/equipment/getSysDeparts",
+ getNum:'/eam/sysIdentity/getNumNew'
},
-
dataSource: [],
}
},
@@ -347,9 +362,20 @@
},
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;
+ modelDefault.faultTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
+ that.edit(modelDefault);
+ }
+ })
},
edit(record) {
let that = this;
@@ -358,7 +384,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, 'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
});
if (record.id) {
this.codeDisable = true;
@@ -417,7 +443,7 @@
},
sendEquipmentRecord(data) {
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 });
+ 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 });
},
},
--
Gitblit v1.9.3