From 0f82f4588e9d8ec8df06d7bc909b53506d4b2fef Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 18 七月 2023 11:30:29 +0800
Subject: [PATCH] 主数据必输bug
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 3 +
Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 72 ++++++++++++++++++++++++++----------
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 2
Source/UBCS-WEB/vue.config.js | 4 +-
4 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index a3c4375..b32f802 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -77,7 +77,7 @@
<!-- 楂樼骇鏌ヨ-->
<advanced-query :options="this.options" :visible.sync="findvisible" @echoContion="echoContion"></advanced-query>
<!-- 瀵煎嚭-->
- <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData"></MasterTransfer>
+ <MasterTransfer :visible.sync="dialogPush" :tableHeadData="tableHeadFindData" :codeClassifyOid="codeClassifyOid"></MasterTransfer>
<!-- 鐩镐技椤�-->
<ResembleQueryDialog :codeClassifyOid="codeClassifyOid" :codeRuleOid="this.codeRuleOid" :rowOid="rowOid"
:templateOid="templateOid" :visible.sync="similarVisible"></ResembleQueryDialog>
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
index ccfc623..186a952 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue
@@ -9,11 +9,12 @@
</div>
<div style="text-align: center">
<el-transfer
- style="text-align: left; display: inline-block"
+ style="text-align: left; display: inline-block;height: 400px"
filterable
:filter-method="filterMethod"
- filter-placeholder="璇疯緭鍏ュ煄甯傛嫾闊�"
+ filter-placeholder="鍏抽敭璇嶆悳绱�"
v-model="value"
+ :titles="['鏈�夊睘鎬�', '宸查�夊睘鎬�']"
:data="data">
</el-transfer>
</div>
@@ -23,28 +24,33 @@
<script>
export default {
name: "MasterTransfer",
- props:['visible','tableHeadData'],
+ props:['visible','tableHeadData','codeClassifyOid'],
data(){
- const generateData = () => {
- const data = [];
- const cities = ['涓婃捣', '鍖椾含', '骞垮窞', '娣卞湷', '鍗椾含', '瑗垮畨', '鎴愰兘'];
- cities.forEach((city, index) => {
- data.push({
- label: city,
- key: index,
- });
- });
- return data;
- };
return {
- data: generateData(),
+ data: [],
value: [],
filterMethod(query, item) {
return item.label.indexOf(query) > -1;
},
dialogPush:this.visible,
radio:0,
- tableHeadFindData:[]
+ tableHeadFindData:[],
+ tableExportData:[],
+ option:{
+ title: '鏂囨。鏍囬',
+ column: [{
+ label: '澶氱骇琛ㄥご',
+ prop: 'header',
+ children: []
+ }],
+ data: [{
+ title1: "娴嬭瘯鏁版嵁1",
+ title2: "娴嬭瘯鏁版嵁2"
+ }, {
+ title1: "娴嬭瘯鏁版嵁2",
+ title2: "娴嬭瘯鏁版嵁2"
+ }]
+ }
};
},
watch:{
@@ -52,21 +58,47 @@
visible (){
this.dialogPush = this.visible;
},
- tableHeadData(){
- this.tableHeadFindData=this.tableHeadData;
-
+ //琛ㄥご鏁版嵁 鐢ㄦ潵娓叉煋绌挎妗�
+ tableHeadData:{
+ handler(newval,oldval){
+ if(newval){
+ this.tableHeadFindData=newval.map(obj => obj.label);
+ this.tableHeadFindData.forEach((city, index) => {
+ this.data.push({
+ label: city,
+ key: index,
+ });
+ });
+ return this.data;
+ }
+ }
+},
+ codeClassifyOid:{
+ handler(newval,oldval){
+ console.log('daochu',newval,oldval)
+ }
}
},
computed:{
},
mounted() {
- console.log(this.tableHeadData)
+ this.ExportRend()
},
methods:{
//鍏抽棴椤甸潰
recoverPage(){
this.$emit('update:visible', false);
+ },
+ //瀵煎嚭琛ㄦ牸鏁版嵁杞崲琛ㄥご淇℃伅
+ ExportRend(){
+ this.tableExportData=this.tableHeadData.map(obj => {
+ return {
+ label: obj.label,
+ prop: obj.prop
+ }
+ })
+ console.log(this.tableExportData)
}
}
}
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index b57d4e4..ed4565f 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -923,7 +923,8 @@
selectHandle(selection,row){
this.crudOid=row.oid;
this.crudArray=selection;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ console.log(selection,row)
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
this.ProData = res.data.data;
}).catch(res => {
this.$message.error(res)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 63a88c9..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,8 +28,8 @@
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
// target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
- target: 'http://192.168.1.46:37000',
- // target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.46:37000',
+ target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
--
Gitblit v1.9.3