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/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index 976f629..58774f0 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
@@ -83,6 +83,7 @@
auto-size
placeholder="璇疯緭鍏ヤ繚鍏诲唴瀹�"
@change="(e)=>handleChange(e, record.key, col, index)"
+ :disabled="true"
/>
<a-textarea
:value="text"
@@ -91,7 +92,7 @@
auto-size
placeholder="璇疯緭鍏ヤ繚鍏绘爣鍑�"
@change="(e)=>handleChange(e, record.key, col, index)"
- :disabled="false"
+ :disabled="true"
/>
<a-select
v-if="col.dataIndex == 'firstInspect'"
@@ -102,6 +103,13 @@
<a-select-option value="1">閫氳繃</a-select-option>
<a-select-option value="2">鏈�氳繃</a-select-option>
</a-select>
+ <a-input
+ v-if="col.dataIndex == 'firstInspect' && record.firstInspect == '2'"
+ :value="record.firstNotPass"
+ @change="(e)=>handleChange2(e, record.key, col, index)"
+ :disabled="false"
+ placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
+ />
<a-select
v-if="col.dataIndex == 'secondInspect'"
:value="text"
@@ -111,21 +119,17 @@
<a-select-option value="1">閫氳繃</a-select-option>
<a-select-option value="2">鏈�氳繃</a-select-option>
</a-select>
-
+ <!-- <a-input
+ v-if="col.dataIndex == 'secondInspect' && record.secondInspect == '2'"
+ :value="record.secondNotPass"
+ @change="(e)=>handleChange2(e, record.key, col, index)"
+ :disabled="false"
+ placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
+ /> -->
</div>
</template>
</a-table>
- <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
- <!-- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- label="楠屾敹缁撴灉"
- >
- </a-form-item>
- </a-col>
- </a-row> -->
+ <!-- <div :style="{height: '140px',width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
@@ -144,7 +148,7 @@
</a-form-item>
</a-col>
</a-row>
- </div>
+ </div> -->
</a-form>
</a-spin>
@@ -241,6 +245,23 @@
dataIndex: 'standard',
scopedSlots: { customRender: 'standard' }
},
+ // {
+ // title: '楠屾敹娆℃暟',
+ // children: [
+ // {
+ // title: '绗竴娆℃',
+ // dataIndex: 'firstInspect',
+ // align: 'center',
+ // scopedSlots: { customRender: 'firstInspect' }
+ // },
+ // {
+ // title: '绗簩娆℃',
+ // dataIndex: 'secondInspect',
+ // align: 'center',
+ // scopedSlots: { customRender: 'secondInspect' }
+ // },
+ // ],
+ // },
{
title: '绗竴娆℃',
align: 'center',
@@ -373,7 +394,7 @@
target['standard'] = value.target.value;
}
if (column.dataIndex == 'firstInspect') {
- target[column.dataIndex] = value;
+ target["firstInspect"] = value;
}
if (column.dataIndex == 'secondInspect') {
target[column.dataIndex] = value;
@@ -383,6 +404,24 @@
}
},
+ handleChange2(value, key, column, index, record) {
+ let that = this;
+ const temp = [...that.dataSource];
+ const target = temp.filter(item => key === item.key)[index];
+ if (target) {
+ // target[column.dataIndex] = value;
+ if ('firstInspect' == column.dataIndex) {
+ target['firstNotPass'] = value.target.value;
+ }
+ // if ('secondInspect' == column.dataIndex) {
+ // target['secondNotPass'] = value.target.value;
+ // }
+
+ //鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
+ that.dataSource = temp;
+ }
+ },
+
getSysFileName() {
getAction(this.url.getSysFileName, { name: '19' }).then((res) => {
if (res.success) {
--
Gitblit v1.9.3