优化

src/views/oms/B2BOrder/components/addOrder.vue

@@ -629,7 +629,7 @@ export default class AddOrder extends Vue {
         audit:'',
         event:{
           show:(row:any) => {
-            if(row.status == 'Merged' || row.status == 'Cancelled' || this.orderValue.upSourceName !== 'DS_JUSHUITAN'){
+            if(row.status == 'Merged' || row.status == 'Cancelled' || this.orderValue.upSourceName === 'DS_JUSHUITAN'){
               return false
             }else{
               return true
@@ -1159,9 +1159,9 @@ export default class AddOrder extends Vue {
   }
   //添加商品
   toolAddProduct(){
-    if(this.orderValue.upSourceName !== 'DS_JUSHUITAN'){
+    if(this.orderValue.upSourceName === 'DS_JUSHUITAN'){
       this.$message({
-        message:'点三不能进行修改！',
+        message:'点三订单不能进行修改！',
         type:'warning'
       })
       return
@@ -1184,9 +1184,9 @@ export default class AddOrder extends Vue {
   }
   //添加赠品
   toolAddGift(){
-    if(this.orderValue.upSourceName !== 'DS_JUSHUITAN'){
+    if(this.orderValue.upSourceName === 'DS_JUSHUITAN'){
       this.$message({
-        message:'点三不能进行修改！',
+        message:'点三订单不能进行修改！',
         type:'warning'
       })
       return
@@ -1226,7 +1226,7 @@ export default class AddOrder extends Vue {
   }
   //商品编辑
   editProduct(){
-    if(this.orderValue.upSourceName !== 'DS_JUSHUITAN'){
+    if(this.orderValue.upSourceName === 'DS_JUSHUITAN'){
       this.$message({
         message:'点三订单不能进行修改！',
         type:'warning'

src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -122,6 +122,7 @@ export default class DeliveryDetail extends Vue {
   priceData:Array<any>=[];
   value:any={};
   wmsState='';
+  operationFlag:string=''
   setShow(v:boolean){
     this.drawer=v;
   }
@@ -186,6 +187,13 @@ export default class DeliveryDetail extends Vue {
     return n;
   }
   cancelB2CDelivery() {
+    if(this.operationFlag === 'DS_JUSHUITAN'){
+      this.$message({
+        message:'点三订单禁止取消发货！',
+        type:'warning'
+      })
+      return
+    }
     this.$confirm('此操作将导致该订单的发货被取消，是否继续？', '提示', {
       confirmButtonText: '继续',
       cancelButtonText: '取消',
@@ -206,13 +214,14 @@ export default class DeliveryDetail extends Vue {
     }).catch(() => {});
   }
   setData(v:any){
-    if(!v) {
+    if(!v || !v.id) {
       this.$message('缺少订单id');
       return
     }
+    this.operationFlag = v.upSourceName
     this.load = true;
     queryOrderByOrderId({
-      omsOrderId:v
+      omsOrderId:v.id
     }).then((res:any) => {
       this.load = false;
       if(res.data) {
@@ -273,6 +282,13 @@ export default class DeliveryDetail extends Vue {
   }
   cancelDelivery(){
     let msg = '';
+    if(this.operationFlag === 'DS_JUSHUITAN'){
+      this.$message({
+        message:'点三订单禁止取消发货！',
+        type:'warning'
+      })
+      return
+    }
     if(this.value.shippingType == 'MORE'){
       msg = '此操作将导致整车订单的发货被取消，是否继续？'
     }

src/views/oms/B2BOrder/index.vue

@@ -592,7 +592,7 @@ export default class Order extends Vue {
   sendGoodsDetail(row:any){
     if(this.$refs.deliveryDetail){
       (this.$refs.deliveryDetail as any).setShow(true);
-      (this.$refs.deliveryDetail as any).setData(row.id);
+      (this.$refs.deliveryDetail as any).setData(row);
     }
   }
   //批量发货

src/views/oms/B2COrder/components/deliveryDetail.vue

@@ -111,6 +111,7 @@ export default class DeliveryDetail extends Vue {
   priceData:Array<any>=[];
   value:any={};
   wmsState='';
+  operationFlag:string=''
   setShow(v:boolean){
     this.drawer=v;
   }
@@ -141,13 +142,14 @@ export default class DeliveryDetail extends Vue {
     return n;
   }
   setData(v:any){
-    if(!v) {
+    if(!v || !v.id) {
       this.$message('缺少订单id');
       return
     }
+    this.operationFlag = v.upSourceName
     this.load = true;
     queryOrderByOrderId({
-      omsOrderId:v
+      omsOrderId:v.id
     }).then((res:any) => {
       this.load = false;
       if(res.data) {
@@ -206,6 +208,13 @@ export default class DeliveryDetail extends Vue {
     }).catch(() => {})
   }
   cancelB2CDelivery() {
+    if(this.operationFlag === 'DS_JUSHUITAN'){
+      this.$message({
+        message:'点三订单禁止取消发货！',
+        type:'warning'
+      })
+      return
+    }
     this.$confirm('此操作将导致该订单的发货被取消，是否继续？', '提示', {
       confirmButtonText: '继续',
       cancelButtonText: '取消',
@@ -227,6 +236,13 @@ export default class DeliveryDetail extends Vue {
   }
   cancelDelivery(){
     let msg = '';
+    if(this.operationFlag === 'DS_JUSHUITAN'){
+      this.$message({
+        message:'点三订单禁止取消发货！',
+        type:'warning'
+      })
+      return
+    }
     if(this.value.shippingType == 'MORE'){
       msg = '此操作将导致整车订单的发货被取消，是否继续？'
     }

src/views/oms/B2COrder/index.vue

@@ -541,7 +541,7 @@ export default class Order extends Vue {
   sendGoodsDetail(row:any){
     if(this.$refs.deliveryDetail){
       (this.$refs.deliveryDetail as any).setShow(true);
-      (this.$refs.deliveryDetail as any).setData(row.id);
+      (this.$refs.deliveryDetail as any).setData(row);
     }
   }
   //批量发货

src/views/oms/cancelGoods/index.vue

@@ -73,11 +73,13 @@ export default class CancelGoods extends Vue {
         title:'入库类型',
         field:'sendType',
         width:120
-      },{
-        title:'入库确认回调地址',
-        field:'callbackUrl',
-        width:150
-      },{
+      },
+      // {
+      //   title:'入库确认回调地址',
+      //   field:'callbackUrl',
+      //   width:150
+      // },
+      {
         title:'物流编码',
         field:'logisticsCode',
         width:120

src/views/oms/jushuitanOrder/compoments/jstproductModal.vue

@@ -145,22 +145,32 @@ export default class JstproductModal extends Vue {
   //确认发货
   confirmHandle(){
     let data:Array<any>=[];
+    let packages:Array<any>=[];
     for(const item of this.tableData){
       data.push({
-        barCode:item.itemCode
+        barCode:item.itemCode,
+        quantity:item.planQty
       })
+      packages.push({
+        expressCode:this.val,
+      })
+    }
+    for(const _item of packages){
+      _item.items = data
     }
     if(data.length === 0){
       this.$message('条件不符合！')
       return
     }
     this.load=true;
+    
     deliveryOrderConfirm({
       saleOrderCode:this.orderValue.deliveryOrderCode,
       logisticsCode:this.orderValue.logisticsCode,
       logisticsName:this.orderValue.logisticsName,
       expressCode:this.val,
-      item:data
+      packages:packages,
+      items:data
     }).then(()=>{
       this.load=false;
       this.expressCodeValue = false;
@@ -178,6 +188,7 @@ export default class JstproductModal extends Vue {
     for(const item of this.tableData){
       data.push({
         barCode:item.itemCode,
+        planQuantity:item.planQty,
         quantity:item.planQty
       })
     }
@@ -188,7 +199,8 @@ export default class JstproductModal extends Vue {
     this.load=true
     purchaseInOrderConfirm({
       syncId:this.orderValue.entryOrderCode,
-      item:data
+      wareHouseCode:this.orderValue.warehouseCode,
+      items:data
     }).then(()=>{
       this.load=false;
       this.$message({
@@ -202,11 +214,19 @@ export default class JstproductModal extends Vue {
   //出库确认
   confirmOutStore(){
     let data:Array<any>=[];
-      for(const item of this.tableData){
+    let packBoxs:Array<any>=[]
+    for(const item of this.tableData){
       data.push({
         barCode:item.itemCode,
+        planQuantity:item.planQty,
         quantity:item.planQty
       })
+      packBoxs.push({
+        expressCode:this.val
+      })
+    }
+    for(const _item of packBoxs){
+      _item.items = data
     }
     if(data.length === 0){
       this.$message('条件不符合！')
@@ -215,8 +235,10 @@ export default class JstproductModal extends Vue {
     this.load=true
     purchaseOutConfirm({
       syncId:this.orderValue.deliveryOrderId,
+      wareHouseCode:this.orderValue.warehouseCode,
       expressCode:this.val,
-      item:data
+      items:data,
+      packBoxs:packBoxs
     }).then(()=>{
       this.load=false;
       this.expressCodeValue = false;