snow 2 years ago
parent
commit
bbf5042e52

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


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


+ 2 - 2
src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -246,7 +246,7 @@ const onlineColumns = [
     label: '详情图'
   },
   {
-    prop: 'company',
+    prop: 'companyName',
     label: '业务企业名称',
     _slot_: 'company'
   },
@@ -541,7 +541,7 @@ const costColumns = [
     label: '详情图'
   },
   {
-    prop: 'company',
+    prop: 'companyName',
     label: '业务企业名称',
     _slot_: 'company'
   },

+ 1 - 1
src/components/globalComponents/show-goods-data-table/main.vue

@@ -69,7 +69,7 @@
         >
       </template>
       <template slot="company">
-        <span>{{ sitem.company }}</span>
+        <span>{{ sitem.companyName }}</span>
         <el-popover placement="top" width="300" trigger="hover">
           <ul>
             <li>

+ 5 - 0
src/views/stock/goodsRepertory/columns.js

@@ -86,6 +86,11 @@ const listCol = [
     label: '公司名称',
     width: '170px'
   },
+  {
+    prop: 'company_name',
+    label: '部门名称',
+    width: '170px'
+  },
   {
     prop: 'good_name',
     label: '名称',

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