客户包件新增批量签收，取消

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -298,7 +298,7 @@
       <el-form-item> </el-form-item>
 
       <el-form-item> </el-form-item>
-    </el-form>
+   
 
     <el-tabs type="border-card">
       <el-tab-pane label="内部责任划分">
@@ -307,10 +307,10 @@
           <div class="el_btbox" v-for="(item, index) in FangAddList" :key="index">
             <div class="leftbox">
               <div class="maxBox">
-                <span class="title">责任方:</span>
+                <!-- <span class="title"></span> -->
 
                 <!-- 提货环节  -->
-
+                <el-form-item label="责任方" prop="businessName">
                 <el-select
                   v-model="item.businessName"
                   clearable
@@ -339,10 +339,12 @@
                     :value="item.value"
                   />
                 </el-select>
+              </el-form-item>
               </div>
 
               <div class="maxBox">
-                <span class="title">责任人：</span>
+                <el-form-item label="责任人" prop="personResponsibleName"> 
+              
                 <el-select
                   v-if="groundlineType != 1"
                   v-model="item.personResponsibleName"
@@ -358,10 +360,12 @@
                   />
                 </el-select>
        
+        
                 <el-input v-else v-model="item.personResponsibleName" placeholder="请输入责任人" />
+              </el-form-item>
               </div>
               <div class="maxBox el_zb">
-                <span class="title">占比:</span>
+                <el-form-item label="占比" class="title"> 
                 <el-input-number
                   :controls="false"
                   v-model="item.responsibilityRatio"
@@ -372,20 +376,23 @@
                   @input="CompanyProportionInput"
                 />
                 <span>%</span>
+              </el-form-item>
               </div>
               <div class="maxBox">
-                <span class="title">三方责任人:</span>
+                <el-form-item label="三方责任人" > 
                 <el-input v-model="item.tripartite" placeholder="请输入三方责任人" />
+              </el-form-item>
               </div>
 
               <div class="maxBox">
-                <span class="title">说明:</span>
+                <el-form-item label="说明"> 
                 <el-input
                   v-model="item.description"
                   placeholder="请输入说明 "
                   clearable
                   :rows="2"
                 />
+              </el-form-item>
               </div>
             </div>
             <div class="el-btn">
@@ -398,7 +405,7 @@
         </div>
       </el-tab-pane>
     </el-tabs>
-
+  </el-form>
     <el-tabs type="border-card" class="el_Processingresults">
       <el-tab-pane label="处理结果">
         <div class="selector">
@@ -1008,6 +1015,8 @@ const rules = reactive({
   orderCode: [{ required: true, message: '请填写订单自编号', trigger: 'change' }],
   waybillNumber: [{ required: true, message: '请填写运单号', trigger: 'change' }],
   brandName: [{ required: true, message: '请填写品牌', trigger: 'change' }],
+  businessName: [{ required: true, message: '请选择责任方', trigger: 'change' }],
+  personResponsibleName: [{ required: true, message: '请填写责任人', trigger: 'change' }],
   
 });
 //表单提交
@@ -1484,7 +1493,6 @@ const ViewPackageDetails = val => {
   flex-wrap: wrap;
   justify-content: flex-start;
   border: 1px solid #ccc;
-  border-bottom: none;
   .el-form-item {
     height: 46px;
     display: flex;
@@ -1616,17 +1624,22 @@ const ViewPackageDetails = val => {
   display: flex;
   flex-direction: column;
   .leftbox {
-    width: 80%;
     display: flex;
     justify-content: space-between;
     .el_zb {
       width: 140px;
       margin-right: 50px;
       text-align: right;
+      :deep(.el-form-item__label){
+        width: auto !important;
+      }
       :deep(.el-input) {
         margin-left: 10px;
         text-align: right;
       }
+      :deep(.el-form-item__content){
+        flex-wrap: nowrap;
+      }
     }
   }
   .maxBox {
@@ -1634,6 +1647,7 @@ const ViewPackageDetails = val => {
     align-items: center;
     width: 30%;
     margin-right: 16px;
+    font-size: 14px;
     .title {
       width: 120px;
       font-size: 14px;
@@ -1666,9 +1680,12 @@ const ViewPackageDetails = val => {
     align-items: center;
     width: 30%;
     margin-right: 20px;
+ 
     :deep(.el-form-item){
       margin: 0;
       margin-right: 10px;
+      
+      font-size: 12px;
       .el-form-item__label{
         margin: 0;
         width: auto !important;

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -465,6 +465,8 @@
           </el-table-column>
         </el-table> -->
         <!-- 客户包件 -->
+        <el-button @click="Batchsigning" style="margin-bottom: 4px;" type="primary">批量签收</el-button>
+        <el-button @click="Batchcancellation" style="margin-bottom: 4px;" type="primary">批量计划取消</el-button>
         <tablecmt
           :columnList="wrapoption.column"
           :tableData="wrapdata"
@@ -3351,7 +3353,7 @@ export default {
         deliveryId:this.deliveryId,
         reservationId:this.wid,
         type:1,
-        packageId:row.id
+        packageIds:row.id
       }
       cancelReservationPackage(data).then(res=>{
         if (res.data.code === 200){
@@ -3367,7 +3369,7 @@ export default {
       let data = {
         deliveryId:this.deliveryId,
         reservationId:this.wid,
-        barcode:row.orderPackageCode
+        barcodes:row.orderPackageCode
       }
       //包件签收
       deliverySign(data).then(res=>{
@@ -3379,6 +3381,54 @@ export default {
       })
       // this.$message.warning('功能维护中...');
       // return;
+    },
+        // 批量签收
+    Batchsigning(){
+      console.log(this.selectionList,'this.selectionList');
+   
+      let data = {
+        deliveryId:this.deliveryId,
+        reservationId:this.wid,
+        barcodes:this.selectionList.map(item=>item.orderPackageCode).join(',')
+      }
+      this.loading=true,
+      deliverySign(data).then(res=>{
+        console.log('res>>>>>>>>>>>>>>>>>>>>>>>',res);
+        if (res.data.code === 200){
+          this.$message.success(res.data.msg);
+          this.getWrapdetails(this.page);
+          
+        }
+        this.selectionList=[];//清空选择
+        this.loading=false;
+      }).catch(res=>{
+        this.selectionList=[];//清空选择
+        this.loading=false;
+       
+      })
+    },
+    // 批量计划取消
+    Batchcancellation(){
+      let data = {
+        deliveryId:this.deliveryId,
+        reservationId:this.wid,
+        type:1,
+        packageIds:this.selectionList.map(item=>item.id).join(',')
+      }
+      this.loading=true;
+      cancelReservationPackage(data).then(res=>{
+        if (res.data.code === 200){
+          this.$message.success(res.data.msg);
+          this.getWrapdetails(this.page);
+        }
+        this.selectionList=[];//清空选择
+        this.loading=false;
+      
+      }).catch(res=>{
+        this.selectionList=[];//清空选择
+        this.loading=false;
+     
+      })
     },
     /**
      * 打印
@@ -3643,6 +3693,8 @@ export default {
         this.data = data.records;
         this.ordpage.total = data.total;
         }
+      }).catch(res=>{
+        this.listloading=false
       });
     },
     //订单列表
@@ -3709,6 +3761,7 @@ export default {
       });
     },
     async handleView(row) {
+      this.loading=true;//开启加载
       console.log('查看>>>>>>>>>>', row);
       this.title = '客户包件';
       this.view = true;
@@ -3716,6 +3769,7 @@ export default {
       this.wid = row.id;
       this.getWrapdetails(this.wpage);
       await this.$nextTick();
+    
       setNodeHeight(this.$refs.wtableBox.$el, '600px');
     },
     /** 是否全屏 */
@@ -3905,6 +3959,9 @@ export default {
         const data = res.data.data;
         this.wrapdata = data.records;
         this.wpage.total = data.total;
+        this.loading=false;//关闭加载
+      }).catch(res=>{
+        this.loading=false;//关闭加载
       });
     },