xiaodai2017 2 years ago
parent
commit
6a2b4aefb4

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 5 - 2
src/views/workbench/components/baseForm.vue

@@ -812,6 +812,7 @@ export default {
       // }
     },
     async initForm() {
+      console.log("111111111111");
       // this.supplierNo = [];
       this.loading = true;
       if (this.type === "add") {
@@ -822,16 +823,18 @@ export default {
         this.title = "采返商品详情";
       }
       this.resetFormData();
-
+      console.log("22222222222");
       await this.resetForm();
-
+      console.log("3333333333333");
       if (this.type === "edit" || this.type === "view") {
         await this.initData();
       }
+      console.log("444444444444");
       //调用实时金价获取接口
       this.golpricelast();
       //调用成本合算计算函数
       // this.computedCost()
+      console.log("5555555555");
       this.rulesThis = this.rules;
       this.setrules();
       this.loading = false;

+ 6 - 5
src/views/workbench/detail.vue

@@ -349,14 +349,15 @@ export default {
           this.num--;
         } else {
           if (this.timer) {
-            const res = await this.repeat_initData();
-            const { code, data, message } = await this.useResHandle(res);
-            const { status } = data ?? {};
-            if (code === 0 && status + "" === "1") {
+            const { code, status, message } = await this.repeat_initData();
+            if (code === 0 && status === "1") {
               this.num = 60;
-            } else if (code === 0 && status + "" !== "1") {
+            } else if (code === 0 && status !== "1") {
               this.status = status;
               this.clearTime();
+            } else if (code >= 100 && code <= 104) {
+              this.clearTime();
+              await this.logout();
             } else {
               this.clearTime();
               this.$message.warning(message);

Some files were not shown because too many files changed in this diff