From 8e20385ac0712b1a27420970c183482763cf4f6c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 14 六月 2023 14:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue   |   29 ++++++++++++++++-------------
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   12 ++++++++----
 Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue    |    1 +
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 8b3ec00..9558693 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -56,7 +56,7 @@
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: this.referConfig.options.data?this.referConfig.options.data.length :0
       },
       data:this.referConfig.options.data || [],
       selectionList: [],
@@ -84,6 +84,10 @@
     console.log(this.referConfig)
   },
   mounted() {
+    if(this.referConfig.options.page){
+      this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
+      this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+    }
   },
   computed:{
     valueInfo:function (){
@@ -194,10 +198,10 @@
     },
     setValue(){
       if(this.selectionList.length==0){
-        this.$message.error( '娌℃湁閫夋嫨鏁版嵁');
+        this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
         return false;
       }else if(this.selectionList.length>1 && !this.isMuti){
-        this.$message.error( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+        this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
         return false;
       }
 
@@ -255,7 +259,7 @@
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.referCrud.toggleSelection();
+      this.$refs.referCrud.clearSelection();
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 20bcad7..f71cc78 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -19,6 +19,9 @@
                  @size-change="sizeChange"
                  @refresh-change="refreshChange"
                  @on-load="onLoad">
+        <template slot="icon" slot-scope="scope">
+          <i :class="scope.row.icon" style="font-size:24px"></i>
+        </template>
       </avue-crud>
       <div class="avue-dialog__footer">
         <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
@@ -56,16 +59,10 @@
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: this.referConfig.options.data?this.referConfig.options.data.length :0
       },
       data:this.referConfig.options.data || [],
       selectionList: [],
-      objTree: {//鐢ㄤ簬琛ㄦ牸鏍戯紝鐩墠杩樻病鍔犱笂浣跨敤
-        keyId: 'oid',//鏍戝舰id瀛楁鍚嶇О
-        keyPid: 'parentSaleProduct',//鏍戝舰鐖秈d瀛楁鍚嶇О
-        title: 'id',//浠ユ爲褰㈠紡鏄剧ず鐨勫瓧娈�
-        defaultShow: false//榛樿鎶樺彔
-      },
       option: {
         addBtn: false,
         height: this.referConfig.options.height ? this.referConfig.options.height : 475,
@@ -80,6 +77,8 @@
         selection: true,
         dialogClickModal: false,
         highlightCurrentRow: true,
+        rowKey:'oid',
+        rowParentKey:'parentSaleProduct',
         column: []
       }
     };
@@ -90,6 +89,10 @@
     console.log(this.referConfig)
   },
   mounted() {
+    if(this.referConfig.options.page){
+      this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
+      this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+    }
   },
   computed:{
     valueInfo:function (){
@@ -255,10 +258,10 @@
     },
     setValue(){
       if(this.selectionList.length==0){
-        this.$message.error( '娌℃湁閫夋嫨鏁版嵁');
+        this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
         return false;
       }else if(this.selectionList.length>1 && !this.isMuti){
-        this.$message.error( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+        this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
         return false;
       }
 
@@ -316,7 +319,7 @@
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.referCrud.toggleSelection();
+      this.$refs.referCrud.clearSelection();
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
@@ -325,9 +328,9 @@
       if(this.url){
         this.loading = true;
         getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
+          debugger;
+          this.page.total = res.total;
+          this.data = res.data;
           this.loading = false;
           this.selectionClear();
         });
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index 118ea81..e69ddc8 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -119,6 +119,7 @@
           queryParams['replaceMap["' + key + '"]'] = this.options.replaceParams[key];//鏂扮殑鏂瑰紡
         }
       }
+      queryParams['parentValue']='\\IN(SELECT oid from PL_CODE_CLASSIFY where id =\'hesuanfenlei\')'
       this.params=queryParams;
 
     },

--
Gitblit v1.9.3