xiaodai2017 2 years ago
parent
commit
32cd68f45e

+ 0 - 1
dist/index.html

@@ -33,7 +33,6 @@
   <script src="./static/vue.min.js" rel="preload" as="script"></script>
   <script src="./static/vue-router.min.js" rel="preload" as="script"></script>
   <script src="./static/axios@0.21.0.min.js" rel="preload" as="script"></script>
-  <script src="./static/dingtalk.open.2.10.3.js" rel="preload" as="script"></script>
   <meta name="wpk-bid" content="dta_1_1184953963">
   <script>
     !(function (c, i, e, b) {

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


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


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


+ 0 - 1
public/index.html

@@ -33,7 +33,6 @@
   <script src="./static/vue.min.js" rel="preload" as="script"></script>
   <script src="./static/vue-router.min.js" rel="preload" as="script"></script>
   <script src="./static/axios@0.21.0.min.js" rel="preload" as="script"></script>
-  <script src="./static/dingtalk.open.2.10.3.js" rel="preload" as="script"></script>
   <meta name="wpk-bid" content="dta_1_1184953963">
   <script>
     !(function (c, i, e, b) {

File diff suppressed because it is too large
+ 0 - 0
public/static/dingtalk.open.2.10.3.js


+ 9 - 5
src/layout/components/Navbar.vue

@@ -183,18 +183,22 @@ export default {
     this.companyNo = get_business_companyNo() || "";
     this.companyNoName = get_business_company() || "";
     this.companyList = get_company_list() ? JSON.parse(get_company_list()) : [];
-    console.log(this.companyNo);
     // this.openNotice(true);
   },
   methods: {
     business_companyNo_change(e) {
       const index = this.companyList.findIndex((si) => si.supplierNo === e);
       if (index !== -1) {
-        set_business_companyNo(e);
-        set_business_company(this.companyList[0].supplierName);
+        const { supplierNo, supplierName } = this.companyList[index];
+        this.companyNo = supplierNo;
+        this.companyNoName = supplierName;
+        this.$store
+          .dispatch("user/change_company", { supplierNo, supplierName })
+          .then((res) => {
+            console.log(res);
+          })
+          .catch(() => {});
       }
-
-      console.log(e);
     },
     async openNotice(is) {
       if (getNotice() && getNotice().length > 0) {

+ 2 - 2
src/router/data.js

@@ -106,7 +106,7 @@ const config = [
   {
     is_display: "1",
     menu_img: "el-icon-sell",
-    menu_name: "订单批量发货",
+    menu_name: "发货申请批量发货",
     menu_route: "sendOutOrder",
     status: "1",
     child: [
@@ -114,7 +114,7 @@ const config = [
         is_display: "1",
         is_private: "1",
         menu_img: "el-icon-truck",
-        menu_name: "订单批量发货",
+        menu_name: "发货申请批量发货",
         menu_route: "index",
         menu_url: "sendOutOrder/index",
         status: "1",

+ 10 - 0
src/store/modules/user.js

@@ -74,6 +74,16 @@ const mutations = {
 };
 
 const actions = {
+  change_company({ commit }, companyInfo) {
+    const { supplierNo, supplierName } = companyInfo ?? {};
+    return new Promise((resolve, reject) => {
+      // 保存默认业务公司名称
+      commit("business_company", supplierName);
+      // 保存默认业务公司编号
+      commit("business_companyNo", supplierNo);
+      resolve("ok");
+    });
+  },
   // user login
   login({ commit }, userInfo) {
     const { mobile, password } = userInfo;

+ 16 - 1
src/views/goodsCost/detail.vue

@@ -63,7 +63,22 @@ export default {
     baseForm,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.$notify({
+        title: "供应商已发生变化",
+        dangerouslyUseHTMLString: true,
+        message: "5秒后,跳转至商品列表页!",
+      });
+      setTimeout(() => {
+        this.routeReGoto("/goodsCost/index", {});
+      }, 5000);
+    },
   },
 
   data() {

+ 10 - 1
src/views/goodsCost/index.vue

@@ -274,7 +274,16 @@ export default {
   mixins: [mixinPage, resToken],
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.restSearch();
+      // console.log(val, oldval);
+    },
   },
   data() {
     return {

+ 7 - 7
src/views/login/index.vue

@@ -82,7 +82,7 @@
               title="初始密码:"
               width="200"
               trigger="click"
-              content="dingding123"
+              content="请联系管理员"
             >
               <i class="el-icon-info" slot="reference"></i>
             </el-popover>
@@ -171,12 +171,12 @@ export default {
   },
   mounted() {
     // console.log(process.env.NODE_ENV);
-    // if (process.env.NODE_ENV === "development") {
-    //   this.loginForm = {
-    //     mobile: "17777777777",
-    //     password: "uu2222",
-    //   };
-    // }
+    if (process.env.NODE_ENV === "development") {
+      this.loginForm = {
+        mobile: "17777777777",
+        password: "uu2222",
+      };
+    }
     if (this.loginForm.mobile === "") {
       this.$refs.mobile.focus();
     } else if (this.loginForm.password === "") {

+ 19 - 2
src/views/purchaseOrder/detail.vue

@@ -204,11 +204,28 @@ import asyncRequest from "@/apis/purchaseOrder";
 import { statusOptions, showColumns } from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import urlConfig from "@/apis/url-config";
-import { get_business_companyNo, get_business_company } from "@/utils/auth";
+import { mapGetters } from "vuex";
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
-
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.$notify({
+        title: "供应商已发生变化",
+        dangerouslyUseHTMLString: true,
+        message: "5秒后,跳转至销售订单列表页!",
+      });
+      setTimeout(() => {
+        this.routeReGoto("/purchaseOrder/index", {});
+      }, 5000);
+    },
+  },
   data() {
     return {
       statusOptions,

+ 29 - 2
src/views/purchaseOrder/index.vue

@@ -202,7 +202,17 @@ export default {
   mixins: [mixinPage, resToken],
   components: {},
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+
+  watch: {
+    maxNo(val, oldval) {
+      this.restSearch();
+      // console.log(val, oldval);
+    },
   },
   data() {
     return {
@@ -425,7 +435,7 @@ export default {
             // status: "3",
           };
           const res = await asyncRequest.addOrderIn(model);
-          const { code } = await this.useResHandle(res);
+          const { code, data, message } = await this.useResHandle(res, true);
           this.loading = false;
           if (code === 0) {
             this.$notify.success({
@@ -433,12 +443,29 @@ export default {
               message: "",
             });
             await this.searchList();
+          } else if (code == 1003) {
+            this.showal(data, message, "");
+          } else {
+            this.$message.warning(message);
           }
         })
         .catch(() => {
           console.log("取消");
         });
     },
+
+    showal(list, message, code) {
+      let htmlList = "<ul>";
+      list.forEach((v) => {
+        htmlList += `<li>${code !== "" ? v[code] : v}</li>`;
+      });
+      htmlList += "</ul>";
+      this.$notify({
+        title: message,
+        dangerouslyUseHTMLString: true,
+        message: htmlList,
+      });
+    },
     restSearch() {
       this.sselect = "创建时间";
       this.select = "1";

+ 2 - 1
src/views/recovery/index.vue

@@ -147,7 +147,8 @@ export default {
   },
   watch: {
     maxNo(val, oldval) {
-      console.log(val, oldval);
+      this.restSearch();
+      // console.log(val, oldval);
     },
   },
   data() {

+ 19 - 1
src/views/sellOutOrder/detail.vue

@@ -77,6 +77,7 @@ import asyncRequest from "@/apis/sellOutOrder";
 import { showColumns, statusOptions } from "./columns";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import wantDeliver from "./want-deliver";
+import { mapGetters } from "vuex";
 
 export default {
   name: "sellOutOrderDetail",
@@ -84,7 +85,24 @@ export default {
   components: {
     wantDeliver,
   },
-
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.$notify({
+        title: "供应商已发生变化",
+        dangerouslyUseHTMLString: true,
+        message: "5秒后,跳转至发货申请列表页!",
+      });
+      setTimeout(() => {
+        this.routeReGoto("/sellOutOrder/index", {});
+      }, 5000);
+    },
+  },
   data() {
     return {
       xs_order_type_options,

+ 10 - 1
src/views/sellOutOrder/index.vue

@@ -183,7 +183,16 @@ export default {
   mixins: [mixinPage, resToken],
 
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.restSearch();
+      // console.log(val, oldval);
+    },
   },
   data() {
     return {

+ 32 - 25
src/views/sendOutOrder/index.vue

@@ -27,9 +27,23 @@ import asyncRequest from "@/apis/sellOutOrder";
 import resToken from "@/mixins/resToken";
 import { columns, head } from "./columns";
 import { isnumber, isAlphanumeric } from "@/utils/validate";
+import { mapGetters } from "vuex";
 export default {
   mixins: [resToken],
   name: "orderImport",
+  computed: {
+    ...mapGetters(["business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+
+  watch: {
+    maxNo(val, oldval) {
+      this.$message.warning("供应商已发生变化,请重新上传文件!");
+      this.cancel();
+    },
+  },
   data() {
     return {
       code_msg: "物流单号必传,且支持纯数字或字母数字组合(9~20位)!",
@@ -245,38 +259,31 @@ export default {
           });
           this.tableData = [];
           await this.routeReGoto("sellOutOrder", {});
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else if (code == 1003) {
+          this.showal(data, message, "");
         } else if (code == 1005) {
-          let resList = JSON.parse(JSON.stringify(data));
-
-          let htmlList = "<ul>";
-          resList.forEach((v) => {
-            htmlList += `<li>${v.outCode}</li>`;
-          });
-          htmlList += "</ul>";
-          this.$notify({
-            title: message,
-            dangerouslyUseHTMLString: true,
-            message: htmlList,
-          });
+          this.showal(data, message, "outCode");
         } else if (code == 1011) {
-          let resList = JSON.parse(JSON.stringify(data));
-
-          let htmlList = "<ul>";
-          resList.forEach((v) => {
-            htmlList += `<li><span>${v.outCode}</span></li>`;
-          });
-          //--<span>${v.post_name}</span>--<span>${v.post_code}</span>
-          htmlList += "</ul>";
-          this.$notify({
-            title: message,
-            dangerouslyUseHTMLString: true,
-            message: htmlList,
-          });
+          this.showal(data, message, "outCode");
         } else {
           this.$message.warning(message);
         }
       }
     },
+    showal(list, message, code) {
+      let htmlList = "<ul>";
+      list.forEach((v) => {
+        htmlList += `<li>${code !== "" ? v[code] : v}</li>`;
+      });
+      htmlList += "</ul>";
+      this.$notify({
+        title: message,
+        dangerouslyUseHTMLString: true,
+        message: htmlList,
+      });
+    },
   },
 };
 </script>

+ 16 - 1
src/views/workbench/detail.vue

@@ -246,7 +246,22 @@ export default {
 
   mixins: [resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.$notify({
+        title: "供应商已发生变化",
+        dangerouslyUseHTMLString: true,
+        message: "5秒后,跳转至招标工作台页面!",
+      });
+      setTimeout(() => {
+        this.routeReGoto("/workbench/index", {});
+      }, 5000);
+    },
   },
   data() {
     return {

+ 10 - 1
src/views/workbench/index.vue

@@ -101,7 +101,16 @@ export default {
   mixins: [mixinPage, resToken],
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "business_companyNo"]),
+    maxNo() {
+      return this.business_companyNo;
+    },
+  },
+  watch: {
+    maxNo(val, oldval) {
+      this.searchList(true);
+      // console.log(val, oldval);
+    },
   },
   data() {
     return {

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