From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示

---
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |  255 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 179 insertions(+), 76 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 8cc886b..f46541a 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -1,20 +1,23 @@
 <template>
   <div>
-    <el-dialog :title="title"
-               v-dialogDrag append-to-body="true"
+    <el-dialog v-dialogDrag
+               :height="options.height|| 'auto'" :title="title"
                :visible.sync="visible"
-               top="0"
+               :width="options.width|| '80%'"
+               append-to-body="true"
                class="avue-dialog avue-dialog--top"
-               :width="referConfig.options.width|| '80%'">
-      <avue-crud :option="option"
-                 :table-loading="loading"
-                 :data="data"
-                 :page.sync="page"
+               top="0"
+               @close="dialogClose">
+      <avue-crud ref="referDefalutCrud"
                  v-model="value"
-                 ref="referDefalutCrud"
+                 :data="data"
+                 :option="option"
+                 :page.sync="page"
+                 :table-loading="loading"
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
+                 @row-click="rowClick"
                  @current-change="currentChange"
                  @size-change="sizeChange"
                  @refresh-change="refreshChange"
@@ -22,57 +25,60 @@
       </avue-crud>
       <div class="avue-dialog__footer">
         <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
-        {{ this.referConfig.options.width }}
-        <el-button @click="visible=false">鍙� 娑�</el-button>
-        <el-button @click="setValue" type="primary">纭� 瀹�</el-button>
+        <el-button @click="escHandler">鍙� 娑�</el-button>
+        <el-button type="primary" @click="setValue">纭� 瀹�</el-button>
       </div>
     </el-dialog>
 
-    <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>
-  -->
+    <avue-input v-model="text" :disabled="disabled" :placeholder="title" :readonly="true"
+                @click="!disabled && (visible=true)"></avue-input>
   </div>
 </template>
 
 <script>
-import { validatenull } from "@/util/validate";
-import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
+import {validatenull} from "@/util/validate";
+import {getList, getLazyList, getTableDefinedUrl} from "@/api/refer/table";
+
 export default {
   name: "vciWebReferDefalut",
-  props:["referConfig","value","text","title","disabled"],
+  props: ["referConfig", "value", "text", "title", "disabled", "referType"],
   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',
         label: this.referConfig.textField || this.referConfig.options.textField || "name"
       },
       url: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
-      tableDefinedUrl:'',//骞冲彴琛ㄦ牸鍦板潃
-      copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql',  'queryScheme'],
+      method: this.referConfig.options.method || 'GET',
+      tableDefinedUrl: '',//骞冲彴琛ㄦ牸鍦板潃
+      copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql', 'queryScheme'],
       query: {},
       loading: false,
       page: {
+        layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
         pageSize: 10,
         currentPage: 1,
-        total: this.referConfig.options.data?this.referConfig.options.data.length :0
+        total: this.referConfig.options.data ? this.referConfig.options.data.length : 0
       },
-      data:this.referConfig.options.data || [],
+      data: this.referConfig.options.data || [],
       selectionList: [],
       option: {
         addBtn: false,
+        columnBtn: false,
         //height: this.referConfig.options.height ? this.referConfig.options.height : 475,
         calcHeight: 30,
         tip: false,
-        menu:false,
+        menu: false,
         searchShow: true,
         searchMenuSpan: 6,
         searchLabelWidth: 90,
         border: true,
         index: true,
         selection: true,
+        reserveSelection: true,
         dialogClickModal: false,
         highlightCurrentRow: true,
         column: []
@@ -81,22 +87,32 @@
   },
   created() {
     this.getParams();
-    console.log('referConfig:')
-    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;
+  mounted() {
+    if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+      this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+      this.page.currentPage = this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+    } else if (!validatenull(this.referConfig.options.limit)) {
+      this.page.pageSize = this.referConfig.options.limit;
+    } else if (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+      this.page.pageSize = this.referConfig.options.tableConfig.limit;
     }
   },
-  computed:{
-    valueInfo:function (){
-      return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
+  computed: {
+    valueInfo: function () {
+      return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]") : '鏈缃��'
     }
   },
   methods: {
-    getParams:function () {
+    escHandler() {
+      this.visible = false;
+      this.$refs.referDefalutCrud.refreshTable()
+    },
+    dialogClose() {
+      this.visible = false;
+      this.$refs.referDefalutCrud.refreshTable()
+    },
+    getParams: function () {
       var queryParams = {};
       if (this.options.extraParams) {
         queryParams = this.options.extraParams;
@@ -119,9 +135,15 @@
         queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
       }
       queryParams['referType'] = queryParams['referBo']
-      if (this.options.remoteSort && this.options.initSort) {
+      if (this.options.initSort) {
         queryParams['order'] = this.options.initSort.type;//鏂规硶
         queryParams['sort'] = this.options.initSort.field;//瀛楁
+      }
+      if (this.options.sortField) {
+        queryParams['sort'] = this.options.sortField;//瀛楁
+      }
+      if (this.options.sortType) {
+        queryParams['order'] = this.options.sortType;//鏂规硶
       }
       if (this.options.conditionParams) {
         //璇存槑鏄墿灞曞睘鎬�
@@ -155,34 +177,65 @@
         this.option.column = [{
           prop: 'id',
           label: '鑻辨枃鍚嶇О',
-          sort: true,
+          sortable: true,
           width: 150,
-          search: true
+          search: true,
+          formatter: function (d) {
+            return d.id || d.data.id
+          }
         }, {
           prop: 'name',
           label: '涓枃鍚嶇О',
-          sort: true,
+          sortable: true,
           width: 150,
-          search: true
+          search: true,
+          formatter: function (d) {
+            return d.name || d.data.name
+          }
         }, {
           prop: 'description',
           label: '鎻忚堪',
-          width: 250
+          width: 250,
+          formatter: function (d) {
+            return d.description || d.data.description
+          }
         }, {
           prop: 'secretGradeText',
           label: '瀵嗙骇',
           width: 60,
-          hidden: (!this.controllerSecret)
+          hidden: (!this.controllerSecret),
+          hide: (!this.controllerSecret),
+          formatter: function (d) {
+            return d.secretGradeText || d.data.secretGradeText
+          }
         }];
       } else {
         this.option.column = this.options.tableConfig.cols.map(item => {
           if (item.field != 'LAY_TABLE_INDEX' && item.field != 'LAY_CHECKED') {
+            let formatter = item.template || item.templet;
+            if (typeof formatter == "string" && formatter != '') {
+              formatter = eval("(" + formatter + ")")
+            } else {
+              formatter = function (d) {
+                if (d[item.field] != undefined) {
+                  return d[item.field]
+                } else if (d.data[item.field] != undefined) {
+                  return d.data[item.field]
+                } else {
+                  return ''
+                }
+              }
+            }
             return {
               ...item,
               label: item.title,
               prop: item.field,
-              formatter:item.template,
-              search: true
+              formatter: formatter,
+              sortable: item.sort,
+              hide: item.hidden,
+              search: this.options.tableConfig.queryColumns.some(qItem => {
+                return qItem.field == item.field
+              })
             }
           }
         })
@@ -198,43 +251,74 @@
       }
       this.params = paramsData;
     },
-    setValue(){
-      if(this.selectionList.length==0){
-        this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
+    setValue() {
+      if (this.selectionList.length == 0) {
+        this.$message.warning('娌℃湁閫夋嫨鏁版嵁');
         return false;
-      }else if(this.selectionList.length>1 && !this.isMuti){
-        this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+      } else if (this.selectionList.length > 1 && !this.isMuti) {
+        this.$message.warning('姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
         return false;
       }
 
       var value = [];
       var text = [];
-      var isMutiValue = (this.props.value.indexOf(",")>-1);
-      var isMutiRaw = (this.props.label.indexOf(",")>-1);
-      var _that=this
-      this.selectionList.forEach((item,_index) =>{
-        if(isMutiValue){
+      var isMutiValue = (this.props.value.indexOf(",") > -1);
+      var isMutiRaw = (this.props.label.indexOf(",") > -1);
+      var _that = this
+      this.selectionList.forEach((item, _index) => {
+        if (isMutiValue) {
           var valueFieldArray = _that.props.value.split(",");
-          valueFieldArray.forEach((_indexField,_itemField)=>{
-            value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+          valueFieldArray.forEach((_itemField, _indexField) => {
+            let itemValue = item[_itemField];
+            if (itemValue == undefined || itemValue == null) {
+              itemValue = item['data'][_itemField]
+            }
+            value.push(itemValue + (_that.referConfig.valueSep ? _that.referConfig.valueSep : ' '));
           })
-        }else {
-          value.push(item[_that.props.value]);
+        } else {
+          let itemValue = item[_that.props.value];
+          if (itemValue == undefined || itemValue == null) {
+            itemValue = item['data'][_that.props.value]
+          }
+          value.push(itemValue);
         }
-        if(isMutiRaw) {
+        if (isMutiRaw) {
           var rawFieldArray = _that.props.label.split(",");
-          rawFieldArray.forEach((_indexField,_itemField)=>{
-            text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+          rawFieldArray.forEach((_itemField, _indexField) => {
+            let itemText = item[_itemField];
+            if (itemText == undefined || itemText == null) {
+              itemText = item['data'][_itemField]
+            }
+            text.push(itemText + (_that.referConfig.textSep ? _that.referConfig.textSep : ' '));
           })
-        }else{
-          text.push(item[_that.props.label]);
+        } else {
+          let itemText = item[_that.props.label];
+          if (itemText == undefined || itemText == null) {
+            itemText = item['data'][_that.props.label]
+          }
+          text.push(itemText);
         }
       })
 
-      this.value=value.join(',');
-      this.text=text.join(',')
-      this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList});
-      this.visible=false;
+      let mapFields = this.referConfig.fieldMap || {};
+      try {
+        if (!validatenull(this.options.mapFields)) {
+          mapFields = Object.assign(this.referConfig.fieldMap, JSON.parse(this.options.mapFields));
+        }
+      } catch (e) {
+
+      }
+      this.value = value.join(',');
+      this.text = text.join(',')
+      this.$emit("setValue", {
+        field: this.referConfig.field,
+        showField: this.referConfig.showField,
+        value: this.value,
+        text: this.text,
+        rawData: this.selectionList,
+        fieldMap: mapFields
+      });
+      this.visible = false;
     },
     searchReset() {
       this.query = {};
@@ -246,11 +330,16 @@
       this.onLoad(this.page);
       done();
     },
-    currentChange(currentPage){
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
-    sizeChange(pageSize){
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
+    },
+    rowClick(row) {
+      this.$refs.referDefalutCrud.toggleSelection();
+      this.$refs.referDefalutCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+      this.selectionList = [row]
     },
     selectionChange(list) {
       if (!this.isMuti && list.length > 1) {
@@ -266,21 +355,35 @@
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
-    onLoad(page, params={}) {
-      if(this.url){
+    onLoad(page, params = {}) {
+      if (this.url) {
         this.loading = true;
-        var query={}
+        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.data;
+        getList(Object.assign(params, this.params, this.query, query), page.currentPage, page.pageSize, this.url, this.method).then(res => {
+          let data = []
+          if (res.data.records) {
+            data = res.data.records
+            this.page.total = res.data.total;
+          } else {
+            data = res.data.data.records;
+            this.page.total = res.data.data.total;
+          }
+          this.data = data.map(item => {
+            item.data = item.data || {}
+            return {
+              ...item
+            }
+          })
           this.loading = false;
           this.selectionClear();
+        }).catch(error => {
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 
@@ -290,7 +393,7 @@
 </script>
 
 <style scoped>
-.valueInfo{
+.valueInfo {
   float: left;
   border: 1px solid #E9E7E7;
   display: inline-block;

--
Gitblit v1.9.3