build

src/config/env.company.js

@@ -16,7 +16,9 @@ module.exports = {
     AgentId: '1324690581'
   },
   // 结算平台url
-  settlementPlatformUrl: 'http://127.0.0.1:8848',
+  // settlementPlatformUrl: 'http://127.0.0.1:8848',
+  settlementPlatformUrl: 'http://newweb.test241.wanyuhengtong.com/',
+  secretKey: 'key123',
   loginTitle: '',
   loginBeian: '京ICP备2022033072号-1',
   loginBeianUrl: 'https://beian.miit.gov.cn/'

src/config/env.development.js

@@ -18,8 +18,7 @@ module.exports = {
   loginTitle: '',
   loginBeian: '京ICP备2022033072号-1',
   loginBeianUrl: 'https://beian.miit.gov.cn/',
-  // 结算平台url
-  settlementPlatformUrl: 'http://127.0.0.1:8848',
+  settlementPlatformUrl: 'http://newweb.test241.wanyuhengtong.com/',
   // token加密key
   secretKey: 'key123'
 }

src/layout/components/company-select/index.vue

@@ -135,8 +135,8 @@ export default {
   methods: {
     getUserCompany,
     genCompanyLabel(company) {
-      const { name, code, type } = company
-      return `${code}/${name}${type === '1' ? '(已升级为业务公司)' : ''}`
+      const { name, code } = company
+      return `${code}/${name}`
     },
     async initalData() {
       // 区分是否超管用户请求不同接口
@@ -157,8 +157,8 @@ export default {
       this.state.loading = false
       this.params.page++
       const _list = this.isSupertube ? data.list : convertCompanylist(data.list)
-      const __list = this.isSupertube && this.currentLevel === '1' ? _list.map(item => ({ ...item, code: item.relation_code })) : _list
-      this.$store.commit('user/setCompanylist', [...this.companylist, ...__list])
+      // const __list = this.isSupertube && this.currentLevel === '1' ? _list.map(item => ({ ...item, code: item.relation_code })) : _list
+      this.$store.commit('user/setCompanylist', [...this.companylist, ..._list])
       return this.isSupertube ? data.list : convertCompanylist(data.list)
     },
 
@@ -245,9 +245,9 @@ export default {
       if (height + scrollTop >= scrollHeight && isAllowLoad) {
         const list = await this.loadMore()
         const _list = this.isSupertube ? list : convertCompanylist(list)
-        const __list = this.isSupertube && this.currentLevel === '1' ? _list.map(item => ({ ...item, code: item.relation_code })) : _list
+        // const __list = this.isSupertube && this.currentLevel === '1' ? _list.map(item => ({ ...item, code: item.relation_code })) : _list
         // 保存到全局
-        this.$store.commit(userStoreActions.setCompanyList, [...this.companylist, ...__list])
+        this.$store.commit(userStoreActions.setCompanyList, [...this.companylist, ..._list])
       }
     },
 
@@ -291,8 +291,8 @@ export default {
       this.state.loading = false
       // 获取列表数据
       const result = await this.initalData()
-      const list = this.isSupertube && this.currentLevel === '1' ? result.map(item => ({ ...item, code: item.relation_code })) : result
-      if (result) this.$store.commit(userStoreActions.setCompanyList, list)
+      // const list = this.isSupertube && this.currentLevel === '1' ? result.map(item => ({ ...item, code: item.relation_code })) : result
+      if (result) this.$store.commit(userStoreActions.setCompanyList, result)
     },
     selectAllCompany() {
       this.value = ''

src/store/modules/user.js

@@ -340,8 +340,10 @@ const actions = {
            let _companylist = []
            if(companyCode === 0) {
             _companylist = isSupertube ? companyData.list : convertCompanylist(companyData.list);
+            
             //超管 + 业务公司 需要将 relation_code 设置为 code
-            if(isSupertube) _companylist = _companylist.map(item => ({...item, code: item.relation_code}))
+            // if(isSupertube) _companylist = _companylist.map(item => ({...item, code: item.relation_code}))
+            
             commit('setCompanylist', _companylist)
            }
            if(companyCode >= 100 && companyCode <= 104){

src/views/interest/role/addEdit.vue

@@ -53,7 +53,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="角色等级" prop="level">
               <el-select
                 v-model="ruleForm.level"
@@ -70,8 +70,8 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
-
+          </el-col> -->
+          <!--
           <el-col :span="12">
             <el-form-item label="是否允许查看价格" label-width="130px">
               <el-select v-model="ruleForm.is_allow_see_price" :disabled="isDetail" placeholder="是否允许查看价格">
@@ -79,7 +79,7 @@
                 <el-option value="0" label="不允许" />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <div class="quanxian-main">
             <div class="quanxian-title">
@@ -312,7 +312,7 @@ export default {
         role_name: '',
         level: '2',
         private_field: [],
-        is_allow_see_price: ''
+        is_allow_see_price: '1'
       },
       action_data: [], // 字段数据
       action: [], // 功能数据
@@ -667,7 +667,7 @@ export default {
           this.ruleForm = {
             role_name: '',
             private_field: [],
-            is_allow_see_price: '',
+            is_allow_see_price: '1',
             level: '2'
           }
         }

src/views/purchaseIn/workbench/index.vue

@@ -62,7 +62,7 @@
                   <span class="label-main" style="flex:1">{{ item.companyNo || '--' }}</span>
                 </li>
 
-                <li class="fl item-li" style="wrap:nowrap;display: flex;">
+                <li class="fl item-li" style="display: flex;">
                   <span class="label" style="width:80px">业务公司名称:</span>
                   <span class="label-main" style="flex:1">{{ item.companyName || '--' }}</span>
                 </li>

src/views/sellOut/zxDiffOrder/columns.js

@@ -1,46 +1,56 @@
 const columns = [
 
   {
-    prop: "orderCode",
-    label: "订单编号",
-    fixed: "left",
-    width: "152px",
+    prop: 'orderCode',
+    label: '订单编号',
+    fixed: 'left',
+    width: '152px'
   },
   {
-    prop: "diff_weight",
-    label: "工差总重量",
-    width: "125px",
+    prop: 'diff_weight',
+    label: '工差总重量',
+    width: '125px'
   },
   {
-    prop: "diff_price",
-    label: "工差总金额",
-    width: "125px",
+    prop: 'diff_price',
+    label: '工差总金额',
+    width: '125px'
   },
   {
-    prop: "gold_price",
-    label: "金价",
-    width: "125px",
+    prop: 'gold_price',
+    label: '金价',
+    width: '125px'
   },
   {
-    prop: "status",
-    _slot_:"status",
-    label: "状态",
-    width: "125px",
+    prop: 'status',
+    _slot_: 'status',
+    label: '状态',
+    width: '145px'
   },
   {
-    prop: "good_code",
-    label: "商品编号",
-    "width": "160px",
+    prop: 'customer_code',
+    label: '客户编码',
+    width: '145px'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    "min-width": "160px",
+    prop: 'companyName',
+    label: '客户名称',
+    width: '125px'
   },
   {
-    prop: "class_cat",
-    label: "商品分类",
-    "width": "160px",
+    prop: 'good_code',
+    label: '商品编号',
+    'width': '160px'
+  },
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    'min-width': '160px'
+  },
+  {
+    prop: 'class_cat',
+    label: '商品分类',
+    'width': '160px'
   },
   // {
   //   prop: "is_act",
@@ -54,75 +64,74 @@ const columns = [
   // },
 
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "140px",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
+    width: '50px',
+    _slot_: 'operation'
+  }
 ]
 const showColumns = [
   {
-    prop: "orderCode",
-    label: "订单编号",
+    prop: 'orderCode',
+    label: '订单编号',
     span: 6
   },
   {
-    prop: "order_type",
-    label: "订单来源",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '订单来源',
+    _slot_: 'order_type',
     span: 6
   },
   {
-    prop: "status",
-    label: "工差单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '工差单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
 
-
   {
-    prop: "diff_weight",
-    label: "工差总重量",
+    prop: 'diff_weight',
+    label: '工差总重量',
     span: 6
   },
   {
-    prop: "diff_price",
-    label: "工差总金额",
+    prop: 'diff_price',
+    label: '工差总金额',
     span: 6
   },
   {
-    prop: "gold_price",
-    label: "金价",
+    prop: 'gold_price',
+    label: '金价',
     span: 6
   },
   {
-    prop: "is_act",
-    label: "客户反馈",
-    _slot_: "is_act",
+    prop: 'is_act',
+    label: '客户反馈',
+    _slot_: 'is_act',
     span: 6
   },
   {
-    prop: "customer_remark",
-    label: "客户意愿",
-    _slot_: "customer_remark",
+    prop: 'customer_remark',
+    label: '客户意愿',
+    _slot_: 'customer_remark',
     span: 6
   },
   {
-    prop: "remark",
-    label: "业务审核备注",
+    prop: 'remark',
+    label: '业务审核备注',
     span: 18
-  },
+  }
 ]
-export { columns, showColumns }
+export { columns, showColumns }