Merge branch 'sit' into dev

src/App.vue

@@ -53,13 +53,17 @@ export default {
         .then(async (res) => {
           if (res === "noToken") {
             await this.logout();
-          } else if (res === "success") {
+          } else if (res === "success" || res === "success-dataV") {
             if (
               this.$route.path === "/loadingPage" ||
               this.$route.path === "/" ||
               this.$route.path === "/login"
             ) {
-              window.vm.$router.replace("/welcome");
+              if (res === "success-dataV") {
+                window.vm.$router.replace("/bigScreen/datavScr");
+              } else {
+                window.vm.$router.replace("/welcome");
+              }
             }
           } else {
             await this.logout();

src/components/globalComponents/file-upload/main.vue

@@ -16,12 +16,14 @@
 <script>
 import urlConfig from "@/apis/url-config";
 import { getToken } from "@/utils/auth";
+import resToken from "@/mixins/resToken";
 //Uploadcondition 用于判断个性化文件 //返回 false 就不会上传文件
 //UploadErrorEvent 上传成功
 //UploadErrorEvent 上传失败
 
 export default {
   name: "fileUpload",
+  mixins: [resToken],
   props: {
     //@reject 默认值
     accept: String, //上传文件类型
@@ -52,7 +54,7 @@ export default {
       let that = this;
       let inputDOM1 = that.$refs.inputer;
       const files = inputDOM1.files;
-      console.log(files)
+      console.log(files);
       let length = files.length;
       if (length === 0) return;
       that.loading = that.$loading({
@@ -67,7 +69,7 @@ export default {
           that.$refs.inputer.value = "";
         } else {
           let str = await that.httpupLoad(files, i);
-          console.log(i,str)
+          console.log(i, str);
           if (str === "error") {
             that.$emit("UploadErrorEvent");
           } else if (str === "break") {
@@ -100,11 +102,13 @@ export default {
                     url: `${that.imgAPI}storage/${url}`,
                     name: name,
                   });
-                } else {
+                } else if (code >= 100 && code <= 104) {
                   resolve({
                     url: `noToken`,
                     name: "",
                   });
+                } else {
+                  resolve("break");
                 }
               } else {
                 reject();

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -66,7 +66,7 @@
                   <el-tooltip
                     class="fr"
                     v-if="
-                      powers.some((item) => item == '007') &&
+                      powers.some((item) => item == '089') &&
                       sitem.status === '0'
                     "
                     effect="dark"

src/views/purchaseIn/recovery/index.vue

@@ -159,7 +159,7 @@ export default {
       parmValue: {
         infoNo: "",
         bidNo: "",
-        // is_own: "1",
+        is_own: "1",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },

src/views/purchaseIn/workbench/index.vue

@@ -13,7 +13,7 @@
               class="task-item"
               v-for="item in list"
               :key="item"
-              @click="routeGoto('workbenchDetail', { id: item.infoNo })"
+              @click="wantTo(item.infoNo)"
               :style="
                 item.is_feed == 1 ? 'background: skyblue;' : 'background:none;'
               "
@@ -186,7 +186,7 @@ export default {
     };
   },
   mounted() {
-    this.searchList();
+    this.searchList(true);
   },
   beforeDestroy() {
     if (this.timer) {
@@ -194,6 +194,16 @@ export default {
     }
   },
   methods: {
+    wantTo(infoNo) {
+      console.log(this.powers);
+      if (
+        this.powers &&
+        this.powers.length > 0 &&
+        this.powers.some((item) => item == "007")
+      ) {
+        this.routeGoto("workbenchDetail", { id: infoNo });
+      }
+    },
     async well_timer() {
       this.timer = setInterval(async () => {
         if (this.num !== 0) {
@@ -277,65 +287,41 @@ export default {
           console.log("取消");
         });
     },
-    async deleteItem(id) {
-      await this.$confirm("确定要删除？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            id: id,
-          };
-          const res = await asyncRequest.delete(model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "删除成功",
-              message: "",
-            });
-            this.searchList();
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
+
     imgclick(e) {
       e.stopPropagation();
       e.preventDefault();
     },
     // 刷新表格
-    async searchList() {
-      this.loading = true;
-      const { code, data } = await asyncRequest.list(this.parmValue);
-      if (code === 0) {
-        const { list, count } = data;
-        this.list = list;
-        this.list.map((e) => {
-          e.cat_name = "";
-          if (e.can && e.can.length > 0) {
-            e.can.forEach((a, ai) => {
-              e.cat_name += `${ai !== 0 ? "_" : ""}${a.name}`;
-            });
+    async searchList(type) {
+      if (!this.loading) {
+        this.loading = true;
+        const { code, data } = await asyncRequest.list(this.parmValue);
+        if (code === 0) {
+          const { list, count } = data;
+          this.list = list;
+          this.list.map((e) => {
+            e.cat_name = "";
+            if (e.can && e.can.length > 0) {
+              e.can.forEach((a, ai) => {
+                e.cat_name += `${ai !== 0 ? "_" : ""}${a.name}`;
+              });
+            }
+            return e;
+          });
+
+          this.pageInfo.total = Number(count);
+          if (type) {
+            await this.well_timer();
           }
-          return e;
-        });
-        if (this.list.length > 0) {
-          console.log(this.list[0]);
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.list = [];
+          this.pageInfo.total = 0;
         }
-        this.pageInfo.total = Number(count);
-        await this.well_timer();
-      } else if (code >= 100 && code <= 104) {
-        await this.logout();
-      } else {
-        this.list = [];
-        this.pageInfo.total = 0;
+        this.loading = false;
       }
-      this.loading = false;
     },
   },
 };