From c3b8f3f950ca99b011ea8f43b2356ddf0508f3b9 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期一, 04 三月 2024 13:42:04 +0800
Subject: [PATCH] 6 设备工具明细

---
 src/components/tool/value-table.vue |  126 ++++++++++++++++++++++++++++-------------
 1 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 83f2202..c9999e0 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -30,6 +30,10 @@
 		align-items: center;
 		justify-content: center;
 	}
+
+	.body{
+		overflow-x: hidden;
+	}
 </style>
 <style>
 	.value-table .el-upload {
@@ -46,10 +50,11 @@
 		<div class="table">
 			<el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
 				@selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange"
-				@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0" :summary-method="getSummaries">
+				@row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
+				:summary-method="getSummaries">
 				<el-table-column type="selection" width="65" v-if="data.showSelect">
 				</el-table-column>
-				<el-table-column align="center" type="index" label="搴忓彿" width="70" v-if="data.isIndex">
+				<el-table-column type="index" align="center" label="搴忓彿" width="70" v-if="data.isIndex">
 				</el-table-column>
 				<el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai"
 					show-overflow-tooltip min-width="160">
@@ -76,43 +81,79 @@
 				:total="total">
 			</el-pagination>
 		</div>
-		<el-dialog title="缂栬緫" :visible.sync="upDia" width="500px">
-			<div class="body" v-if="upDia">
-				<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
-					<el-col :span="6" style="text-align: right;">
-						<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
-					</el-col>
-					<el-col :span="16" :offset="1">
-						<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
-							v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
-						<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
-							style="width: 100%;" :disabled="isDisabled(a.label)">
-							<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
-								:label="b.label"></el-option>
-						</el-select>
-					</el-col>
-				</el-row>
+		<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
+			<div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
+				<div v-if="data.row > 1">
+					<div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+						<el-col :span="6/data.row" style="text-align: right;">
+							<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
+						</el-col>
+						<el-col :span="16/data.row" :offset="1">
+							<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
+								v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
+							<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
+								style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+								<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+									:label="b.label"></el-option>
+							</el-select>
+						</el-col>
+					</div>
+				</div>
+				<div v-else>
+					<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+						<el-col :span="6" style="text-align: right;">
+							<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
+						</el-col>
+						<el-col :span="16" :offset="1">
+							<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
+								v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
+							<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
+								style="width: 100%;" :disabled="isDisabled(a.label)" clearable>
+								<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+									:label="b.label"></el-option>
+							</el-select>
+						</el-col>
+					</el-row>
+				</div>
 			</div>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="upDia = false">鍙� 娑�</el-button>
 				<el-button type="primary" @click="saveUpData" :loading="upLoad">纭� 瀹�</el-button>
 			</span>
 		</el-dialog>
-		<el-dialog title="鏂板" :visible.sync="addDia" width="500px">
+		<el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
 			<div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
-				<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
-					<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
-						</span>{{a.value}}锛�</el-col>
-					<el-col :span="16" :offset="1">
-						<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
-							v-if="showType(a.label, data.selectField) == null"></el-input>
-						<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
-							style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`">
-							<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
-								:label="b.label"></el-option>
-						</el-select>
-					</el-col>
-				</el-row>
+				<div v-if="data.row > 1">
+					<div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+						<el-col :span="6/data.row" style="text-align: right;"><span class="required-span"
+								v-if="showAddReq(a.label)">*
+							</span>{{a.value}}锛�</el-col>
+						<el-col :span="16/data.row" :offset="1">
+							<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
+								v-if="showType(a.label, data.selectField) == null"></el-input>
+							<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
+								style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
+								<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+									:label="b.label"></el-option>
+							</el-select>
+						</el-col>
+					</div>
+				</div>
+				<div v-else>
+					<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
+						<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
+							</span>{{a.value}}锛�</el-col>
+						<el-col :span="16" :offset="1">
+							<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
+								v-if="showType(a.label, data.selectField) == null"></el-input>
+							<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
+								style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable>
+								<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
+									:label="b.label"></el-option>
+							</el-select>
+						</el-col>
+					</el-row>
+				</div>
 			</div>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="addDia = false">鍙� 娑�</el-button>
@@ -182,9 +223,10 @@
 								order: 'asc'
 							}
 						},
-						isIndex: true,
-						showSelect: true,
+						isIndex: false,
+						showSelect: false,
 						select: true,
+						row: 1,
 						do: [{
 							id: 'update',
 							font: '缂栬緫',
@@ -222,9 +264,10 @@
 							order: 'asc'
 						}
 					},
-					isIndex: true,
-					showSelect: true,
+					isIndex: false,
+					showSelect: false,
 					select: true,
+					row: 1,
 					do: [{
 						font: '鍒犻櫎',
 						type: 'text'
@@ -368,11 +411,12 @@
 				return false
 			},
 			main(row, val) {
+				console.log(val);
 				if (val.method == undefined) return
 				else if (val.method == 'doDiy') {
 					if (val.id == 'update') {
 						this.upDia = true,
-						this.upData = this.HaveJson(row)
+							this.upData = this.HaveJson(row)
 						this.upHead = this.HaveJson(this.tableHead)
 						this.upHead = this.upHead.filter(a => a.label != 'createTime' && a.label != 'updateTime')
 						delete this.upData.orderBy
@@ -634,13 +678,13 @@
 						return;
 					}
 					const values = data.map(item => Number(item[column.property]));
-					if(this.data.countFleid==undefined){
+					if (this.data.countFleid == undefined) {
 						sums[index] = ''
 						return
 					}
-					if (this.data.countFleid.filter(str=>{
-						return str === column.property
-					}).length > 0) {
+					if (this.data.countFleid.filter(str => {
+							return str === column.property
+						}).length > 0) {
 						sums[index] = values.reduce((prev, curr) => {
 							const value = Number(curr);
 							if (!isNaN(value)) {

--
Gitblit v1.9.3