暂存

src/apis/user/index.js

@@ -32,6 +32,14 @@ export function dingdingdetail(data) {
     data
   })
 }
+// 获取账号业务设置
+export function usergetinfo(data) {
+  return http({
+    url:  `${urlConfig.baseURL}admin/usergetinfo`,
+    method: 'post',
+    data
+  })
+}
 
 
 

src/store/getters.js

@@ -15,5 +15,8 @@ const getters = {
   btnList: state => state.user.btnList,
   navList: state => state.user.navList,
   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,
 }
 export default getters

src/store/modules/user.js

@@ -1,4 +1,4 @@
-import { login, logout, userinfo, menuList, dingdingdetail } from '@/apis/user'
+import { login, logout, userinfo, menuList, dingdingdetail, usergetinfo } from '@/apis/user'
 import {
   getToken,
   setToken,
@@ -9,9 +9,15 @@ import {
   getBtn,
   setBtn,
   removeBtn,
-  // getMainList,
-  // setMainList,
-  // removeMainList
+  get_business_company,
+  set_business_company,
+  remove_business_company,
+  get_business_companyNo,
+  set_business_companyNo,
+  remove_business_companyNo,
+  get_private_field,
+  set_private_field,
+  remove_private_field,
 } from '@/utils/auth'
 
 const state = {
@@ -22,9 +28,10 @@ const state = {
   roles: ['admin'],
   btnList: getBtn(),
   navList: getMenu(),
-  // mainList: getMainList(),
+  business_company: get_business_company() || "",
+  business_companyNo: get_business_companyNo() || "",
+  private_field: get_private_field() || [],
 }
-
 const mutations = {
   SET_TOKEN: (state, token) => {
     state.token = token
@@ -67,7 +74,18 @@ const mutations = {
     }
     state.btnList = val
     setBtn(val)
-
+  },
+  business_company(state, val) {
+    state.business_company = val
+    set_business_company(val)
+  },
+  business_companyNo(state, val) {
+    state.business_companyNo = val
+    set_business_companyNo(val)
+  },
+  private_field(state, val) {
+    state.private_field = val
+    set_private_field(val)
   },
 }
 
@@ -114,120 +132,81 @@ const actions = {
       if (!getToken()) {
         resolve("noToken")
       } else {
-        let res = await menuList({})
-        if (res.code === 0) {
-          let list = res.data
-          list = list.filter((item) => item.child && item.child.length > 0)
-          let arrag = []
-          let btnList = []
-          console.log(list)
-          list.forEach(v1 => {
-            let pItem = {
-              name: v1.menu_route,
-              path: `/${v1.menu_route}`,
-              meta: {
-                title: v1.menu_name,
-                icon: v1.menu_img
-              },
-              children: []
-            }
-            v1.child.forEach(v2 => {
-              let item = {
-                path: v2.menu_route,
-                name: v2.menu_route,
-                hidden: parseInt(v2.is_display + "") === 0,
+        let userRes = await usergetinfo({})
+        if (userRes.code === 0) {
+          const { business, private_field } = userRes.data
+          let business_company = "", business_companyNo = "";
+          if (business && business.length > 0) {
+            business.forEach(e => {
+              if (e.is_main === '1') {
+                business_company = e.company
+                business_companyNo = e.companyNo
+              }
+            });
+          }
+          // 保存默认业务公司名称
+          commit("business_company", business_company);
+          // 保存默认业务公司编号
+          commit("business_companyNo", business_companyNo);
+          // 关键字段设置
+          commit("private_field", private_field === '' ? [] : private_field);
+
+          let res = await menuList({})
+          if (res.code === 0) {
+            let list = res.data
+            list = list.filter((item) => item.child && item.child.length > 0)
+            let arrag = []
+            let btnList = []
+            console.log(list)
+            list.forEach(v1 => {
+              let pItem = {
+                name: v1.menu_route,
+                path: `/${v1.menu_route}`,
                 meta: {
-                  title: v2.menu_name,
-                  icon: v2.menu_img
+                  title: v1.menu_name,
+                  icon: v1.menu_img
                 },
-                url: v2.menu_url
+                children: []
               }
-              let model = {
-                menu_route: v2.menu_route,
-                action: v2.action
-              }
-              btnList.push(model)
-              pItem.children.push(item)
+              v1.child.forEach(v2 => {
+                let item = {
+                  path: v2.menu_route,
+                  name: v2.menu_route,
+                  hidden: parseInt(v2.is_display + "") === 0,
+                  meta: {
+                    title: v2.menu_name,
+                    icon: v2.menu_img
+                  },
+                  url: v2.menu_url
+                }
+                let model = {
+                  menu_route: v2.menu_route,
+                  action: v2.action
+                }
+                btnList.push(model)
+                pItem.children.push(item)
+              })
+              arrag.push(pItem)
             })
-            arrag.push(pItem)
-          })
-          console.log(arrag);
-
-          // 生成页面权限
-          commit("navListFn", arrag);
-          // 生成按钮权限
-          commit("btnListFn", btnList);
-          // 生成路由
-          initRouter(arrag, that);
-          // state.commit("loginInfoCommit", res.data);
-          resolve("success")
-        } else if (res.code === 101 || res.code === 102) {
+            console.log(arrag);
+            // 生成页面权限
+            commit("navListFn", arrag);
+            // 生成按钮权限
+            commit("btnListFn", btnList);
+            // 生成路由
+            initRouter(arrag, that);
+            // state.commit("loginInfoCommit", res.data);
+            resolve("success")
+          } else if (res.code >= 100 && res.code <= 104) {
+            resolve("noToken")
+          } else {
+            resolve(res)
+          }
+        } else if (userRes.code >= 100 && userRes.code <= 104) {
           resolve("noToken")
         } else {
           resolve(res)
         }
-
-
-
-        // let res = await menuList({})
-        // if (res.code === 0) {
-        //   let list = res.data
-        //   list = list.filter((item) => item.child && item.child.length > 0)
-        //   let arrag = []
-        //   let btnList = []
-        //   let mainMenu = []
-        //   list.forEach(v1 => {
-        //     let pItem = {
-        //       name: v1.menu_route,
-        //       path: `/${v1.menu_route}`,
-        //       hidden: parseInt(v1.is_display + "") === 0,
-        //       meta: {
-        //         title: v1.menu_name,
-        //         icon: v1.menu_img
-        //       },
-        //       children: []
-        //     }
-        //     let mitem = Object.assign({ child: `/${v1.menu_route}/` }, pItem)
-        //     delete mitem['children']
-        //     mainMenu.push(mitem)
-        //     v1.child.forEach((v2, i2) => {
-        //       if (i2 === 0) {
-        //         mitem.child += v2.menu_route
-        //       }
-        //       let item = {
-        //         path: v2.menu_route,
-        //         name: v2.menu_route,
-        //         hidden: parseInt(v2.is_display + "") === 0,
-        //         meta: {
-        //           title: v2.menu_name,
-        //           icon: v2.menu_img
-        //         },
-        //         url: v2.menu_url
-        //       }
-        //       let model = {
-        //         menu_route: v2.menu_route,
-        //         action: v2.action
-        //       }
-        //       btnList.push(model)
-        //       pItem.children.push(item)
-        //     })
-        //     arrag.push(pItem)
-        //   })
-        //   //生成主菜单
-        //   commit("mainListFn", mainMenu);
-        //   // 生成页面权限
-        //   commit("navListFn", arrag);
-        //   // 生成按钮权限
-        //   commit("btnListFn", btnList);
-        //   // 生成路由
-        //   initRouter(arrag, that);
-        //   // state.commit("loginInfoCommit", res.data);
-        //   resolve("success")
-        // } else if (res.code === 101 || res.code === 102) {
-        //   resolve("noToken")
-        // } else {
-        //   resolve(res)
-        // }
       }
     })
   },
@@ -245,6 +224,12 @@ const actions = {
 
       removeMenu()
       removeBtn()
+      remove_business_company()
+      commit('business_company', '')
+      commit('business_companyNo', '')
+      remove_business_companyNo()
+      remove_private_field()
+      commit('private_field', [])
       // removeMainList()
       // reset visited views and cached views
       // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485

src/utils/auth.js

@@ -5,6 +5,9 @@ const MenuKey = 'Purchase-Console-Menu'
 const BtnKey = 'Purchase-Console-MenuBtn'
 const NoticeKey = "Purchase-Console-Notice"
 const mainMenuKey = 'Purchase-Console-MainMenu'
+const businessCompanyKey = 'Purchase-Console-businessCompany'
+const businessCompanyNoKey = 'Purchase-Console-businessCompanyNo'
+const privateFieldKey = 'Purchase-Console-privateField'
 export function getToken() {
   return Cookies.get(TokenKey)
 }
@@ -69,3 +72,41 @@ export function setMainList(has) {
 export function removeMainList() {
   return Cookies.remove(mainMenuKey)
 }
+
+export function get_business_company() {
+  return Cookies.get(businessCompanyKey)
+}
+
+export function set_business_company(has) {
+  return Cookies.set(businessCompanyKey, has)
+}
+
+export function remove_business_company() {
+  return Cookies.remove(businessCompanyKey)
+}
+export function get_business_companyNo() {
+  return Cookies.get(businessCompanyNoKey)
+}
+
+export function set_business_companyNo(has) {
+  return Cookies.set(businessCompanyNoKey, has)
+}
+
+export function remove_business_companyNo() {
+  return Cookies.remove(businessCompanyNoKey)
+}
+
+
+export function get_private_field() {
+  return Cookies.get(privateFieldKey)
+}
+
+export function set_private_field(has) {
+  return Cookies.set(privateFieldKey, has)
+}
+
+export function remove_private_field() {
+  return Cookies.remove(privateFieldKey)
+}
+
+

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -883,7 +883,7 @@
                 :precision="2"
                 :size="'mini'"
                 :controls="false"
-                :append="'元'"
+                :append="'元/件'"
                 @reschange="number_change($event, 'open_fee')"
               />
             </el-form-item>
@@ -959,7 +959,7 @@
                 :precision="2"
                 :size="'mini'"
                 :controls="false"
-                :append="'元'"
+                :append="'元/g'"
                 @reschange="number_change($event, 'cgd_gold_price')"
               />
             </el-form-item>

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -4,26 +4,28 @@ const public_listCol = [
     prop: "good_name",
     label: "商品名称",
     _slot_: "good_name",
+    span: 24,
   },
 
-  {
-    prop: "speclist",
-    label: "规格",
-    _slot_: "speclist",
-  },
+  // {
+  //   prop: "speclist",
+  //   label: "规格",
+  //   _slot_: "speclist",
+  // },
   {
     prop: "skuCode",
     label: "上线商品编号",
-    span: 6,
+    span: 7,
   },
   {
     prop: "companyNo",
     label: "业务企业编号",
-    span: 6,
+    span: 7,
   },
   {
     prop: "company",
     label: "业务企业名称",
+    span: 10,
   },
   {
     prop: "good_info_img",
@@ -192,13 +194,10 @@ const public_listCol = [
     span: 4,
   },
 
-
-
-
-
   {
-    prop: "after_sales",
-    label: "售后说明",
+    prop: "noble",
+    label: "贵金属信息",
+    _slot_: "noble",
     span: 24,
   },
   {
@@ -207,6 +206,15 @@ const public_listCol = [
     span: 24,
   },
 
+
+  {
+    prop: "after_sales",
+    label: "售后说明",
+    span: 24,
+  },
+
+
+
   {
     prop: "craft_desc",
     label: "工艺说明",
@@ -218,9 +226,20 @@ const public_listCol = [
 
 ]
 const purchase_listCol = [
+  {
+    prop: "spuCode",
+    label: "商品成本编号",
+    span: 7,
+  },
+  {
+    prop: "supplierNo",
+    label: "供应商编号",
+    span: 7,
+  },
   {
     prop: "supplierName",
     label: "供应商名称",
+    span: 10,
   },
   {
     prop: "is_auth",
@@ -228,12 +247,7 @@ const purchase_listCol = [
     _slot_: "is_auth",
     span: 6,
   },
-  {
-    prop: "is_step",
-    label: "启用成本阶梯",
-    _slot_: "is_step",
-    span: 4,
-  },
+
 
   {
     prop: "cert_fee",
@@ -269,7 +283,7 @@ const purchase_listCol = [
   {
     prop: "open_fee",
     label: "开模费",
-    append: '元',
+    append: '元/件',
     span: 6,
   },
 
@@ -291,6 +305,18 @@ const purchase_listCol = [
     append: '元',
     span: 6,
   },
+  {
+    prop: "cgd_gold_price",
+    label: "供应商采购金价",
+    append: '元/g',
+    span: 6,
+  },
+  {
+    prop: "is_step",
+    label: "启用成本阶梯",
+    _slot_: "is_step",
+    span: 6,
+  },
   {
     prop: "nakelist",
     label: "采购起订量",

src/views/goodStore/goodsOnline/detail.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="goodsOnlineDetail">
     <!-- {{ status }}-{{ powers }} -->
+    {{ FieldPromise }}
     <div
       class="goodsOnlineDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -24,12 +25,11 @@
                     :src="sitem.good_thumb_img"
                     alt=""
                   />
-                  <div>{{ sitem.good_name }}</div>
-                </template>
-                <template slot="speclist">
+                  <span>{{ sitem.good_name }}</span>
                   <span v-for="(si, i) in sitem.speclist" :key="si.spec_id + i">
-                    <span v-if="i !== 0">--</span
-                    ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+                    <span v-if="i !== 0">-</span>
+                    <span v-else>_</span>
+                    <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
                   </span>
                 </template>
                 <template slot="good_info_img">
@@ -42,30 +42,39 @@
                     :key="si + i"
                   />
                 </template>
-                <template slot="is_auth">
+                <template slot="exclusive">
+                  <span v-for="(si, sii) in sitem.exclusive" :key="si.id">
+                    <span v-if="sii !== 0">/</span> <span>{{ si.name }}</span>
+                  </span>
+                </template>
+                <template slot="supply_area">
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options3.find((item) => item.id == sitem.is_auth) || {})
-                        .name || '--'
+                      (
+                        options6.find((item) => item.id == sitem.supply_area) ||
+                        {}
+                      ).name || '--'
                     "
                   />
                 </template>
-                <!-- <template slot="exclusive">
+                <template slot="is_stock">
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options2.find((item) => item.id == sitem.exclusive) || {})
+                      (options4.find((item) => item.id == sitem.is_stock) || {})
                         .name || '--'
                     "
                   />
-                </template> -->
-                <template slot="is_stock">
+                </template>
+                <template slot="exam_status">
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (options4.find((item) => item.id == sitem.is_stock) || {})
-                        .name || '--'
+                      (
+                        options8.find((item) => item.id == sitem.exam_status) ||
+                        {}
+                      ).name || '--'
                     "
                   />
                 </template>
@@ -85,23 +94,39 @@
                     >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
                   >
                 </template>
-                <template slot="exclusive">
-                  <span v-for="(si, sii) in sitem.exclusive" :key="si.id">
-                    <span v-if="sii !== 0">/</span> <span>{{ si.name }}</span>
-                  </span>
+                <template slot="noble">
+                  <span v-if="sitem.noble_metal"
+                    >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+                      sitem.noble_name
+                    }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+                      sitem.is_gold_price === "0" ? "不" : ""
+                    }}启用实时金价-{{
+                      sitem.is_diff === "1" ? "有" : "无"
+                    }}工差-{{ sitem.config }}-{{ sitem.other_config }}</span
+                  >
                 </template>
-
-                <template slot="supply_area">
+              </show-data-table>
+              <show-data-table
+                :newTime="newTime"
+                v-if="
+                  newTime !== '' &&
+                  private_field &&
+                  private_field.length > 0 &&
+                  private_field.some((item) => item == '1')
+                "
+                :sitem="sitem"
+                :columns="purchase_listCol"
+              >
+                <template slot="is_auth">
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (
-                        options6.find((item) => item.id == sitem.supply_area) ||
-                        {}
-                      ).name || '--'
+                      (options3.find((item) => item.id == sitem.is_auth) || {})
+                        .name || '--'
                     "
                   />
                 </template>
+
                 <template slot="is_step">
                   <el-tag
                     :size="'mini'"
@@ -112,17 +137,6 @@
                   />
                 </template>
 
-                <template slot="exam_status">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (
-                        options8.find((item) => item.id == sitem.exam_status) ||
-                        {}
-                      ).name || '--'
-                    "
-                  />
-                </template>
                 <template slot="nakelist">
                   <el-table
                     :data="nakelist"
@@ -137,6 +151,18 @@
                     <el-table-column prop="delivery_fee" label="物流费" />
                   </el-table>
                 </template>
+              </show-data-table>
+              <show-data-table
+                :newTime="newTime"
+                v-if="
+                  newTime !== '' &&
+                  private_field &&
+                  private_field.length > 0 &&
+                  private_field.some((item) => item == '2')
+                "
+                :sitem="sitem"
+                :columns="sale_listCol"
+              >
                 <template slot="ladderlist">
                   <el-table
                     :data="ladderlist"
@@ -276,7 +302,7 @@ export default {
     handleOnlineForm,
   },
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(

src/views/interest/role/addEdit.vue

@@ -515,7 +515,9 @@ export default {
       const res = await asyncRequest.detail({ roleid: this.id });
       if (res && res.code === 0 && res.data) {
         let resD = res.data;
+        resD.private_field=resD.private_field===''?[]:resD.private_field
         this.ruleForm = resD;
+
         if (resD.action && resD.action.length > 0) {
           this.action = resD.action;
         } else {