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/dailyInspectionStandard/DailylnspectionStandardModal.vue | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
index 6126aad..cca34ff 100644
--- a/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/DailylnspectionStandardModal.vue
@@ -131,17 +131,15 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
- label="娲惧伐鏂瑰紡"
+ label="绠＄悊鍒跺害"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
- <j-dict-select-tag
+ <a-input
allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨娲惧伐鏂瑰紡'"
- :triggerChange="true"
- dictCode="assign_mode"
- v-decorator="['assignMode', validatorRules.assignMode]"
+ :disabled="false"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ鐞嗗埗搴�'"
+ v-decorator="['disUda1', validatorRules.disUda1 ]"
/>
</a-form-item>
</a-col>
@@ -226,7 +224,7 @@
style="width: 100%"
:disabled="false"
/>
- <j-image-upload
+ <!-- <j-image-upload
:value="text"
v-if="col.dataIndex == 'photo'"
:isMultiple="false"
@@ -234,7 +232,7 @@
placeholder="璇蜂笂浼犲浘鐗�"
@change="(e)=>handleChange(e, record.key, col, index)"
>
- </j-image-upload>
+ </j-image-upload> -->
<a-input
:value="text"
v-if="col.dataIndex == 'location'"
@@ -326,7 +324,7 @@
dataIndex: 'name'
},
{
- title: '妫�娴嬫爣鍑�',
+ title: '瀹屾垚鏁版嵁/瑕佹眰',
align: 'center',
dataIndex: 'detectionStandard'
},
@@ -350,22 +348,21 @@
align: 'center',
dataIndex: 'inspectionCycleId',
scopedSlots: { customRender: 'inspectionCycleId' },
- width: 170,
},
- {
- title: '绀烘剰鍥�',
- align: 'center',
- dataIndex: 'photo',
- scopedSlots: { customRender: 'photo' },
- width: 170,
- },
- {
- title: '閮ㄤ綅',
- align: 'center',
- dataIndex: 'location',
- scopedSlots: { customRender: 'location' },
- width: 170,
- },
+ // {
+ // title: '绀烘剰鍥�',
+ // align: 'center',
+ // dataIndex: 'photo',
+ // scopedSlots: { customRender: 'photo' },
+ // width: 170,
+ // },
+ // {
+ // title: '閮ㄤ綅',
+ // align: 'center',
+ // dataIndex: 'location',
+ // scopedSlots: { customRender: 'location' },
+ // width: 170,
+ // },
{
title: '鎿嶄綔',
align: 'center',
@@ -418,6 +415,11 @@
historyVersion: {
rules: [
{ required: true, message: '璇疯緭鍏ュ巻鍙茬増鏈�!' },
+ ]
+ },
+ disUda1: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ョ鐞嗗埗搴�!' },
]
},
},
@@ -485,7 +487,7 @@
that.dataSource = temp;
}
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'equipmentId', 'equipmentName', 'useDepartName', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
+ that.form.setFieldsValue(pick(that.model, 'num', 'equipmentId', 'equipmentName', 'useDepartName', 'disUda1', 'useId', 'teamName', 'assignMode', 'version', 'remark'));
});
if (record.id) {
that.codeDisable = true;
--
Gitblit v1.9.3