xiaodai2017 2 năm trước cách đây
mục cha
commit
f13ffefeab

+ 1 - 2
src/apis/goodsCost/index.js

@@ -4,8 +4,7 @@ const api = "abutment/";
 export default {
   // 添加
   add: (data, params) => http(api + "createGood", data, "post", params),
-  // 添加
-  online_add: (data, params) => http(api + "gooduponline", data, "post", params),
+ 
   // 分页查询
   list: (data, params) => http(api + "getGoodList", data, "post", params),
   // ...获取全部规格值

+ 1 - 8
src/apis/purchaseOrder/index.js

@@ -10,14 +10,9 @@ export default {
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 详情
   detail: (data, params) => http(api + "getOrderInfo", data, "post", params),
-  // 更新
-  update: (data, params) => http(api + "cgdedit", data, "post", params),
   // 批量供应商确认
   status: (data, params) => http(api + "changeOrderStatus", data, "post", params),
-  // 新建入库单
-  orderinadd: (data, params) => http(api + "orderinadd", data, "post", params),
-  // 新建入库单详情
-  orderininfo: (data, params) => http(api + "orderininfo", data, "post", params),
+ 
   // 异常原因列表
   resultlist: (data, params) => http(api + "resultlist", data, "post", params),
   // 入库单验货
@@ -31,8 +26,6 @@ export default {
   //商品成本详情
   cost_detail: (data, params) => http(api + "goodupinfo", data, "post", params),
 
-  //采购单修改实时金价
-  cgdeditgoldprice: (data, params) => http(api + "cgdeditgoldprice", data, "post", params),
    // 采返商品详情 订单生成前
    cove_detail: (data, params) => http(api + "getgoodzxinfobynotzixun", data, "post", params),
    //导出

+ 29 - 3
src/layout/components/Navbar.vue

@@ -9,7 +9,7 @@
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
-    <div class="right-menu">
+    <div class="right-menu fr">
       <template v-if="device !== 'mobile'">
         <i
           v-if="isShow"
@@ -45,7 +45,22 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-
+    <!-- <el-select
+      class="fr"
+      v-model="svalue"
+      :size="'mini'"
+      @change="business_companyNo_change"
+      placeholder="请选择供应商"
+    >
+      <el-option
+        v-for="item in company_list"
+        :key="item.supplierNo + item.id"
+        :label="item.supplierName"
+        :disabled="item.status !== '1'"
+        :value="item.supplierNo"
+      >
+      </el-option>
+    </el-select> -->
     <el-dialog
       title="系统公告"
       :center="true"
@@ -125,11 +140,19 @@ import { getNotice, setNotice } from "@/utils/auth";
 
 export default {
   computed: {
-    ...mapGetters(["sidebar", "avatar", "device"]),
+    ...mapGetters([
+      "sidebar",
+      "avatar",
+      "device",
+      "company_list",
+      "business_company",
+      "business_companyNo",
+    ]),
   },
   mixins: [resToken],
   data() {
     return {
+      svalue: "",
       showModel: false,
       loading: false,
       isShow: true,
@@ -149,6 +172,9 @@ export default {
     this.openNotice(true);
   },
   methods: {
+    business_companyNo_change(e) {
+      console.log(e);
+    },
     async openNotice(is) {
       if (getNotice() && getNotice().length > 0) {
         this.lastNotice = JSON.parse(getNotice());

+ 3 - 2
src/store/getters.js

@@ -17,7 +17,8 @@ const getters = {
   mainList: state => state.user.mainList,
   business_company: state => state.user.business_company,
   business_companyNo: state => state.user.business_companyNo,
-  private_field: state => state.user.private_field,
-  roleProcess: state => state.user.roleProcess,
+  // private_field: state => state.user.private_field,
+  // roleProcess: state => state.user.roleProcess,
+  company_list: state => state.user.company_list
 }
 export default getters

+ 11 - 6
src/store/modules/user.js

@@ -1,6 +1,4 @@
-import {
-  login,
-} from "@/apis/user";
+import { login } from "@/apis/user";
 import configRouter from "@/router/data";
 import {
   getToken,
@@ -86,11 +84,15 @@ const actions = {
 
           if (code === 0) {
             const { token, supplier_list } = data ?? {};
-            if (supplier_lis && supplier_lis.length > 0) {
+            const arr = supplier_list.filter(
+              (item) => item.status + "" === "1"
+            );
+            if (arr && arr.length > 0) {
               commit("SET_TOKEN", token);
-
               // 保存默认业务公司名称
               commit("company_list", supplier_list);
+              const business_company = arr[0];
+              const business_companyNo = arr[0];
               // 保存默认业务公司名称
               commit("business_company", business_company);
               // 保存默认业务公司编号
@@ -103,7 +105,10 @@ const actions = {
             } else {
               resolve({
                 code: 1,
-                message: "该账户未绑定公司,不允许登录!",
+                message:
+                  supplier_list.length === 0
+                    ? "该账户未绑定公司,不允许登录!"
+                    : "该账户绑定的公司已禁用,不允许登录!",
               });
             }
           } else {