From c14fedd8903487457ad0911e8afab47670be754e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 29 八月 2023 22:15:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 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 6db53ba..b29e4d0 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/maxSerialnumDialog.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog title="鏈�澶ф祦姘村彿" width="30%" append-to-body="true" :visible.sync="dialogVisible">
+ <el-dialog title="鏈�澶ф祦姘村彿" width="30%" append-to-body="true" class="avue-dialog avue-dialog--top" top="-3%" :visible.sync="dialogVisible">
<el-form :label-position="right" ref="ruleForm" label-width="80px" :model="formModel" :rules="rules">
<el-form-item label="娴佹按鍙�" prop="maxSecNum">
<el-input v-model="formModel.maxSecNum"></el-input>
@@ -72,13 +72,13 @@
],
},
selfColumnType: {
- codefixedsec: "combox",
- codeclassifysec: "refer",
- codevariablesec: "text",
- codeattrsec: "text",
- codelevelsec: "text",
- coderefersec: "refer",
- codedatesec: "date",
+ codefixedsec: "combox",//鍥哄畾鐮佹
+ codeclassifysec: "refer",//鍒嗙被鐮佹
+ codevariablesec: "text",//鍙彉鐮佹
+ coderefersec: "refer",//寮曠敤鐮佹
+ codeattrsec: "text",
+ codelevelsec: "text",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -129,13 +129,11 @@
typeList.includes(item.secType)
);
if (this.secVOList.length > 0) {
- // this.showCodeApply = true;
-
this.$nextTick(() => {
this.$refs.CodeApply.templateRender(this.secVOList);
});
} else {
- // this.showCodeApply = false;
+ this.$refs.CodeApply.loading = false;
}
}
},
@@ -152,16 +150,15 @@
this.formModel['codeRuleOid'] = ''
this.formModel['maxSecNum'] = ''
this.$refs.ruleForm.clearValidate('maxSecNum')
-
+
},
// 纭
async comfirm() {
- console.log(this.codeApplyForm)
const objcodekey = Object.keys(this.codeApplyForm)
- console.log(objcodekey)
const filteredObj = objcodekey.reduce((acc, key) => {
const pattern = /[\u4e00-\u9fa5]/; // 鍖归厤涓枃瀛楃鐨勬鍒欒〃杈惧紡
- if (!pattern.test(key)) {
+ const patterns = /\$/;
+ if (!pattern.test(key)&&!patterns.test(key)) {
acc[key] = this.codeApplyForm[key];
}
return acc;
@@ -175,18 +172,18 @@
})
this.formModel['secDTOList'] = arrCode
this.formModel['codeRuleOid'] = this.ruleOid
- console.log(this.formModel)
this.confirmLoadding = true
const rule = await this.$refs.CodeApply.validate()
this.$refs.ruleForm.validate(res => {
if (rule && res) {
- console.log(rule)
saveMaxSerialNum(this.formModel).then(res => {
if (res.data.success) {
this.$message.success('鎿嶄綔鎴愬姛锛�');
this.confirmLoadding = false
this.cancel()
}
+ }).catch(error=>{
+ this.confirmLoadding = false
})
} else {
this.confirmLoadding = false
@@ -196,7 +193,6 @@
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
- // console.log(data)
const { field } = data;
this.secVOList = this.secVOList.map((item) => {
if (item.parentClassifySecOid === field) {
@@ -225,11 +221,11 @@
}
},
getReferConfig(item) {
- // console.log(item)
let params = {};
if (item.secType == "codeclassifysec") {
params = {
isMuti: false,
+ valueField: 'id',
type: "grid",
tableConfig: {
limit: -1,
@@ -303,4 +299,4 @@
},
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3