From c0025985707e90ef01e4a178691c2609ba0459e5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 10:01:51 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index f50524e..18bf484 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -5,7 +5,8 @@
                :visible.sync="visible"
                top="0"
                class="avue-dialog avue-dialog--top"
-               :width="referConfig.options.width|| '80%'">
+               :width="options.width|| '80%'">
+
       <avue-crud :option="option"
                  :table-loading="loading"
                  :data="data"
@@ -42,7 +43,7 @@
   data() {
     return {
       visible: false,
-      options: this.referConfig.options,
+      options: this.referConfig.options||{},
       isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
       props: {
         value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -62,7 +63,7 @@
       selectionList: [],
       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,
@@ -80,8 +81,8 @@
   },
   created() {
     this.getParams();
-    console.log('referConfig:')
-    console.log(this.referConfig)
+    // console.log('referConfig:')
+    // console.log(this.referConfig)
   },
   mounted() {
     if(this.referConfig.options.page){
@@ -180,6 +181,7 @@
               ...item,
               label: item.title,
               prop: item.field,
+              formatter:item.template,
               search: true
             }
           }
@@ -241,7 +243,7 @@
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page);
       done();
     },
     currentChange(currentPage){
@@ -253,26 +255,34 @@
     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.clearSelection();
+      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;
-          this.page.total = data.total;
-          this.data = data.records;
+        var query={}
+        if (this.query) {
+          for (var key in this.query) {
+            query['conditionMap["' + key + '"]'] = this.query[key];
+          }
+        }
+        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+          this.data = res.data.records;
+          this.page.total=res.data.total
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 

--
Gitblit v1.9.3