From 89a21c0eecacd040e8189faeda6f73f69167cdc9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 14:51:33 +0800
Subject: [PATCH] 合并

---
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 594e1ac..348fc9b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -27,7 +27,7 @@
       </div>
     </el-dialog>
 
-    <avue-input v-model="text" :placeholder="title" @click="visible=true"></avue-input>
+    <avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
     <!--<avue-input-table ref="referTable"  :props="props"  :column="column" :on-load="onLoad" v-model="value"  :placeholder="title" ></avue-input-table>
   -->
   </div>
@@ -38,7 +38,7 @@
 import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
 export default {
   name: "vciWebReferDefalut",
-  props:["referConfig","value","text","title"],
+  props:["referConfig","value","text","title","disabled"],
   data() {
     return {
       visible: false,
@@ -56,19 +56,13 @@
       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,
+        //height: this.referConfig.options.height ? this.referConfig.options.height : 475,
         calcHeight: 30,
         tip: false,
         menu:false,
@@ -90,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 (){
@@ -182,6 +180,7 @@
               ...item,
               label: item.title,
               prop: item.field,
+              formatter:item.template,
               search: true
             }
           }
@@ -200,10 +199,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;
       }
 
@@ -243,7 +242,7 @@
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page);
       done();
     },
     currentChange(currentPage){
@@ -255,24 +254,30 @@
     selectionChange(list) {
       if (!this.isMuti && list.length > 1) {
         const nowVal = list.shift();
-        this.$refs.referCrud.toggleRowSelection(nowVal, false);
+        this.$refs.referDefalutCrud.toggleRowSelection(nowVal, false);
       }
       this.selectionList = list
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.referCrud.toggleSelection();
+      this.$refs.referDefalutCrud.toggleSelection();
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
-    onLoad(page, params = this.params) {
+    onLoad(page, params={}) {
       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;
+        var query={}
+        if (this.query) {
+          for (var key in this.query) {
+            query['conditionMap["' + key + '"]'] = this.query[key];
+          }
+        }
+        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
+          const data = res.data;
           this.page.total = data.total;
-          this.data = data.records;
+          this.data = data.data;
           this.loading = false;
           this.selectionClear();
         });

--
Gitblit v1.9.3