build

src/views/goodStore/goodsCost/columns.js

@@ -585,8 +585,9 @@ const basicColumns = [
     span: 6
   },
   {
-    prop: 'brand_name',
+    prop: 'is_auth',
     label: '销售权限',
+    _slot_: 'is_auth',
     span: 6
   },
   {
@@ -678,7 +679,8 @@ const basicColumns = [
   {
     prop: 'packing_spec',
     label: '供货区域',
-    span: 6
+    span: 6,
+    _slot_: 'packing_spec'
   },
   {
     prop: 'delivery_day',

src/views/goodStore/goodsCost/detail.vue

@@ -50,6 +50,15 @@
                     </template>
                   </template>
 
+
+                  <template slot="packing_spec">
+                    <el-tag size="mini">{{ ( options6.find(({id}) => id === sitem.supply_area) || {}).name || '--' }}</el-tag>
+                  </template>
+
+                  <template slot="is_auth">
+                    <el-tag size="mini">{{ ( options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
+                  </template>
+
                   <template slot="good_info_img">
                     <div style="max-height: 24px; overflow: hidden">
                       <el-image
@@ -219,6 +228,8 @@ import {
   sendColumns,
   imageColumns,
   ladderColumns,
+  options3,
+  options6
 } from "./columns";
 import privateField from "@/mixins/privateField";
 
@@ -254,6 +265,8 @@ export default {
       statusList: [],
       basicColumns,
       packingColumns,
+      options3,
+      options6,
       sendColumns,
       imageColumns,
       ladderColumns,

src/views/goodStore/supplierGoodsCost/columns.js

@@ -579,8 +579,9 @@ const basicColumns = [
     span: 6
   },
   {
-    prop: 'brand_name',
+    prop: 'is_auth',
     label: '销售权限',
+    _slot_: 'is_auth',
     span: 6
   },
   {
@@ -672,6 +673,7 @@ const basicColumns = [
   {
     prop: 'packing_spec',
     label: '供货区域',
+    _slot_: 'packing_spec',
     span: 6
   },
   {

src/views/goodStore/supplierGoodsCost/detail.vue

@@ -43,6 +43,14 @@
                    }}-{{ sitem.other_config }}</span>
                   </template>
 
+                  <template slot="packing_spec">
+                    <el-tag size="mini">{{ ( options6.find(({id}) => id === sitem.supply_area) || {}).name || '--' }}</el-tag>
+                  </template>
+
+                  <template slot="is_auth">
+                    <el-tag size="mini">{{ ( options3.find(({id}) => id === sitem.is_auth) || {}).name || '--' }}</el-tag>
+                  </template>
+
                 <template slot="cat_info">
                   {{sitem.cat_info ? sitem.cat_info.map(({name}) => name).join('_') : '--' }}
                 </template>
@@ -223,7 +231,7 @@ import { mapGetters } from "vuex";
 import baseForm from "./components/baseForm";
 import costForm from './components/costDetail'
 import ShowDataTable from '@/views/standingBook/components/detail-data-table.vue'
-import { basicColumns, packingColumns, sendColumns, imageColumns, ladderColumns } from './columns'
+import { basicColumns, packingColumns, sendColumns, imageColumns, ladderColumns, options6 , options3} from './columns'
 import privateField from "@/mixins/privateField";
 
 export default {
@@ -259,6 +267,8 @@ export default {
       basicColumns,
       packingColumns,
       sendColumns,
+      options6,
+      options3,
       imageColumns,
       ladderColumns,
       size: "small",

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -5,7 +5,6 @@
     </div>
 
     <div style="width: 100%" v-if="powers.some((i) => i == '007')">
-
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
@@ -19,10 +18,7 @@
                 <template slot="status">
                   <el-tag
                     :size="'mini'"
-                    v-text="
-                      (statusOptions.find((item) => item.value == sitem.status) || {})
-                        .label || '--'
-                    "
+                    v-text="(statusOptions.find((item) => item.value == sitem.status) || {}).label || '--'"
                   ></el-tag>
                 </template>