From 28f355c8d4708aa64262aa9be3be5dc72c22b16e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 11:43:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/tool/value-table.vue |  296 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 141 insertions(+), 155 deletions(-)

diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 5c37a1e..8bedd05 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -42,14 +42,13 @@
     background: transparent;
   }
 
-  .handleBtn:hover{
+  .handleBtn:hover {
     background: transparent;
   }
 
-  .handleBtn.is-disabled{
+  .handleBtn.is-disabled {
     color: #C0C4CC;
   }
-
 </style>
 <style>
 	/* .value-table .highlight-warning-row-border td {
@@ -86,10 +85,11 @@
 		width: 100%;
 	}
 
-  .handleBtn.is-disabled .el-upload:focus{
+  .handleBtn.is-disabled .el-upload:focus {
     color: #C0C4CC !important;
   }
-  .avatar-uploader .el-upload{
+  
+  .avatar-uploader .el-upload {
     height: 80px;
     display: flex;
     align-items: center;
@@ -100,13 +100,11 @@
 <template>
 	<div class="value-table">
 		<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
+			<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"
-        :row-key="record=>record.id" :current-row-key="data.currentId"
-        :highlight-current-row="data.highlight===undefined||data.highlight"
+				:summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
+        :current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
         :span-method="spanMethod">
 				<el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
 				</el-table-column>
@@ -130,29 +128,21 @@
 						<!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
 						<span v-else-if="data.linkEvent&&showLink(a.label, data.linkEvent)" style="color:#409EFF;cursor: pointer;"
 							@click="handleLinkEvent(scope.row,data.linkEvent[a.label])">{{scope.row[a.label]}}</span>
-            <img style="width: 40px;height: 40px;margin-top: 10px;" :src="javaApi+'/img/'+scope.row[a.label]" v-else-if="showUpload(a.label)&&scope.row[a.label]" alt="">
-            <span v-else-if="showCascader(a.label)&&scope.row[a.label]">{{handleTree(data.cascaderField[a.label].tree,scope.row[a.label].split(',')[scope.row[a.label].split(',').length-1])}}</span>
-						<span v-else>{{scope.row[a.label]}}</span>
+            <img style="width: 40px;height: 40px;margin-top: 10px;" :src="javaApi+'/img/'+scope.row[a.label]"
+              v-else-if="showUpload(a.label)&&scope.row[a.label]" alt="">
+            						<span v-else>{{scope.row[a.label]}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0">
 					<template slot-scope="scope">
 						<el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type"
-							:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
-							@click="main(scope.row, a)" class="handleBtn">
+							:disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)"
+              class="handleBtn">
               <span v-if="a.type!='upload'">{{a.font}}</span>
-              <el-upload
-              :action="javaApi+a.uploadConfig.url+'?id='+scope.row.id"
-              v-else
-              :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false"
-              :on-success="handleSuccessUp"
-              :show-file-list="false"
-              :headers="token"
-              name="file"
-							:accept='a.uploadConfig.accept'
-							:on-error="onError"
-              ref='upload'
-              style="background: transparent;">
+              <el-upload :action="javaApi+a.uploadConfig.url+'?id='+scope.row.id" v-else
+              :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" :on-success="handleSuccessUp"
+              :show-file-list="false" :headers="token" name="file" :accept='a.uploadConfig.accept' :on-error="onError"
+              ref='upload' style="background: transparent;">
 									<span>{{a.font}}</span>
 								</el-upload>
             </el-button>
@@ -163,10 +153,10 @@
 		<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'">
+		<el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
 			<div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;">
 				<div v-if="data.row > 1">
 					<div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
@@ -175,7 +165,8 @@
 						</el-col>
 						<el-col :span="16/data.row">
 							<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
-								v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)" :disabled="isDisabled(a.label)"></el-input>
+								v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"
+                :disabled="isDisabled(a.label)"></el-input>
 							<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
 								v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
 								clearable filterable>
@@ -183,32 +174,19 @@
 									:label="b.label">
 								</el-option>
 							</el-select>
-              <el-upload
-              :action="javaApi+data.addUploadConfig.url"
-              v-if="showUpload(a.label)"
-              :on-success="m=>handleSuccessUp(m, a.label)"
-              :show-file-list="false"
-              :headers="token"
-              name="file"
-              :multiple="false"
-							:accept='data.addUploadConfig.accept'
-							:on-error="onError"
-              ref='upload'
+              <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
+              :on-success="m=>handleSuccessUp(m, a.label)" :show-file-list="false" :headers="token" name="file"
+              :multiple="false" :accept='data.addUploadConfig.accept' :on-error="onError" ref='upload'
               class="avatar-uploader"
               style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
-              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar"
+                  style="width: 80px;height: 80px;border-radius: 6px;">
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 							</el-upload>
-              <el-cascader
-              :value="upData[a.label]"
-              :options="data.cascaderField[a.label].tree"
-              v-if="showCascader(a.label)"
-              :show-all-levels="false"
-              clearable
-              :props="data.cascaderField.props"
-              size="small"
-              style="width: 100%;"
-              @change="m=>handleCascader(m,a.label)"></el-cascader>
+              <el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree"
+              v-if="showCascader(a.label)" :placeholder="`璇烽�夋嫨${a.value}`" clearable
+              :props="data.cascaderField.props" size="small" style="width: 100%;"
+              @change="m=>handleCascader(m,a.label)" filterable></el-cascader>
 						</el-col>
 					</div>
 				</div>
@@ -219,30 +197,25 @@
 						</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&&!showUpload(a.label)&&!showCascader(a.label)" :disabled="isDisabled(a.label)"></el-input>
+								v-if="showType(a.label, data.selectField) == null&&!showUpload(a.label)&&!showCascader(a.label)"
+                :disabled="isDisabled(a.label)"></el-input>
 							<el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small"
 								v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)"
 								clearable filterable>
 								<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-upload
-              :action="javaApi+data.addUploadConfig.url"
-              v-if="showUpload(a.label)"
-              :multiple="false"
-              :on-success="m=>handleSuccessUp(m, a.label)"
-              :show-file-list="false"
-              :headers="token"
-              name="file"
-							:accept='data.addUploadConfig.accept'
-							:on-error="onError"
-              ref='upload'
-              class="avatar-uploader"
+              <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" :multiple="false"
+              :on-success="m=>handleSuccessUp(m, a.label)" :show-file-list="false" :headers="token" name="file"
+							:accept='data.addUploadConfig.accept' :on-error="onError" ref='upload' class="avatar-uploader"
               style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
-              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar"
+                  style="width: 80px;height: 80px;border-radius: 6px;">
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 							</el-upload>
-              <el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" :show-all-levels="false" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props" size="small" style="width: 100%;" @change="m=>handleCascader(m,a.label)"></el-cascader>
+              <el-cascader :value="upData[a.label]" :options="data.cascaderField[a.label].tree" :show-all-levels="false"
+                :placeholder="`璇烽�夋嫨${a.value}`" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props"
+                size="small" style="width: 100%;" @change="m=>handleCascader(m,a.label)" filterable></el-cascader>
 						</el-col>
 					</el-row>
 				</div>
@@ -252,8 +225,8 @@
 				<el-button type="primary" @click="saveUpData" :loading="upLoad">纭� 瀹�</el-button>
 			</span>
 		</el-dialog>
-		<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-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'" append-to-body>
+			<div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 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"
@@ -267,23 +240,18 @@
 								<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-upload
-              :action="javaApi+data.addUploadConfig.url"
-              v-if="showUpload(a.label)"
-              :on-success="m=>handleSuccessUp(m, a.label)"
-              :show-file-list="false"
-              :headers="token"
-              :multiple="false"
-              name="file"
-							:accept='data.addUploadConfig.accept'
-							:on-error="onError"
-              ref='upload'
+              <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
+              :on-success="m=>handleSuccessUp(m, a.label)" :show-file-list="false" :headers="token" :multiple="false"
+              name="file" :accept='data.addUploadConfig.accept' :on-error="onError" ref='upload'
               class="avatar-uploader"
               style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
-              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar"
+                  style="width: 80px;height: 80px;border-radius: 6px;">
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 								</el-upload>
-              <el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props" size="small" style="width: 100%;" :show-all-levels="false" @change="m=>handleCascader(m,a.label)"></el-cascader>
+              <el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable
+                :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;"
+                @change="m=>handleCascader(m,a.label)" filterable></el-cascader>
 						</el-col>
 					</div>
 				</div>
@@ -299,23 +267,18 @@
 								<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-upload
-              :action="javaApi+data.addUploadConfig.url"
-              v-if="showUpload(a.label)"
-              :on-success="m=>handleSuccessUp(m, a.label)"
-              :show-file-list="false"
-              :headers="token"
-              name="file"
-              :multiple="false"
-							:accept='data.addUploadConfig.accept'
-							:on-error="onError"
-              ref='upload'
+              <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)"
+              :on-success="m=>handleSuccessUp(m, a.label)" :show-file-list="false" :headers="token" name="file"
+              :multiple="false" :accept='data.addUploadConfig.accept' :on-error="onError" ref='upload'
               class="avatar-uploader"
               style="background: transparent;width: 80px;height: 80px;border: 1px solid #DCDFE6;border-radius: 6px;margin: 10px 0;">
-              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar" style="width: 80px;height: 80px;border-radius: 6px;">
+              <img v-if="upData[a.label]" :src="javaApi+'/img/'+upData[a.label]" class="avatar"
+                  style="width: 80px;height: 80px;border-radius: 6px;">
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
 								</el-upload>
-              <el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable :props="data.cascaderField.props" size="small" style="width: 100%;" :show-all-levels="false" @change="m=>handleCascader(m,a.label)"></el-cascader>
+              <el-cascader :options="data.cascaderField[a.label].tree" v-if="showCascader(a.label)" clearable
+                :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" size="small" style="width: 100%;"
+                @change="m=>handleCascader(m,a.label)" filterable></el-cascader>
 						</el-col>
 					</el-row>
 				</div>
@@ -356,7 +319,9 @@
 	import {
 		Page
 	} from 'iview';
-import { data } from 'jquery';
+import {
+    data
+  } from 'jquery';
 	export default {
 		props: {
 			tableRowClassName: {
@@ -444,7 +409,7 @@
 					}],
 					type: [],
 					uploadStr: "",
-          currentId:'',//褰撳墠楂樹寒鐨処D
+          currentId: '', //褰撳墠楂樹寒鐨処D
 				},
 				tableHead: [],
 				tableData: [],
@@ -469,18 +434,19 @@
 				token: null,
 				fileList: [],
 				init: true,
-        spanList:[
+        spanList: [
           // {
           //   arr:[],
           //   position:0
           // }
         ],
-        specialSpanList:[
+        specialSpanList: [
           // {
           //   arr:[],
           //   position:0
           // }
         ],
+param: {}
 			}
 		},
 		watch: {
@@ -493,10 +459,15 @@
 				}
 			},
 		},
+beforeUpdate() {
+      this.$nextTick(() => {
+        this.$refs.eltable.doLayout()
+      })
+    },
 		mounted() {
 			this.data = this.componentData
 			this.dataCopy = this.HaveJson(this.componentData)
-			if(this.data.init===undefined||this.data.init===true){
+			if (this.data.init === undefined || this.data.init === true) {
 				this.selectList()
 			}
 			this.token = {
@@ -523,15 +494,20 @@
           }
         });
       },
-      spanMethod({ row, column, rowIndex, columnIndex }){
+      spanMethod({
+        row,
+        column,
+        rowIndex,
+        columnIndex
+      }) {
         // 涓�鑸殑鍚堝苟琛�
-        if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+        if (this.data.spanConfig != undefined && this.data.spanConfig.rows && this.data.spanConfig.rows.length > 0) {
           let i = null;
-          let obj = this.data.spanConfig.rows.find((item,index)=>{
+          let obj = this.data.spanConfig.rows.find((item, index) => {
             i = index;
-            return item.index==columnIndex
+            return item.index == columnIndex
           })
-          if(obj){
+          if (obj) {
             const _row = this.spanList[i].arr[rowIndex];
             const _col = _row > 0 ? 1 : 0;
             return {
@@ -541,13 +517,14 @@
           }
         }
         // 鐗规畩鐨勫悎骞惰
-        if(this.data.spanConfig!=undefined&&this.data.spanConfig.special&&this.data.spanConfig.special.main&&this.data.spanConfig.special.rows&&this.data.spanConfig.special.rows.length>0){
+        if (this.data.spanConfig != undefined && this.data.spanConfig.special && this.data.spanConfig.special.main &&
+          this.data.spanConfig.special.rows && this.data.spanConfig.special.rows.length > 0) {
           let i = null;
-          let obj = this.data.spanConfig.special.rows.find((item,index)=>{
+          let obj = this.data.spanConfig.special.rows.find((item, index) => {
             i = index;
-            return item.index==columnIndex
+            return item.index == columnIndex
           })
-          if(obj){
+          if (obj) {
             const _row = this.specialSpanList[i].arr[rowIndex];
             const _col = _row > 0 ? 1 : 0;
             return {
@@ -563,10 +540,10 @@
 				} else {
 					this.multipleSelection = val[val.length - 1];
 				}
-        if(this.data.selectMethod!=undefined){
-          if(this.$parent.$el.className.indexOf('el-')==0){
+        if (this.data.selectMethod != undefined) {
+          if (this.$parent.$el.className.indexOf('el-') == 0) {
             this.$parent.$parent[this.data.selectMethod](val)
-          }else{
+          } else {
             this.$parent[this.data.selectMethod](val)
           }
         }
@@ -595,7 +572,7 @@
 			},
 			selectList() {
 				this.loading = true
-        if(this.data.isPage!=undefined&&this.data.isPage!=true){
+        if (this.data.isPage != undefined && this.data.isPage != true) {
           this.page = {
             current: -1,
             size: -1,
@@ -626,25 +603,28 @@
 						}
 					}
           // 涓�鑸殑鍚堝苟琛�
-          if(this.data.spanConfig!=undefined&&this.data.spanConfig.rows&&this.data.spanConfig.rows.length>0){
+          if (this.data.spanConfig != undefined && this.data.spanConfig.rows && this.data.spanConfig.rows.length >
+            0) {
             this.spanList = [];
-            this.data.spanConfig.rows.forEach((item,index)=>{
+            this.data.spanConfig.rows.forEach((item, index) => {
               this.spanList.push({
-                arr:[],
-                position:0
+                arr: [],
+                position: 0
               })
               this.rowspan(this.spanList[index].arr, this.spanList[index].position, item.name);
             })
           }
           // 鐗规畩鐨勫悎骞惰
-          if(this.data.spanConfig!=undefined&&this.data.spanConfig.special&&this.data.spanConfig.special.main&&this.data.spanConfig.special.rows&&this.data.spanConfig.special.rows.length>0){
+          if (this.data.spanConfig != undefined && this.data.spanConfig.special && this.data.spanConfig.special
+            .main && this.data.spanConfig.special.rows && this.data.spanConfig.special.rows.length > 0) {
             this.specialSpanList = []
-            this.data.spanConfig.special.rows.forEach((item,index)=>{
+            this.data.spanConfig.special.rows.forEach((item, index) => {
               this.specialSpanList.push({
-                arr:[],
-                position:0
+                arr: [],
+                position: 0
               })
-              this.rowspan(this.specialSpanList[index].arr, this.specialSpanList[index].position, this.data.spanConfig.special.main);
+              this.rowspan(this.specialSpanList[index].arr, this.specialSpanList[index].position, this.data
+                .spanConfig.special.main);
             })
           }
 					this.loading = false
@@ -700,25 +680,25 @@
       showUpload(label){
         if(this.data.addUpload&&this.data.addUpload.find(m=>m==label)){
           return true;
-        }else{
+        } else {
           return false;
         }
       },
-      showCascader(label){
-        if(this.data.cascaderField&&this.data.cascaderField[label]){
+      showCascader(label) {
+        if (this.data.cascaderField && this.data.cascaderField[label]) {
           return true;
-        }else{
+        } else {
           return false;
         }
       },
-      handleTree(arr,value){
+      handleTree(arr, value) {
         let label = ''
         for (let i = 0; i < arr.length; i++) {
-          if(arr[i].id==value){
+          if (arr[i].id == value) {
             label = arr[i].name
             return label
-          }else if(arr[i].children){
-            label = this.handleTree(arr[i].children,value)
+          } else if (arr[i].children) {
+            label = this.handleTree(arr[i].children, value)
           }
         }
         return label
@@ -730,11 +710,11 @@
 						this.upDia = true,
 						this.upData = this.HaveJson(row)
 						this.upHead = this.HaveJson(this.tableHead)
-            this.upHead.forEach((item,index)=>{
-              if(this.data.cascaderField&&this.data.cascaderField[item.label]){
-                if(this.upData[item.label]){
-                  this.upData[item.label] = this.upData[item.label].split(',').map(m=>Number(m));
-                }else{
+            this.upHead.forEach((item, index) => {
+              if (this.data.cascaderField && this.data.cascaderField[item.label]) {
+                if (this.upData[item.label]) {
+                  this.upData[item.label] = JSON.parse(this.upData[item.label])
+                } else {
                   this.upData[item.label] = []
                 }
               }
@@ -811,11 +791,11 @@
 						this.upData[a] = JSON.stringify(this.upData[a])
 					}
 				}
-        this.upHead.forEach((item,index)=>{
-          if(this.data.cascaderField&&this.data.cascaderField[item.label]){
-            if(this.upData[item.label]){
-              this.upData[item.label] = this.upData[item.label].join(',');
-            }else{
+        this.upHead.forEach((item, index) => {
+          if (this.data.cascaderField && this.data.cascaderField[item.label]) {
+            if (this.upData[item.label]) {
+              this.upData[item.label] = JSON.stringify(this.upData[item.label])
+            } else {
               this.upData[item.label] = ''
             }
           }
@@ -840,9 +820,10 @@
 					this.upLoad = false
 				})
 			},
-			openAddDia(addUrl) {
+			openAddDia(addUrl, param) {
 				this.addDia = true
 				this.addUrl = addUrl
+this.param = param
 				this.upData = {}
 				this.tableHead.forEach((k, v) => {
 					if (k.label != 'orderBy' && k.label != 'createTime' && k.label != 'updateTime' && k.label !=
@@ -892,15 +873,20 @@
 					}
 				}
 				this.addLoad = true
-        this.upHead.forEach((item,index)=>{
-          if(this.data.cascaderField&&this.data.cascaderField[item.label]){
-            if(this.upData[item.label]){
-              this.upData[item.label] = this.upData[item.label].join(',');
-            }else{
+        this.upHead.forEach((item, index) => {
+          if (this.data.cascaderField && this.data.cascaderField[item.label]) {
+            if (this.upData[item.label]) {
+              this.upData[item.label] = JSON.stringify(this.upData[item.label])
+            } else {
               this.upData[item.label] = ''
             }
           }
         })
+if (this.param !== undefined && this.param !== null) {
+          for (let i in this.param) {
+            this.upData[i] = this.param[i]
+          }
+        }
 				this.$axios.post(this.addUrl, this.upData, {
 					headers: {
 						'Content-Type': 'application/json'
@@ -1058,24 +1044,24 @@
 				})
 				return count * 15 + 60 + 'px'
 			},
-      handleSuccessUp(response,label){
-        if(typeof label === 'string'){
-          if(response.code==200){
+      handleSuccessUp(response, label) {
+        if (typeof label === 'string') {
+          if (response.code == 200) {
             this.upData[label] = response.data.url;
           }
-        }else{
-          if(response.code==200){
+        } else {
+          if (response.code == 200) {
             this.$message.success('涓婁紶鎴愬姛')
             this.selectList()
           }
         }
       },
-      handleCascader(e,label){
+      handleCascader(e, label) {
         this.upData[label] = e;
       },
       // 鎵归噺鍒犻櫎
-      batchDelete(){
-        if(this.multipleSelection&&this.multipleSelection.length>0){
+      batchDelete() {
+        if (this.multipleSelection && this.multipleSelection.length > 0) {
           this.$confirm('鏄惁鍒犻櫎閫変腑鐨勬暟鎹�?', "璀﹀憡", {
 							confirmButtonText: "纭畾",
 							cancelButtonText: "鍙栨秷",
@@ -1093,7 +1079,7 @@
 								this.$message.error('鍒犻櫎澶辫触')
 							})
 						}).catch(() => {})
-        }else{
+        } else {
           this.$message.error('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁')
         }
       },

--
Gitblit v1.9.3