Ver código fonte

feat:修改销售发货单和销售退货单的发货条码信息

Moss 1 ano atrás
pai
commit
b56c906ee6

+ 29 - 2
src/views/mallManagement/order/sales_deliver_order_list/index.vue

@@ -79,7 +79,30 @@
         </div>
 
         <div v-show="detailTabs == 'b'">
-          
+          <el-table
+            class="specTable"
+            :data="codeList"
+            element-loading-text="Loading"
+            border
+            highlight-current-row
+            stripe
+            style="margin-top: 20px">
+            <el-table-column align="center" label="品牌" prop="brandName" min-width="120"></el-table-column>
+            <el-table-column align="center" label="大类" prop="mainName" min-width="120"></el-table-column>
+            <el-table-column align="center" label="小类" prop="smallName" min-width="120"></el-table-column>
+            <el-table-column align="center" label="商品名称" prop="goodsMaterialName" min-width="200"></el-table-column>
+            <el-table-column align="center" label="规格型号" prop="specsName" min-width="200"></el-table-column>
+            <el-table-column align="center" label="物料类型" prop="materialName" min-width="120"></el-table-column>
+            <el-table-column align="center" label="物料名称" prop="goodsMaterialName" min-width="120"></el-table-column>
+            <el-table-column align="center" label="是否一物一码" prop="uniqueCode" min-width="120">
+              <template slot-scope="scope">
+                {{scope.row.uniqueCode == 'YES' ? '是' : '否'}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="条码" prop="materialCode" min-width="120"></el-table-column>
+            <el-table-column align="center" label="数量" prop="stockQty" min-width="120"></el-table-column>
+
+          </el-table>
         </div>
 
 				<div slot="footer" class="dialog-footer" style="margin-top: 20px;">
@@ -96,7 +119,7 @@ import { mapGetters } from 'vuex'
 import { getToken } from '@/utils/auth'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { getSalesDeliverOrderList, salesDeliverOrderListExport, getSalesDeliverOrderDetail, salesDeliverOrderRefund } from "@/api/order";
+import { getSalesDeliverOrderList, salesDeliverOrderListExport, getSalesDeliverOrderDetail, salesDeliverOrderRefund, getOrderCodeList } from "@/api/order";
 import operation_mixin from '@/components/template/operation_mixin.js'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
 
@@ -125,6 +148,7 @@ export default {
       detailTabs: 'a',
 
       detailData: {},
+      codeList: [],
 
       pageType: '',
 
@@ -273,6 +297,9 @@ export default {
             getSalesDeliverOrderDetail({ deliveryId: id }).then(res => {
               this.detailData = res.data;
             })
+            getOrderCodeList({ deliveryId: id }).then(res => {
+              this.codeList = res.data;
+            })
       		})
       	},
       	// 关闭时事件

+ 2 - 2
src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -689,7 +689,7 @@ export default {
             this.formData.receAddress = oData.receAddress;
             this.oldList = oData.orderOldProductDTOList;
           })
-          getOrderCodeList({orderId: dData.orderId}).then(res => {
+          getOrderCodeList({deliveryId: dData.deliveryId}).then(res => {
             this.codeList = res.data;
           })
         })
@@ -1020,7 +1020,7 @@ export default {
         // this.goodsList = data.orderDetails;
         this.oldList = data.orderOldProductDTOList;
 
-        getOrderCodeList({orderId: data.orderId}).then(res => {
+        getOrderCodeList({deliveryId: data.deliveryId}).then(res => {
           this.codeList = res.data;
         })