Browse Source

Merge branch 'sit'

xiaodai2022 2 năm trước cách đây
mục cha
commit
11cfd49010
2 tập tin đã thay đổi với 80 bổ sung49 xóa
  1. 10 0
      dist/static/js/0.js
  2. 70 49
      src/views/sellOut/bargainList/detail.vue

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 10 - 0
dist/static/js/0.js


+ 70 - 49
src/views/sellOut/bargainList/detail.vue

@@ -173,7 +173,14 @@
               >
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="业务部门审批" name="2">
+            <el-collapse-item
+              title="业务部门审批"
+              name="2"
+              v-if="
+                eaxmList.some((item) => item.status == '0') ||
+                (status == '0' && powers.some((item) => item == '043'))
+              "
+            >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -184,7 +191,14 @@
                 @searchChange="examFormSubmit($event, '业务部门')"
               />
             </el-collapse-item>
-            <el-collapse-item title="财务专员审批" name="3">
+            <el-collapse-item
+              title="财务专员审批"
+              name="3"
+              v-if="
+                eaxmList.some((item) => item.status == '2') ||
+                (status == '2' && powers.some((item) => item == '058'))
+              "
+            >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -195,7 +209,14 @@
                 @searchChange="examFormSubmit($event, '财务专员')"
               />
             </el-collapse-item>
-            <el-collapse-item title="财务主管审批" name="4">
+            <el-collapse-item
+              title="财务主管审批"
+              name="4"
+              v-if="
+                eaxmList.some((item) => item.status == '4') ||
+                (status == '4' && powers.some((item) => item == '059'))
+              "
+            >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -206,7 +227,14 @@
                 @searchChange="examFormSubmit($event, '财务主管')"
               />
             </el-collapse-item>
-            <el-collapse-item title="BOSS审批" name="5">
+            <el-collapse-item
+              title="BOSS审批"
+              name="5"
+              v-if="
+                eaxmList.some((item) => item.status == '7') ||
+                (status == '7' && powers.some((item) => item == '084'))
+              "
+            >
               <exam-formss
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -282,6 +310,7 @@ export default {
   data() {
     return {
       size: "small",
+      eaxmList: [],
       costArr,
       bargainingArr,
       editColumns,
@@ -339,6 +368,7 @@ export default {
         bargainNo: this.queryId,
       });
 
+      this.eaxmList = [];
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
@@ -367,6 +397,7 @@ export default {
                 this.orderItem = JSON.parse(JSON.stringify(e));
             }
           });
+          this.eaxmList = JSON.parse(JSON.stringify(exam_info));
         }
 
         this.status = status;
@@ -391,52 +422,42 @@ export default {
           status: e.state,
           remark: e.remark,
         };
-        // await this.setBossStatus(model, title);
-
-        // await this.setstatus(`提交${title}审核`, model);
-        await this.statusSubmit(model, title);
-      }
-    },
-    async setstatus(title, model) {
-      await this.$confirm(`确定要${title}?`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const { after_price, lower_price } = this.sitem;
-          if (this.status === "7" && after_price * 1 < lower_price * 1) {
-            this.loading = false;
-            await this.setBossStatus(model, title);
-          } else {
-            await this.statusSubmit(model, title);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          console.log("取消");
-        });
-    },
-    async setBossStatus(title, model) {
-      // const
-      await this.$confirm(
-        `当前商品同意议价后,售价已低于系统最低售价${this.sitem.lower_price}元!`,
-        `最终售价已低于系统最低售价!是否继续?`,
-
-        {
+        await this.$confirm(`确定要${title}?`, {
           confirmButtonText: "确定",
-          cancelButtonText: "取消2",
-          type: "error",
-        }
-      )
-        .then(async () => {
-          this.loading = true;
-          await this.statusSubmit(model, title);
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
-          this.loading = false;
-          console.log("取消1");
-        });
+          .then(async () => {
+            const { after_price, lower_price } = this.sitem;
+            if (this.status === "7" && after_price * 1 < lower_price * 1) {
+              this.loading = false;
+              await this.$confirm(
+                `当前商品同意议价后,售价已低于系统最低售价${this.sitem.lower_price}元!`,
+                `最终售价已低于系统最低售价!是否继续?`,
+
+                {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消2",
+                  type: "error",
+                }
+              )
+                .then(async () => {
+                  this.loading = true;
+                  await this.statusSubmit(model, title);
+                })
+                .catch(() => {
+                  this.loading = false;
+                  console.log("取消1");
+                });
+            } else {
+              await this.statusSubmit(model, title);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            console.log("取消");
+          });
+      }
     },
     async statusSubmit(model, title) {
       const { code, data, message } = await asyncRequest.status(model);
@@ -447,7 +468,7 @@ export default {
           title: title + "成功!",
           message: "",
         });
-        // await this.initForm();
+        await this.initForm();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác