build

src/apis/service/goodStore/goodsCost/index.js

@@ -8,7 +8,7 @@ export default {
   online_add: (data, params) => http(api + 'gooduponline', data, 'post', params),
   // 分页查询
   list: (data, params) => http(api + 'gooduplist', data, 'post', params),
-  copy_list: (data, params) => http(api + 'gooduplist', data, 'post', params),
+  copy_list: (data, params) => http(api + 'goodup_list_copy', data, 'post', params),
   // 获取全部规格值
   valueall: (data, params) => http(api + 'valueall', data, 'post', params),
   // 规格值添加

src/views/purchaseIn/purchaseReturn/columns.js

@@ -21,13 +21,13 @@ export default [
   //   _slot_: "status",
   //   width: "120px",
   // },
-  {
-    prop: 'order_type',
-    label: '退货来源',
-    // 1备库 2竞价
-    _slot_: 'order_type',
-    width: '80px'
-  },
+  // {
+  // prop: 'order_type',
+  // label: '退货来源',
+  // 1备库 2竞价
+  // _slot_: 'order_type',
+  // width: '80px'
+  // },
   {
     prop: 'spuCode',
     label: '商品编号',
@@ -49,6 +49,12 @@ export default [
     label: '商品类型',
     width: '150'
   },
+  {
+    prop: 'order_source',
+    _slot_: 'order_source',
+    label: '订单来源',
+    width: '150'
+  },
   {
     prop: 'companyNo',
     label: '业务公司编码',
@@ -59,12 +65,6 @@ export default [
     label: '业务公司名称',
     width: '155px'
   },
-  {
-    prop: 'order_source',
-    _slot_: 'order_source',
-    label: '订单来源',
-    width: '155px'
-  },
   {
     prop: 'supplierNo',
     label: '供应商编号',
@@ -75,12 +75,6 @@ export default [
     label: '供应商名称',
     width: '155px'
   },
-  {
-    prop: 'order_source',
-    _slot_: 'order_source',
-    label: '订单来源',
-    width: '150'
-  },
   {
     prop: 'return_num',
     label: '退货数量'

src/views/purchaseIn/purchaseReturn/index.vue

@@ -179,18 +179,32 @@
           </div>
         </template>
        
-        <template #order_type="{ scope }">
-        
-          <p
+        <template #is_stock="{ scope }">
+          <el-tag
+            size="mini"
+            v-text="
+              (
+               is_stock_options.find(
+                  (item) => item.id == scope.row.is_stock
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            size="mini"
             v-text="
               (
-                cg_order_type_options.find(
-                  (item) => item.id == scope.row.order_type
+               cg_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
                 ) || {}
               ).label || '--'
             "
-          ></p>
+          ></el-tag>
         </template>
+
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -289,6 +303,10 @@ export default {
         // { id: "4", label: "待通知财务" },
         // { id: "5", label: "完成退货" },
       ],
+      is_stock_options:[
+       { id: "0", label: "非库存品" },
+       { id: "1", label: "库存品" },
+      ],
       cg_order_type_options,
       cg_order_source_options,
       loading: true,