From 3848bf666f63878b90411e3e33df9fabfb94a0a2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 22 三月 2024 16:29:02 +0800
Subject: [PATCH] 完成y检验-任务切换接口对接

---
 src/components/tool/value-table.vue |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 7808696..63b842a 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -73,8 +73,9 @@
 
 <template>
 	<div class="value-table">
-		<div class="table">
-			<el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
+		<div class="table" :style="data.isPage!=undefined&&data.isPage!=true?'height:100%':''">
+			<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-class-name="tableRowClassName">
@@ -112,10 +113,10 @@
 				</el-table-column>
 			</el-table>
 		</div>
-		<div class="page">
+		<div class="page" v-if="data.isPage==undefined||data.isPage">
 			<el-pagination @size-change="sizeChange" @current-change="currentChange" :current-page="page.current"
 				:page-sizes="[10, 20, 30, 50, 100]" :page-size="page.size" layout="total, sizes, prev, pager, next, jumper"
-				:total="total">
+				:total="total" >
 			</el-pagination>
 		</div>
 		<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
@@ -231,6 +232,7 @@
 	import {
 		Page
 	} from 'iview';
+import { data } from 'jquery';
 	export default {
 		props: {
 			tableRowClassName: {
@@ -311,6 +313,7 @@
 					showSelect: false,
 					select: true,
 					row: 1,
+          isPage:true,//
 					do: [{
 						font: '鍒犻櫎',
 						type: 'text'
@@ -340,6 +343,7 @@
 				uploadDia: false,
 				token: null,
 				fileList: [],
+				init: true
 			}
 		},
 		watch: {
@@ -355,7 +359,9 @@
 		mounted() {
 			this.data = this.componentData
 			this.dataCopy = this.HaveJson(this.componentData)
-			this.selectList()
+			if(this.data.init===undefined||this.data.init===true){
+				this.selectList()
+			}
 			this.token = {
 				'token': sessionStorage.getItem('token')
 			}
@@ -367,6 +373,13 @@
 				} else {
 					this.multipleSelection = val[val.length - 1];
 				}
+        if(this.data.selectMethod!=undefined){
+          if(this.$parent.$el.className.indexOf('el-')==0){
+            this.$parent.$parent[this.data.selectMethod](val)
+          }else{
+            this.$parent[this.data.selectMethod](val)
+          }
+        }
 			},
 			select(val, row) {
 				if (!this.data.select) {
@@ -392,6 +405,12 @@
 			},
 			selectList() {
 				this.loading = true
+        if(this.data.isPage!=undefined&&this.data.isPage!=true){
+          this.page = {
+            current: -1,
+            size: -1,
+          }
+        }
 				this.$axios.post(this.url, {
 					page: this.page,
 					entity: this.data.entity
@@ -583,7 +602,7 @@
 					}
 				}
 				val.field.forEach(a => {
-					if (JSON.stringify(this.upData[a]) == undefined) {
+					if (JSON.stringify(this.upData[a]) === undefined) {
 						this.upHead.push({
 							value: a.split('=')[0],
 							label: a.split('=')[1]

--
Gitblit v1.9.3