优化

src/api/delivery.ts

@@ -119,7 +119,25 @@ export function getMaindataStorehouseSingleData(data ?: any) {
 export function insertShortBarge(data ?: any) {
 	return request({
 		url: '/supply/supplyShortBarge/insertShortBarge',
-		method: 'GET',
-		params: data
+		method: 'POST',
+		data: data
+	})
+}
+
+//短驳价格
+export function getShortBargePrice(data?:any) {
+	return request({
+		url: '/omsOrder/omsShippingOrder/getShortBargePrice',
+		method: 'Post',
+		data: data
+	})
+}
+
+//短驳
+export function WMSAddEntryOrder(data?:any) {
+	return request({
+		url: '/omsOrder/WMSwork/WMSAddEntryOrder',
+		method: 'Post',
+		data: data
 	})
 }

src/views/audit/store/components/batchbyOneModal.vue

@@ -44,7 +44,7 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import DeliveryGoodsInfo from "./deliveryGoodsInfo.vue";
 import DeliveryPrice from "./deliveryPrice.vue";
 import { add,multiply,subtract,divide } from '@/benyun/utils/accuracy'
-import { queryPricePackage,insertShortBarge,getInventoryByStoreHouseIdAndSkuids } from  '@/api/delivery'
+import { getShortBargePrice,WMSAddEntryOrder,getInventoryByStoreHouseIdAndSkuids } from  '@/api/delivery'
 import Format from '@/benyun/utils/dateFormat'
 
 @Component({components:{DeliveryGoodsInfo,DeliveryPrice}})
@@ -248,7 +248,7 @@ export default class BatchbyOneModal extends Vue {
     delete params.subItem;
     // console.log(params)
     this.load = true;
-    insertShortBarge(params).then((res:any) => {
+    WMSAddEntryOrder(params).then((res:any) => {
       this.load = false;
       if(res.code == 200){
         this.isSuccess = true;
@@ -318,10 +318,17 @@ export default class BatchbyOneModal extends Vue {
     let params:any={};
     params.startAddressCode = data.tmsShipmentCityNo + '000';
     params.endAddressCode = data.tmsUnloadingCityNo + '000';
-    params.omsIds=[this.data[0].omsOrderIds];
-    params.planType = data.tmsTransportMethod;
+    params.materialInfos = []
+    if(data.subItem){
+      for(const i of data.subItem){
+        params.materialInfos.push({
+          skuId: i.omsOrderItemId,
+          qty:i.tmsQuantity
+        })
+      }
+    }
     this.load = true;
-    queryPricePackage(params).then((res:any) => {
+    getShortBargePrice(params).then((res:any) => {
       // if(this.currentPrice && this.currentPrice[data.omsOrderIds]){
       //   delete this.currentPrice[data.omsOrderIds]
       // }

src/views/audit/store/components/deliveryGoodsInfo.vue

@@ -230,10 +230,10 @@ export default class DeliveryGoodsInfo extends Vue {
         tmsDeliveryDate:[{
           required: true, message: '期望提货时间不能为空！', trigger: 'blur'
         }],
-        tmsTransportMethod: [{
-          required: true, message: '运输方式不能为空！', trigger: 'change'
-        }],
-        wmsSendType: [{
+        // tmsTransportMethod: [{
+        //   required: true, message: '运输方式不能为空！', trigger: 'change'
+        // }],
+        sendType: [{
           required: true, message: '出库方式不能为空！', trigger: 'change'
         }]
       }
@@ -403,29 +403,9 @@ export default class DeliveryGoodsInfo extends Vue {
           }
         }
       },{
-        label:'运输方式',
-        prop:'tmsTransportMethod',
-        component:'by-select',
-        compConfig:{
-          attr:{
-            clearable:true,
-            data: [{
-              label:'整车',
-              value:'整车'
-            },{
-              label:'零担',
-              value:'零担'
-            },{
-              label:'短驳',
-              value:'短驳'
-            }]
-          }
-        }
-      }],
-      [{
         span:12,
         label:'出库方式',
-        prop:'wmsSendType',
+        prop:'sendType',
         component:'by-select',
         compConfig:{
           attr:{
@@ -442,7 +422,8 @@ export default class DeliveryGoodsInfo extends Vue {
             }]
           }
         }
-      },{
+      }],
+      [{
         label:'备注',
         prop:'tmsRemark',
         component:'by-input',

src/views/audit/store/index.vue

@@ -81,7 +81,7 @@
 				},
 				columns: [
 					{
-						// width: '200px',
+						width: '200px',
 						title: '标题',
 						field: 'skuTitle',
 						// isDetail: true,
@@ -93,7 +93,7 @@
 						field: 'skuSubtitle',
 					},
 					{
-						width: '140px',
+						// width: '140px',
 						title: '物料编码',
 						field: 'skuCode',
 					},
@@ -149,7 +149,7 @@
 						this.storeHouseInfo = res.data.records;
 						res.data.records.map((v : any, i : any) => {
 							moduleConfig.columns.push({
-								width: '140px',
+								width: '120px',
 								title: v.name,
 								field: 'custom' + i,
 							});

src/views/oms/order/components/orderTable.vue

@@ -81,9 +81,9 @@
     <vxe-column field="sendDate" title="发货日期" width="120"></vxe-column>
     <vxe-column field="signTime" title="预计送达时间" width="120"></vxe-column>
     <vxe-column field="endTime" title="确认收货时间" width="120"></vxe-column>
-    <vxe-column field="receiverAddress" title="收货地址" width="120"></vxe-column>
-    <vxe-column field="receiverName" title="收件人" width="120"></vxe-column>
-    <vxe-column field="receiverMobile" title="手机" width="120"></vxe-column>
+    <vxe-column field="receiverAddress" title="收货地址" show-overflow width="160"></vxe-column>
+    <vxe-column field="receiverName" title="收件人" show-overflow width="120"></vxe-column>
+    <vxe-column field="receiverMobile" title="手机" show-overflow width="120"></vxe-column>
     <vxe-column field="buyerMessage" title="买家留言" width="120"></vxe-column>
     <vxe-column field="wmsCoId" title="发货仓编号" width="120"></vxe-column>
     <vxe-column field="payDate" title="支付时间" width="140"></vxe-column>
@@ -95,8 +95,8 @@
       </template>
     </vxe-column>
     <vxe-column field="paidAmount" title="实付金额" align="right" width="120"></vxe-column>
-    <vxe-column field="shopBuyerId" title="买家昵称" width="120"></vxe-column>
-    <vxe-column field="openId" title="平台买家唯一值" width="120"></vxe-column>
+    <vxe-column field="shopBuyerId" title="买家昵称" show-overflow width="140"></vxe-column>
+    <vxe-column field="openId" title="平台买家唯一值" show-overflow width="140"></vxe-column>
     <vxe-column field="buyerPaidAmount" title="总买家实付" width="120"></vxe-column>
     <vxe-column field="sellerIncomeAmount" title="总卖家实收" width="120"></vxe-column>
     <vxe-column field="questionType" title="问题类型" width="120"></vxe-column>

src/views/settle/dbFee/index.vue

@@ -187,19 +187,19 @@ export default class DbFee extends Vue {
     amount:'10.00',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'短驳结算'
   },{
     amount:'5.50',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'短驳结算'
   },{
     amount:'205.50',
     time:'2023-08-16 12:52:30',
     code:3,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'短驳结算'
   }]
   tabChange(v:number){
@@ -223,8 +223,8 @@ export default class DbFee extends Vue {
   getList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:32000,
       commission:50,
       type:'短驳费用',
@@ -232,8 +232,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-10 10:30:26'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:60000,
       commission:420,
       type:'短驳费用',
@@ -246,8 +246,8 @@ export default class DbFee extends Vue {
   getSettledList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:50000,
       commission:100,
       type:'短驳费用',
@@ -255,8 +255,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-25 12:36:22'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:100000,
       commission:1000,
       type:'短驳费用',

src/views/settle/logistics/index.vue

@@ -187,19 +187,19 @@ export default class DbFee extends Vue {
     amount:'12.00',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'物流结算'
   },{
     amount:'15.50',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'物流结算'
   },{
     amount:'105.50',
     time:'2023-08-16 12:52:30',
     code:3,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'物流结算'
   }]
   tabChange(v:number){
@@ -223,8 +223,8 @@ export default class DbFee extends Vue {
   getList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔云仓',
       settleMoney:4100,
       commission:63,
       type:'物流费用',
@@ -232,8 +232,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-10 10:30:26'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔云仓',
       settleMoney:4500,
       commission:64,
       type:'物流费用',
@@ -246,8 +246,8 @@ export default class DbFee extends Vue {
   getSettledList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔云仓',
       settleMoney:8000,
       commission:70,
       type:'物流费用',
@@ -255,8 +255,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-25 12:36:22'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔云仓',
       settleMoney:63000,
       commission:45,
       type:'物流费用',

src/views/settle/storeFee/index.vue

@@ -187,19 +187,19 @@ export default class DbFee extends Vue {
     amount:'12.00',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'仓储结算'
   },{
     amount:'15.50',
     time:'2023-08-10 12:45:33',
     code:1,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'仓储结算'
   },{
     amount:'105.50',
     time:'2023-08-16 12:52:30',
     code:3,
-    servicer:'犇云科技',
+    servicer:'桂品堂',
     type:'仓储结算'
   }]
   tabChange(v:number){
@@ -223,8 +223,8 @@ export default class DbFee extends Vue {
   getList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:5200,
       commission:60,
       type:'仓储费用',
@@ -232,8 +232,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-10 10:30:26'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:7000,
       commission:680,
       type:'仓储费用',
@@ -246,8 +246,8 @@ export default class DbFee extends Vue {
   getSettledList(){
     let data:Array<any>=[{
       code:1,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:8000,
       commission:70,
       type:'仓储费用',
@@ -255,8 +255,8 @@ export default class DbFee extends Vue {
       createTime:'2023-08-25 12:36:22'
     },{
       code:2,
-      payCompany:'犇云科技',
-      receiveCompany: '盈和动力',
+      payCompany:'桂品堂',
+      receiveCompany: '龙翔物流',
       settleMoney:63000,
       commission:45,
       type:'仓储费用',