Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue

@@ -183,6 +183,7 @@
          label: '密级',
          width: 60,
          hidden: (!this.controllerSecret),
          hide: (!this.controllerSecret),
          formatter:function (d){
            return d.secretGradeText || d.data.secretGradeText
          }
@@ -209,6 +210,8 @@
              label: item.title,
              prop: item.field,
              formatter:formatter,
              sortable:item.sort,
              hide:item.hidden,
              search:this.options.tableConfig.queryColumns.some(qItem=>{
                return qItem.field==item.field
              })

 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue

@@ -202,10 +202,16 @@
                    message: "请输入" + item.field,
                    trigger: "blur"
                  }];
                  item.formatter=function(d){
                    return d.field || d.data.field
                  };
                }
                item.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,
@@ -267,6 +273,8 @@
                label: item.title,
                prop: item.field,
                formatter:formatter,
                sortable:item.sort,
                hide:item.hidden,
                search: this.options.tableConfig.queryColumns.some(qItem=>{
                  return qItem.field==item.field
                })
@@ -281,7 +289,6 @@
      this.params=paramsData;
    },
    setValue(){
      console.log('确定')
      if(this.selectionList.length==0){
        this.$message.warning( '没有选择数据');
        return false;