snow 2 jaren geleden
bovenliggende
commit
7f007a58b3

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


+ 7 - 1
src/views/sellOut/returnGoodWorkOrder/components/ShowDataTableColumns.js

@@ -60,6 +60,12 @@ const showColumns = [
   //   label: '下单数量',
   //   span: 4
   // },
+  {
+    prop: 'type',
+    label: '仓库类型',
+    span: 4,
+    _slot_: 'stock_type'
+  },
   {
     prop: 'send_num',
     label: '发货数量',
@@ -78,7 +84,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 12
+    span: 8
   },
   {
     prop: 'remark',

+ 4 - 0
src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -26,6 +26,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="stock_type">
+                  <el-tag size="mini">{{sitem.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+                </template>
+             
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"

+ 6 - 0
src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -25,6 +25,12 @@ export default [
     label: '订单编号',
     width: '160px'
   },
+  {
+    prop: 'type',
+    label: '仓库类型',
+    width: '75px',
+    _slot_: 'stock_type'
+  },
   {
     prop: 'status',
     label: '状态',

+ 7 - 1
src/views/supplierSellOut/supplierReturnWorkOrder/components/ShowDataTableColumns.js

@@ -60,6 +60,12 @@ const showColumns = [
   //   label: '下单数量',
   //   span: 4
   // },
+  {
+    prop: 'type',
+    label: '仓库类型',
+    span: 4,
+    _slot_: 'stock_type'
+  },
   {
     prop: 'send_num',
     label: '发货数量',
@@ -78,7 +84,7 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 12
+    span: 8
   },
   {
     prop: 'remark',

+ 4 - 0
src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -39,6 +39,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="stock_type">
+                  <el-tag size="mini">{{sitem.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+                </template>
+
                 <template slot="record">
                   <div class="ql-editor"  v-html="sitem.record"></div>
                 </template>

+ 4 - 0
src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -134,6 +134,10 @@
           <el-tag size="mini">{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
         </template>
 
+        <template #stock_type="{scope}">
+          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
+        </template>
+
         <template #sendWsm="{scope}">
           <el-popover placement="top" width="360" trigger="hover">
             <i class="el-icon-warning-outline" slot="reference"></i>

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