Merge remote-tracking branch 'origin/master'

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

@@ -75,6 +75,18 @@
              </el-table>
            </div>
          </el-row>
          <!--          申请-->
          <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
                              :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
                              :visible.sync="applyvisible"
                              type="add"
                              @submit="applySumbit">
          </FormTemplateDialog>
          <!--          修订-->
          <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                              :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid" :title="'修改编码信息'"
                              :visible.sync="amendvisible"
                              type="edit" @submit="amendSumbit"></FormTemplateDialog>
          <!--          新增-->
          <FormTemplateDialog :TreeValue="TreeValue" :codeClassifyOid="this.codeClassifyOid"
                              :codeRuleOid="this.codeRuleOid" :disabledProp="disabledProp" :templateOid="templateOid"
@@ -273,6 +285,8 @@
        label: "name",
      },
      tableHeadFindDatas: [],
      applyvisible:false,
      amendvisible:false,
      addvisible: false,
      editvisible: false,
      findvisible: false,
@@ -505,11 +519,26 @@
    },
    //标准申请
    codeApplyHandler(){
      console.log('1')
      this.$nextTick(() => {
        this.applyvisible = true;
      });
    },
    applySumbit(){

    },
    amendSumbit(){

    },
    //标准修订
    codeAMENDHandler(){
      console.log('2')
      if (this.selectRow.length !== 1) {
        this.$message.warning("请选择一条数据");
      } else if (this.selectRow[0].lcstatus !== "Editing") {
        this.$message.warning("编码状态不是“编辑中”，不可编辑");
      } else {
        this.amendvisible = true;
        this.rowOid = this.selectRow[0].oid;
      }
    },
    addSaveHandler(){
      this.$nextTick(() => {
@@ -825,15 +854,13 @@
    },
    //编辑
    editHandler() {
      if (this.selectRow.length <= 0) {
      if (this.selectRow.length !== 1) {
        this.$message.warning("请选择一条数据");
      } else if (this.selectRow.length > 1) {
        this.$message.warning("只能选择一条数据");
      } else if (this.selectRow[0].lcstatus != "Editing") {
        this.$message.warning("编码状态不是“编辑中”,不可编辑");
      } else if (this.selectRow[0].lcstatus !== "Editing") {
        this.$message.warning("编码状态不是“编辑中”，不可编辑");
      } else {
        this.editvisible = true;
        this.rowOid = this.selectRow[0]['oid']
        this.rowOid = this.selectRow[0].oid;
      }
    },
    //高级查询按钮

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

@@ -392,7 +392,22 @@
              focus: this.simFouce,
              readonly: true,
            },

            {
              label: '是否参与关键属性校验',
              prop: 'isParticipateCheck',
              type: 'switch',
              activeColor: "#13ce66",
              inactiveColor: "#ff4949",
              labelWidth:160,
              dicData: [{
                label: '否',
                value: 0
              }, {
                label: '是',
                value: 1
              }
              ]
            }
          ]

      }

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

@@ -63,6 +63,16 @@
                <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-switch
                  v-model="TreeAddform.codeKeyAttrValue"
                  active-text="是"
                  inactive-text="否"
                  active-color="#13ce66"
                  inactive-color="#ff4949"
                  @change="switchChange">
                </el-switch>
              </el-form-item>
              <el-form-item label="相似查询规则：" label-width="150px">
                <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
                          @focus="simFouce"></el-input>
@@ -586,7 +596,9 @@
        //编码规则
        codeRuleOidName: "",
        //存储的业务类型
        btmTypeName: ""
        btmTypeName: "",
        codeKeyAttrValue:false,
        isParticipateCheck:0
      },
      rules: {
        id: [
@@ -853,6 +865,11 @@
  created() {
  },
  methods: {
    // switch
    switchChange(){
      this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
      console.log(this.TreeAddform.isParticipateCheck)
    },
    //存储的业务类型关闭
    BtmEscHandler() {
      this.SelectFInd = '';
@@ -1157,6 +1174,8 @@
            });
            Object.keys(this.TreeAddform).forEach(key => {
              this.TreeAddform[key] = "";
              this.TreeAddform.codeKeyAttrValue = false;
              this.TreeAddform.isParticipateCheck = 0;
            });
            this.getAttr();
            this.TreeAddFormVisible = false;
@@ -1350,6 +1369,10 @@
          this.crudOid = ''
        }
        this.TreeList = res3.data.data;
        if(!this.TreeList.isParticipateCheck){
          this.$set(this.TreeList,"isParticipateCheck",0)
          return
        }
      } catch (error) {
        this.$message.error(error);
      }