Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -101,6 +101,7 @@
  },
  data() {
    return {
      add:'',
      codeattrsecValue:'',
      ValidataValue:false,
      eventFlag:{},
@@ -232,11 +233,10 @@

        let columnItem = {
          change:(val)=>{
            // console.log(val)
            if(val.column.field === "drawingno"){
              this.codeattrsecValue=val.value;
            }
            console.log(this.codeattrsecValue)
            // console.log(this.codeattrsecValue)
          },
          dataKey:formItem.dataKey || formItem.field,
          label: formItem.text,
@@ -257,7 +257,7 @@
          keyAttr: formItem.keyAttr,
          value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
            (formItem.secType == "codedatesec" ? formItem.codeDateValue: null) || ( TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
            (formItem.secType == "codeattrsec" ? this.codeattrsecValue : null),
            (formItem.secType == "codeattrsec" ? this.add : null),
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
@@ -296,7 +296,7 @@
            },
          ],
          props: {
            label: "itemName",
            label: "value",
            value: "key",
          },
        };
@@ -347,6 +347,9 @@
          formItem.fieldMap[formItem.field + 'id'] = 'id'
        }
        let columnItem = {
          change:(val)=>{
            console.log('1',val)
          },
          label: formItem.text,
          labelslot: true,
          prop: this.$utilFunc.isValuableObj(formItem.referConfig)
@@ -453,6 +456,7 @@
              if (Object.hasOwnProperty.call(element, newAttr)) {
                const oldAttr = element[newAttr];
                formItem[newAttr] = formItem[oldAttr];

              }
            }
          } else if (configType === "directVoluation") {
@@ -503,13 +507,12 @@
    geDictData(dictKeys) {
      dictKeys.forEach((dictObj) => {
        getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
          console.log(res)
          if (res.data && res.data.code === 200) {
            this.option.column = this.option.column.map((item) => {
              if (item.field === dictObj.field) {
                let dictData = (res.data.data || []).map((itm) => {
                  itm.value = itm.dictValue;
                  itm.key = itm.dictKey;
                  itm.value = itm.itemName;
                  itm.key = itm.itemValue;
                  return itm;
                });
                item.dicData = dictData;

 Source/UBCS-WEB/src/components/FormTemplate/index.vue

@@ -226,6 +226,13 @@
      },
    },
  },
  watch:{
    codeApplyForm:{
      handler(newval,oldval){
        // console.log('newval',newval)
      }
    }
  },
  methods: {
    openDialog() {
      this.getFormTemplate();

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

@@ -6,15 +6,15 @@
          <div>
          </div>
          <el-row style="width: 100%;margin-bottom: 10px">
            <div style="margin-bottom: 10px">
              <el-button v-for="(item, index) in masterVrBtnList"
                         v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
                         :key="index" plain size="small"
                         type="primary"
                         @click="handleBtnClick(item)">{{
                  item.name
                }}
              </el-button>
            <div style="margin-bottom: 10px" >
                <el-button v-for="(item, index) in masterVrBtnList"
                           v-if="!['PREVIEW', 'DELETEFILE', 'revisefile', 'DOWNLOADFILE', 'UPLOADFILE'].includes(item.uniqueFlag)"
                           :key="index" plain size="small"
                           type="primary"
                           @click="handleBtnClick(item)">{{
                    item.name
                  }}
                </el-button>
              <span v-if="tableHeadFindData.length > 0">
              <el-select slot="prepend" v-model="keyWordFind" placeholder="请选择" size="small">
                <el-option v-for="item in tableHeadFindData" :key="item.id" :label="item.label"
@@ -424,9 +424,7 @@
    },
    tableHeadBtnData: {
      handler(newval) {
        if (newval.length !== 0) {
          this.masterVrBtnList = newval
        }
      },
      deep: true
    },