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

@@ -1552,8 +1552,8 @@
        serialDependFlag: false, //是否流水依赖
        serialDependOrder: "", //流水依赖顺序
        nullableFlag: false, //是否为空
        prefix: "", //前缀
        suffix: "", //后缀
        prefixCode: "", //前缀
        suffixCode: "", //后缀
        displayFlag: false, //
        componentCodeFlag: false, //是否参与编码
        pkCodeRule: "", //所属编码规则
@@ -3219,16 +3219,18 @@
      }
      this.form = {
        oid: row !=null ? row.oid:this.form.oid,
        id: row !=null ? row.id:this.form.id, //编号,
        name: row !=null ? row.name:this.form.name, //名称
        secType: row !=null ?  row.secType:this.form.secType, //码段类型
        description:  row !=null ? row.description:this.form.description, //描述
        id: row != null ? row.id:this.form.id, //编号,
        name: row != null ? row.name:this.form.name, //名称
        secType: row != null ?  row.secType:this.form.secType, //码段类型
        description:  row != null ? row.description:this.form.description, //描述
        serialDependFlag: this.isNullJsonBoolean(row,this.form, 'serialDependFlag'), //是否流水依赖
        serialDependOrder:  row !=null ? row.serialDependOrder:this.form.serialDependOrder, //流水依赖顺序
        nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //是否为空
        displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'),
        componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //是否参与编码
        pkCodeRule:  row !=null ? row.pkCodeRule:this.form.pkCodeRule, //所属编码规则
        pkCodeRule:  row != null ? row.pkCodeRule:this.form.pkCodeRule, //所属编码规则
        prefixCode: row != null ? row.prefixCode:this.form.prefixCode, //前缀
        suffixCode: row!= null ? row.suffixCode:this.form.suffixCode, //后缀
      };
      if (this.form.secType === "codefixedsec") {
        //固定码段