ubcs.git - Gitblit

			@@ -669,12 +669,12 @@
			:disabled="basicSecOnlyRead"
			style="margin-right: 20px"
			></el-switch>
			<el-input-number
			<!-- <el-input-number
			v-show="form.serialDependFlag"
			v-model="form.serialDependOrder"
			:readonly="basicSecOnlyRead"
			controls-position="right"
			></el-input-number>
			></el-input-number> -->
			</el-form-item>

			<el-form-item :label-width="leftFormLabelWidth" label="是否为空:">
			@@ -1620,7 +1620,7 @@
			secType: "codefixedsec", //码段类型
			description: "", //描述
			serialDependFlag: false, //是否流水依赖
			serialDependOrder: "", //流水依赖顺序
			//serialDependOrder: "", //流水依赖顺序
			nullableFlag: false, //是否为空
			prefixCode: "", //前缀
			suffixCode: "", //后缀
			@@ -3297,7 +3297,7 @@
			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, //流水依赖顺序
			//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'), //是否参与编码

			@@ -1024,7 +1024,8 @@
			wrapper = Wrappers.<CodeBasicSec>query().lambda()
			.eq(CodeBasicSec::getPkCodeRule,codeRuleVO.getOid())
			.eq(CodeBasicSec::getSerialDependFlag,"true")
			.orderByAsc(CodeBasicSec::getSerialDependOrder);
			.orderByAsc(CodeBasicSec::getOrderNum);
			//.orderByAsc(CodeBasicSec::getSerialDependOrder);
			List<CodeBasicSec> codeBasicSecList = this.list(wrapper);
			if(!CollectionUtils.isEmpty(codeBasicSecList)){
			List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecDO2VOs(codeBasicSecList);

	Source/UBCS-WEB/src/views/code/code.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史