Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -300,8 +300,6 @@
    },
    tableDataArray: {
      handler(newval, oldval) {
        this.keyWordFind='';
        this.WupinFindValue=''
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout()
@@ -323,8 +321,13 @@
              }
            }
          }

          if(_index==0){
            this.keyWordFind=record.field
          }
        })
        this.tableHeadFindDatas = newval;
        this.WupinFindValue=''
      },
    },
    total: {
@@ -876,10 +879,10 @@
    },
    //输入回车搜索
    tableFindInp() {
      if (this.WupinFindValue.trim() === '') {
      /*if (this.WupinFindValue.trim() === '') {
        this.$message.warning('输入值不能为空')
        return;
      }
      }*/
      TableData({
        templateOid: this.templateOid,
        codeClassifyOid: this.codeClassifyOid,
@@ -887,7 +890,6 @@
        limit: this.page.pageSize,
        [ 'conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
      }).then(res => {
        console.log(res)
        this.tableData = res.data.data
      })
    }