From 8b73e9cbdf4035ef1aa1026c979222a7e4ca5e01 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 23:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
index e389526..5b39ad3 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -7,7 +7,7 @@
</el-form>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏈�澶ф祦姘村彿" name="codeApply">
- <form-template v-bind="$attrs" type="add" :selfColumnType="selfColumnType" :trendsSpan="24"
+ <form-template key="codeApplyMaxForm" data-key="codeApplyMaxForm" v-bind="$attrs" type="add" :selfColumnType="selfColumnType" :trendsSpan="24"
:selfColumnConfig="selfColumnConfig" ref="CodeApply" @getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"></form-template>
</el-tab-pane>
@@ -20,7 +20,7 @@
</template>
<script>
import FormTemplate from "@/components/FormTemplate/FormTemplate";
-import { getCodePrice, saveMaxSerialNum } from "@/api/code/maxSerialNum.js"
+import { getCodePrice, saveMaxSerialNum, getMaxSerialNumber } from "@/api/code/maxSerialNum.js"
export default {
name: 'maxSerialnumDialog',
components: {
@@ -189,21 +189,32 @@
this.confirmLoadding = false
}
})
+ // let object={}
+ // object['secDTOList'] = arrCode;
+ // object['codeRuleOid'] = this.ruleOid;
+ // getMaxSerialNumber(object.codeRuleOid,object.secDTOList).then(res=>{
+ // console.log(res)
+ // })
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
const {field} = data;
+ let childItems=[];
this.secVOList = this.secVOList.map((item) => {
if (item.parentClassifySecOid === field) {
this.$refs.CodeApply.form[item.oid] = undefined;
this.$refs.CodeApply.form[item.name] = undefined;
item.readOnly = false;
item.referConfig.extraParams.parentClassifyValueOid = data.value;
+ item.referConfig.reloadData = true;
+ item.dataKey=item.oid+'_'+new Date().getTime();
+ childItems.push(item)
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ //this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$refs.CodeApply.changeChildItem(childItems);
},
isRequired(item) {
return item.nullableFlag != "true";
@@ -227,7 +238,7 @@
if (item.secType == "codeclassifysec") {
params = {
isMuti: false,
- valueField: 'id',
+ valueField: 'oid',
type: "grid",
tableConfig: {
limit: -1,
@@ -267,7 +278,7 @@
parentClassifyValueOid: item.parentClassifySecOid
? this.codeApplyForm[item.parentClassifySecOid]
: "",
- },
+ }
};
} else if (item.secType == "coderefersec") {
params = JSON.parse(item.referValueInfo);
--
Gitblit v1.9.3