优化订单

src/views/audit/outbound/index.vue

@@ -1160,6 +1160,9 @@
 							}
 						};
 						billConfig.tool.tools = { return: true, save: true, smt: true };
+						if(parentData.submitState === 0){
+							billConfig.form.attr.readonly = false;
+						}
 						// 查销售订单数据
 						if(e.purchaseOrderId){
 							api.single({ id: e.purchaseOrderId }, 'supplyPurchaseOrder').then((val : any) => {

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

@@ -208,7 +208,7 @@ export default class BatchbyOneModal extends Vue {
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
   }
   btn(){
-    this.noSentOrder();
+    this.noSentOrder(true);
     if(!this.data[this.currentOrder]){
       this.$message('没有需要发货的订单！')
       return
@@ -272,7 +272,7 @@ export default class BatchbyOneModal extends Vue {
     // }
     const _value = this.data[this.currentOrder];
     if(!_value.tmsBusinessMan || !_value.tmsBusinessPhone || !_value.tmsShipmentConsignor || !_value.tmsShipmentContacts || !_value.tmsUnloadingConsignor || !_value.tmsUnloadingContacts || !_value.tmsUnloadingProvince || !_value.tmsUnloadingAddress || !_value.storeHouseId){
-      this.$message("请编辑订单信息");
+      this.$message("订单信息不完整，请编辑信息！");
       return
     }
     // if(!this.currentPrice[_value.omsOrderIds]){
@@ -396,6 +396,7 @@ export default class BatchbyOneModal extends Vue {
       }
       this.$forceUpdate();
     }
+    //发货
     addmultiple(params).then((res:any) => {
       this.load = false;
       if(res.code == 200){
@@ -404,6 +405,10 @@ export default class BatchbyOneModal extends Vue {
           message:'订单:'+item.omsOrderIds+'发货成功！',
           type:'success'
         })
+        let fLen = this.failOrder.indexOf(this.currentOrder);
+        if(fLen >= 0){
+          this.failOrder.splice(fLen,1);
+        }
         resHandle('success')
       }
     }).catch((err:any) => {
@@ -415,7 +420,7 @@ export default class BatchbyOneModal extends Vue {
     })
   }
   //寻找未发货订单
-  noSentOrder(){
+  noSentOrder(isCkick?:boolean){
     this.currentOrder = this.data.length;
     for(let i = 0; i < this.data.length; i++){
       if(!this.data[i].state){
@@ -423,6 +428,9 @@ export default class BatchbyOneModal extends Vue {
         break
       }
     }
+    if(isCkick && this.currentOrder == this.data.length && this.failOrder.length > 0){
+      this.currentOrder = this.failOrder[0];
+    }
     // if(this.data[this.currentOrder]){
       this.setInfo();
     // } 

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

@@ -193,7 +193,7 @@ export default class CarpoolModal extends Vue {
     //   return
     // }
     if(!this.value.tmsBusinessMan || !this.value.tmsBusinessPhone || !this.value.tmsShipmentConsignor || !this.value.tmsShipmentContacts || !this.value.tmsUnloadingConsignor || !this.value.tmsUnloadingContacts || !this.value.tmsUnloadingProvince || !this.value.tmsUnloadingAddress || !this.value.storeHouseId){
-      this.$message("请编辑订单信息");
+      this.$message("订单信息不完整，请编辑信息！");
       return
     }
     let params:any=(this as any).$lodash.cloneDeep(this.value);

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

@@ -50,7 +50,7 @@
     <div class="split"></div>
     <el-button type="text" @click="handle('autoMerge')">自动合并<i class="el-icon-info" title="自动合并条件：已付款，已提交，同一个买家/分销商，同一个发货地址，未合并，未拆分"></i></el-button>
     <el-button type="text" @click="handle('autoSplit')">自动拆分<i class="el-icon-info" title="自动拆分条件：已付款，已提交，未合并"></i></el-button>
-    <el-button type="text" @click="handle('batchSendGoods')">发货</el-button>
+    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已提交，待付款，已付款待审核"></i></el-button>
   </div>
 </template>
 

src/views/oms/B2BOrder/index.vue

@@ -1285,7 +1285,7 @@ export default class Order extends Vue {
     box-sizing: border-box;
     padding-left: 8px;
     height: 100%;
-    min-width: 850px;
+    min-width: 900px;
     overflow-x: auto;
     .tool{
       width: 100%;

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

@@ -49,7 +49,7 @@
     <el-button type="text" @click="handle('producePurchase')" title="选取已提交数据">生成采购单</el-button>
     <el-button type="text" @click="handle('orderFile')">订单归档</el-button>
     <div class="split"></div>
-    <el-button type="text" @click="handle('batchSendGoods')">发货</el-button>
+    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已提交，待付款，已付款待审核"></i></el-button>
   </div>
 </template>