xiugai

src/views/order/components/billOfLading.vue

@@ -162,7 +162,7 @@ export default {
     orderTagType(val){
       switch(val){
         case 'SUBMITED': return '订单提交'
-        case 'ORDER_LOCKED': return '下单中'
+        case 'ORDER_LOCKED': return '订单锁定'
         case 'ORDER_SUCCESS': return '下单成功'
         case 'DELIVERING': return '提货中'
         case 'COMPLETE': return '提货单完成'
@@ -262,7 +262,7 @@ export default {
         case 'COMPLETE': return {orderLabel:'订单完成',label:'提货完成',info:'提货完成',type:'success',type1:'info',orderType:'success'}
         case 'CANCELED': return {orderLabel:'订单取消',label:'订单取消',info:'订单取消',type:'info',type1:'dark',orderType:'info'}
       }
-      return {label:val?val:'暂无数据',type:'info'}
+      return {label:val?val:'暂无数据',info:val?val:'暂无数据',type:'info'}
     },
     //创建修改提货单弹窗
     billAdd(e,index){
@@ -337,15 +337,19 @@ export default {
     submit() {
       this.quantity = 0
       this.billData.list.forEach(element => {
-        this.quantity += element.accDeliveryQuantity
+        if(element.accDeliveryQuantity){
+          this.quantity += element.accDeliveryQuantity
+        }else{
+          this.$message.error('提货单异常')
+          throw new Error()
+        }
       });
       this.$confirm('确定下单?', '提示', { type: 'success' }).then(() => {
         let data={
           id:this.controlWindows.addInfo.id,
           actQuantity:this.quantity,
-          customerId:this.controlWindows.addInfo.customerId
         }
-        order.orderSuccess(data).then((res) => {
+        order.orderComplete(data).then((res) => {
             if (res.code === 20000) {
               this.$message.success(res.msg);
               this.closeWindow();