Source/UBCS-WEB/src/views/code/code.vue
@@ -944,8 +944,6 @@ :key="item.itemValue" :label="item.itemName" :value="item.itemValue" label="左补位" value="codeattrsec" > </el-option> </el-select> @@ -1230,8 +1228,7 @@ <el-form-item :label-width="rightFormLabelWidth" label="编码补位方式:" required > required> <el-select v-model="form.codeFillType" :disabled="basicSecOnlyRead" @@ -1458,6 +1455,7 @@ import { mapGetters } from "vuex"; import { getByRoleUserList } from "@/api/system/user"; import func from "@/util/func"; import logeVue from '../docking/loge.vue'; export default { data() { @@ -3481,8 +3479,7 @@ serialStart: row != null && row.serialStart != "" ? row.serialStart : 1, //流水号起始值 serialStep: row != null && row.serialStep != "" ? row.serialStep : 1, //流水的步长 codeFillType: row != null && row.codeFillType != "" codeFillType: row != null && row.codeFillType != "" ? row.codeFillType : "code_fill_left", //编码补位方式 // codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //补位时的字符,选中的下拉框的下标 @@ -3505,6 +3502,8 @@ ? row.customCodeSerialClass : "", //自定义流水算法 }); console.log(this.form); console.log(this.enumParam.codeFillType); this.loadCodeFillType(); this.loadCodeFillSeparator(); } else if (this.form.secType === "codelevelsec") { Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java
@@ -145,6 +145,11 @@ private String queryField; /** * 列表是否显示的字段 */ private String tableDisplayFlag; /** * 参照的信息 */ private UIFormReferVO referConfig; @@ -169,6 +174,14 @@ return dateFormate; } public void setTableDisplayFlag(String tableDisplayFlag) { this.tableDisplayFlag = tableDisplayFlag; } public String getTableDisplayFlag() { return tableDisplayFlag; } public void setDateFormate(String dateFormate) { this.dateFormate = dateFormate; } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -560,7 +560,9 @@ } else { //说明是自行配置的 //前端必须要传递小写的属性 value = orderDTO.getData().getOrDefault(attrId, ""); String orDefault = orderDTO.getData().getOrDefault(attrId, ""); value = Func.isBlank(orDefault) ? orderDTO.getData() .getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault; } return value; } @@ -1327,6 +1329,7 @@ } fieldVO.setOptionJsMap(eventJsMap); fieldVO.setStyle(attrVO.getTableDisplayStyle()); fieldVO.setTableDisplayFlag(attrVO.getTableDisplayFlag()); //列表里不允许直接编辑 fieldVO.setDateFormate(attrVO.getCodeDateFormat()); return fieldVO;