From b39bf36c1c380285582b7daffb5dd656aa1e1389 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:20:04 +0800
Subject: [PATCH] 退出动态跳转登录页

---
 src/components/makepager/mixin/codeMixin.js |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/components/makepager/mixin/codeMixin.js b/src/components/makepager/mixin/codeMixin.js
index 515cf09..afd3d26 100644
--- a/src/components/makepager/mixin/codeMixin.js
+++ b/src/components/makepager/mixin/codeMixin.js
@@ -18,7 +18,6 @@
       objCode: { name: "", page: 0, pageSize: 0, type: "璺熻繘璁板綍缂栫爜", codeStandID: "" },
       codeRule: {},
       codeLength: 0,
-      autoCodeObj: {}
     }
   },
 
@@ -34,7 +33,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 +72,6 @@
                   // this.codeList(
                   //   this.editConfig.infomation.number ? this.editConfig.infomation.number : autoRule.PrefixValue
                   // )
-                  return true
                 }
               }
             }
@@ -91,11 +89,15 @@
       }
     },
     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);
+        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:'')
+        }
       }
+      
     },
     codeList(val) {
       this.inputValue = val
@@ -103,10 +105,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