From 6a2eb659b46f279fb87cfc0ee470e661315ffc54 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 22 三月 2024 10:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue | 65 ++++++++++++++++++++++++++++++--
1 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/Maintenance3ReceiptModal.vue
index 72e4c19..64de24a 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,7 +119,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 == 'secondInspect' && record.secondInspect == '2'"
+ :value="record.secondNotPass"
+ @change="(e)=>handleChange2(e, record.key, col, index)"
+ :disabled="false"
+ placeholder="璇峰～鍐欓獙鏀舵湭閫氳繃鍘熷洜"
+ /> -->
</div>
</template>
</a-table>
@@ -241,6 +255,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',
@@ -288,7 +319,6 @@
edit(record) {
let that = this;
- debugger
if (record.receipts == "" || record.receipts == null) {
this.getSysFileName()
}
@@ -323,6 +353,13 @@
const that = this;
// 瑙﹀彂琛ㄥ崟楠岃瘉
+ for (let i = 0; i < that.dataSource.length; i++) {
+ let o = that.dataSource[i]
+ if (o.firstInspect == "2" && o.secondInspect == "2") {
+ that.$message.warning("楠屾敹鍗曠" + (i + 1) + "琛岋紝涓ゆ妫�楠屽潎涓轰笉閫氳繃锛岃閲嶆柊妫�楠岃椤逛繚鍏诲唴瀹癸紒");
+ return
+ }
+ }
that.form.validateFields((err, values) => {
if (!err) {
this.$confirm({
@@ -353,6 +390,7 @@
},
handleChange(value, key, column, index) {
+ debugger
let that = this;
const temp = [...that.dataSource];
const target = temp.filter(item => key === item.key)[index];
@@ -367,7 +405,8 @@
target['standard'] = value.target.value;
}
if (column.dataIndex == 'firstInspect') {
- target[column.dataIndex] = value;
+ debugger
+ target["firstInspect"] = value;
}
if (column.dataIndex == 'secondInspect') {
target[column.dataIndex] = value;
@@ -377,6 +416,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