From c7b4ae684df22079459495e04dc5566c891ba4a5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 26 三月 2024 13:57:27 +0800
Subject: [PATCH] 合并冲突
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 8372cd4..00a0778 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -29,6 +29,7 @@
}
.tables{
/* width: 800px; */
+ margin-bottom: 16px;
}
.tables td{
height: 40px;
@@ -129,7 +130,7 @@
:key="j"
:colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
:rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
- :style="`background:${n.v.bg};font-family:${n.v.ff};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[j]}px;height:${item.style.rowlen[i]}px;font-wight:${n.v.bl?'bold':''};`">
+ :style="`background:${n.v.bg};font-family:${n.v.ff};color:${n.v.fc};font-size:${n.v.fs}px;width:${item.style.columnlen[n.c]}px;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`">
<span v-if="n.v.ps===undefined || n.v.ps.value!='妫�楠屽��'">{{ n.v.v}}</span>
</div>
@@ -141,9 +142,11 @@
<el-drawer
title="鏍峰搧鍒囨崲"
:visible.sync="sampleVisible"
- :size="500">
- <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName">
- <el-table-column type="index" align="center" label="搴忓彿" width="65px" :key="Math.random()">
+ size="50%">
+ <el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
+ :current-row-key="currentKey" :row-key="record=>record.index"
+ v-if="sampleVisible">
+ <el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
<el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px"
show-overflow-tooltip></el-table-column>
@@ -198,7 +201,7 @@
userId: 0
},
isIndex: false,
- showSelect: true,
+ showSelect: false,
select: false,
selectMethod:'handleChangeTask',
sort: false,
@@ -213,9 +216,10 @@
select: []
},
},
+ currentId:'',
selectField: {},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
},
upIndex: 0,
insOrder: {},
@@ -224,7 +228,8 @@
urgentList:[],
currentSample:{},//褰撳墠鏍峰搧淇℃伅
tableList:[],
- loading: false
+ loading: false,
+ currentKey:1,
}
},
created() {
@@ -252,6 +257,8 @@
if(this.currentSample.index==undefined)this.currentSample['index'] = 1
this.loading = false
this.handleTableData()
+ this.componentData.currentId = val;
+ this.currentKey = 1;
})
}
},
@@ -260,6 +267,7 @@
this.currentSample = row;
this.handleTableData()
this.sampleVisible = false;
+ this.currentKey=row.index
},
handleChangeTask(row){
if(row.length > 0)this.id = row[0].id;
--
Gitblit v1.9.3