From eed27d3000e127c433fd45609d0d5e5d06b7868c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 26 十二月 2023 11:14:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/components/makepager/mixin/codeMixin.js | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/components/makepager/mixin/codeMixin.js b/src/components/makepager/mixin/codeMixin.js
index 515cf09..5d31dbc 100644
--- a/src/components/makepager/mixin/codeMixin.js
+++ b/src/components/makepager/mixin/codeMixin.js
@@ -1,5 +1,5 @@
import WordInput from "@/components/wordInput"
-import { getCodeStandardList,getAutoCode } from "@/api/common/standard"
+import { getCodeStandardList,getAutoCode,useSystemSet } from "@/api/common/standard"
export default {
components: {
WordInput
@@ -18,7 +18,11 @@
objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜", codeStandID: "" },
codeRule: {},
codeLength: 0,
- autoCodeObj: {}
+ autoCodeHeadersObj:{
+ Xsjh:'',
+ Bjd:'',
+ Ywjh:'',
+ }
}
},
@@ -34,7 +38,7 @@
if (res.code == 200) {
const { List = [], ID, AutoRule = {}, Method } = res.data && res.data.data ? res.data.data[0] : []
this.codeRule = res.data && res.data.data ? res.data.data[0] : {}
- let autoRule = AutoRule
+ let autoRule = AutoRule
let method = Method ? Method : 0
this.method = method
let rules = List
@@ -73,7 +77,6 @@
// this.codeList(
// this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
// )
- return true
}
}
}
@@ -91,11 +94,20 @@
}
},
async getAutoCodeValue() {
- const res = await getAutoCode({ codeType: this.objCode.type,autoIncr:this.autoIncr });
- if (res.code == 200) {
- this.autoCodeObj = res.data;
- this.$set(this.editConfig.infomation, 'number', this.autoCodeObj.id)
+ if(Object.keys(this.codeRule).length>0){
+ const res = await getAutoCode(this.codeRule);
+ console.log(res,'=====res autocode')
+ if (res.code == 200) {
+ this.$set(this.editConfig.infomation, 'number', res.data?res.data:'')
+ }else{
+ this.$set(this.editConfig.infomation, 'number', this.codeRule.AutoRule.PrefixValue?this.codeRule.AutoRule.PrefixValue:'')
+ }
}
+
+ },
+ async getUseSystemSet(data){
+ const res=await useSystemSet(data)
+ this.autoCodeHeadersObj=res.data
},
codeList(val) {
this.inputValue = val
@@ -103,10 +115,6 @@
this.editConfig.infomation.number = this.codenumberList.length > 0 ? this.codenumberList.replace(/,/g, "") : ""
console.log(this.codenumberList.replace(/,/g, ""))
},
- // validateFormNumber() {
- // this.$set(this.editConfig.infomation, 'number', this.editConfig.infomation.number)
- // this.$refs.form.validateField('number')
- // },
// 璁㈠崟缂栫爜鍗曠嫭鏍￠獙
validateCheckCode(rule, value, callback) {
if (value && value.length > 0) {
--
Gitblit v1.8.0