Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue

@@ -399,6 +399,7 @@
              activeColor: "#13ce66",
              inactiveColor: "#ff4949",
              labelWidth:160,
              value:1,
              dicData: [{
                label: '否',
                value: 0

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -63,7 +63,7 @@
                <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
                          @focus="Keyfouce"></el-input>
              </el-form-item>
              <el-form-item label="是否参与关键属性校验：" label-width="150px">
              <el-form-item label="是否参与关键属性校验：" label-width="170px">
                <el-switch
                  v-model="TreeAddform.codeKeyAttrValue"
                  active-text="是"
@@ -597,8 +597,8 @@
        codeRuleOidName: "",
        //存储的业务类型
        btmTypeName: "",
        codeKeyAttrValue:false,
        isParticipateCheck:0
        codeKeyAttrValue:true,
        isParticipateCheck:1
      },
      rules: {
        id: [
@@ -868,7 +868,7 @@
    // switch
    switchChange(){
      this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
      console.log(this.TreeAddform.isParticipateCheck)
      // console.log(this.TreeAddform.isParticipateCheck)
    },
    //存储的业务类型关闭
    BtmEscHandler() {
@@ -1156,6 +1156,8 @@
    TreeEscHandler() {
      this.TreeAddform = {};
      this.TreeAddFormVisible = false;
      this.TreeAddform.codeKeyAttrValue = true;
      this.TreeAddform.isParticipateCheck = 1;
      // 关闭弹窗清空校验
      this.$refs.myForm.clearValidate();
    },
@@ -1174,8 +1176,8 @@
            });
            Object.keys(this.TreeAddform).forEach(key => {
              this.TreeAddform[key] = "";
              this.TreeAddform.codeKeyAttrValue = false;
              this.TreeAddform.isParticipateCheck = 0;
              this.TreeAddform.codeKeyAttrValue = true;
              this.TreeAddform.isParticipateCheck = 1;
            });
            this.getAttr();
            this.TreeAddFormVisible = false;
@@ -1370,7 +1372,7 @@
        }
        this.TreeList = res3.data.data;
        if(!this.TreeList.isParticipateCheck){
          this.$set(this.TreeList,"isParticipateCheck",0)
          this.$set(this.TreeList,"isParticipateCheck",1)
          return
        }
      } catch (error) {

 Source/UBCS-WEB/src/views/code/code.vue

@@ -886,7 +886,7 @@
                        :referConfig="this.referConfig || {}"
                        :display="true"
                        :value="form.customCodeSerialClass"
                        :text="form.customCodeSerialClassText"
                        :text="form.customCodeSerialClass"
                        @setReferValue="setReferValue"
                      ></vciWebRefer>
<!--                                    <el-input-->
@@ -1718,6 +1718,10 @@
    //自定义流水失焦
    setReferValue(data){
      console.log(data)
      if(data.field){
        this.form[data.field] = data.value || "";
        // this.form[data.showField] = data.text || "";
      }
    },
    /** 转移规则所有者对话框 */
    escapeOwner() {
@@ -1777,7 +1781,7 @@
      //转换成JSON字符串进行父组件回显
      let submitFormJson = JSON.stringify(content);
      this.form.referConfig = submitFormJson || "";
      debugger;
      // debugger;
    },
    /** 引用码段为【参照引用的业务类型】选取值之后的内容回显时调用 */
    echoReferBtmType(content) {
@@ -2797,6 +2801,7 @@
                type: "success",
                message: "操作成功!",
              });
              console.log(this.form)
              // 关闭对话框
              this.addBasicCodeSettingBox = false;
              // 点击新增基础码段,关闭窗口之后触发重新加载
@@ -3283,6 +3288,7 @@
    },
    /** 码段类型改变时，增加对应的form表单中的属性*/
    changeSectypeFormItems(row) {
      console.log(row)
      if (
        func.isEmpty(this.enumParam.secTypeList) ||
        this.enumParam.secTypeList.length == 0
@@ -3303,6 +3309,7 @@
        pkCodeRule: row != null ? row.pkCodeRule : this.form.pkCodeRule, //所属编码规则
        prefixCode: row != null ? row.prefixCode : this.form.prefixCode, //前缀
        suffixCode: row != null ? row.suffixCode : this.form.suffixCode, //后缀
        // customCodeSerialClass: row != null ? row.customCodeSerialClass : this.form.customCodeSerialClass
      };
      if (this.form.secType === "codefixedsec") {
        //固定码段