Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/api/delivery.ts

@@ -63,4 +63,12 @@ export function queryOrderByOrderId(data?:any){
 		method: 'GET',
 		params: data
 	})
+}
+//取消订单
+export function cancleSendOrder(data?:any){
+	return request({
+		url: '/omsOrder/omsShippingOrder/cancleSendOrder',
+		method: 'POST',
+		data: data
+	})
 }

src/benyun/components/byBill/byBill.vue

@@ -65,7 +65,7 @@
 				</div>
 				<el-drawer v-if="billConfig && billConfig.log" class="log-drawer" :size="600" append-to-body title="操作日志"
 					:visible.sync="drawer" direction="rtl">
-					<byLog :propConfig="billConfig && billConfig.log" :parentValue="billValue" ref="log" />
+					<byLog :propConfig="billConfig && billConfig.log" :parentValue="billValue" ref="log"  />
 				</el-drawer>
 			</div>
 			<!-- 已提交 -->
@@ -258,7 +258,9 @@
 					this.billValue = (this.$refs.billForm as any).getValue();
 					this.drawer = true;
 				}
+				this.$forceUpdate();
 				if (this.$refs.log) {
+					(this.$refs.log as any).setBillValue(this.billValue);
 					(this.$refs.log as any).request();
 				}
 			})

src/components/byLog/byLog.vue

@@ -29,6 +29,7 @@ export default class ByLog extends VueViews {
   config:any={}
   data:Array<any>=[];
   load=false;
+  formValue:any;
   page = {
     pageNo: 1, //当前页
     pageSize: 20, //每页条数
@@ -42,6 +43,9 @@ export default class ByLog extends VueViews {
 
   mounted(){
     this.request();
+    if(this.parentValue){
+      this.setBillValue(this.parentValue);
+    }
   }
   resertPage(){
     this.page={
@@ -50,6 +54,9 @@ export default class ByLog extends VueViews {
       total: 0 //总条数
     }
   }
+  setBillValue(v:any){
+    this.formValue = v;
+  }
   handleCurrentChange(v:number){
     this.page.pageNo = v;
     this.request();
@@ -58,12 +65,12 @@ export default class ByLog extends VueViews {
     if(!this.requestConfig || !this.requestConfig.url){
       return
     }
-    if(!this.parentValue || !this.parentValue.orderNumber){
+    if(!this.formValue || !this.formValue.orderNumber){
       return
     }
     let parame = (this as any).$lodash.cloneDeep(this.requestConfig);
     parame.params={
-      docId:this.parentValue.orderNumber,
+      docId:this.formValue.orderNumber,
       pageNo:this.page.pageNo,
       pageSize:this.page.pageSize
     }

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

@@ -451,6 +451,7 @@ export default class BatchbyOneModal extends Vue {
 .deli-footer{
   height: 80px;
   width: 100%;
+  box-shadow: 0 -5px 10px #EEE;
   padding: 0 16px 8px;
   box-sizing: border-box;
   display: flex;

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

@@ -293,6 +293,7 @@ export default class carpoolModal extends Vue {
   width: 100%;
   padding: 0 16px;
   box-sizing: border-box;
+  box-shadow: 0 -5px 10px #EEE;
   display: flex;
   justify-content: space-between;
   align-items: center;

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

@@ -2,6 +2,7 @@
   <el-drawer
     append-to-body
     title="订单发货"
+    v-loading="load"
     :visible.sync="drawer"
     @close="close"
     :direction="direction"
@@ -69,6 +70,10 @@
           <div class="s-col">WMS取消订单的备注：{{ value.wmsRemark }}</div>
         </div>
       </div>
+      <div class="space"></div>
+      <div class="deli-footer">
+        <div class="send-btn" @click="cancelDelivery">取消发货</div>
+      </div>
     </div>
   </el-drawer>
 </template>
@@ -76,8 +81,7 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
 import DeliveryGoodsInfo from "./deliveryGoodsInfo.vue";
-import { queryOrderByOrderId } from  '@/api/delivery'
-import { iteratee } from "lodash";
+import { queryOrderByOrderId,cancleSendOrder } from  '@/api/delivery'
 @Component({components:{DeliveryGoodsInfo}})
 export default class DeliveryDetail extends Vue {
   drawer=false;
@@ -154,6 +158,35 @@ export default class DeliveryDetail extends Vue {
       this.load = false;
     })
   }
+  cancelDelivery(){
+    let msg = '';
+    if(this.value.shippingType == 'ONE'){
+      msg='此操作将导致整车订单的发货被取消，是否继续？'
+    }
+    if(this.value.shippingType == 'MORE'){
+      msg = '此操作将导致该订单的发货被取消，是否继续？'
+    }
+    if(msg){
+      this.$confirm(msg, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.load = true;
+        cancleSendOrder({orderNos:[this.value.tmsOrderNo]}).then((res:any) => {
+          this.load =false;
+          this.$message({
+            message:'该订单的发货已被取消！',
+            type:'success'
+          })
+          this.$emit('handleSuccess');
+          this.drawer = false;
+        }).catch(() => {
+          this.load = false;
+        })
+      }).catch(() => {});
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -250,5 +283,36 @@ export default class DeliveryDetail extends Vue {
     }
   }
 }
-
+.deli-footer{
+  height: 60px;
+  box-shadow: 0 -5px 10px #EEE;
+  width: 100%;
+  padding: 0 16px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  position: absolute;
+  background-color: #FFF;
+  left: 0;
+  bottom: 0;
+  z-index: 10;
+  .send-btn{
+    width: 120px;
+    height: 40px;
+    line-height: 40px;
+    border-radius: 8px;
+    background: linear-gradient(129.2deg, rgba(22,132,252,1) 9.81%,rgba(93,167,249,1) 97.4%);
+    color: rgba(255, 255, 255, 100);
+    font-size: 14px;
+    text-align: center;
+    box-shadow: 0px 2px 6px 0px rgba(93, 167, 249, 100);
+    cursor: pointer;
+  }
+}
+.space{
+  height: 60px;
+  width: 100%;
+  margin-top: 16px;
+}
 </style>