修复商配外协提交问题

src/views/aftersales/aftersalesWorkOrder.vue

@@ -172,8 +172,10 @@
                       <div>
                         <!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
                         <el-button
-                  
+                          v-if="
-                          v-if="(TabPermissions !== '4' && !AppealStatusT) || (AppealStatusT && UserPermissions !== '仓库客服')"
+                            (TabPermissions !== '4' && !AppealStatusT) ||
+                            (AppealStatusT && UserPermissions !== '仓库客服')
+                          "
                           @click="view(slotProps.scope)"
                           >查看</el-button
                         >
@@ -185,22 +187,33 @@
                         >
 
                         <el-button
-                          v-if="TabPermissions == '6' && !AppealStatusT && UserPermissions=='仓库客服'"
+                          v-if="
+                            TabPermissions == '6' && !AppealStatusT && UserPermissions == '仓库客服'
+                          "
                           @click="appeal(slotProps.scope, false)"
                           >申诉</el-button
                         >
 
-                        <el-button v-if="AppealStatusT && slotProps.scope.row.typesOf=='0' && UserPermissions=='仓库客服'" @click="appeal(slotProps.scope, 'edit')"
+                        <el-button
+                          v-if="
+                            AppealStatusT &&
+                            slotProps.scope.row.typesOf == '0' &&
+                            UserPermissions == '仓库客服'
+                          "
+                          @click="appeal(slotProps.scope, 'edit')"
                           >编辑</el-button
                         >
 
                         <el-button
-                          v-if="AppealStatusT && slotProps.scope.row.typesOf=='0' && UserPermissions=='仓库客服'" 
+                          v-if="
+                            AppealStatusT &&
+                            slotProps.scope.row.typesOf == '0' &&
+                            UserPermissions == '仓库客服'
+                          "
                           @click="CancelappealFn(slotProps.scope, 'edit')"
                           >取消申诉</el-button
                         >
 
-                    
                         <!-- AppealStatusT申诉列表状态 -->
                         <!-- <el-button v-if="AppealStatusT" @click="Appealeditor">编辑</el-button> -->
                         <!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
@@ -445,7 +458,11 @@
             </div>
           </el-dialog>
           <!-- 申诉弹窗 -->
-          <el-dialog v-model="dialogappeal" :title="AppealeditorState?'工单申述编辑':'工单申诉'" width="30%">
+          <el-dialog
+            v-model="dialogappeal"
+            :title="AppealeditorState ? '工单申述编辑' : '工单申诉'"
+            width="30%"
+          >
             <div class="el_appeal" v-loading="loadingappeal" element-loading-text="Loading...">
               <el-form-item label="选择实际责任方">
                 <el-select
@@ -1485,7 +1502,7 @@ const CancelappealFn = val => {
 const appeal = (val, state) => {
   AppealAttachment.value = []; //清空图片
   Appealselection.value = ''; //清空责任人
-  Reasonforappeal.value='',//清空申诉内容
+  (Reasonforappeal.value = ''), //清空申诉内容
     console.log(state);
   console.log(val.row, '申诉当前点击的按钮');
   if (state == 'edit') {
@@ -1507,12 +1524,12 @@ const appeal = (val, state) => {
         console.log(res.data.data.peopleEntityList.map(item => item.actualPersonId));
         console.log(warehouseData.value, '仓库数据');
         if (res.data.data.peopleEntityList) {
-          Appealselection.value= res.data.data.peopleEntityList.map(item => item.actualPersonId)
+          Appealselection.value = res.data.data.peopleEntityList.map(item => item.actualPersonId);
         }
         if (res.data.data.imagePath) {
           AppealAttachment.value.push({
             url: res.data.data.imagePath,
-        })   
+          });
         }
         dialogappeal.value = true; //展开申诉编辑
       }, 0);
@@ -1603,14 +1620,16 @@ const Appealbutton = state => {
     }
     console.log(data, '处理好的值');
 
-  $_appealSubmit(data).then(res => {
+    $_appealSubmit(data)
+      .then(res => {
         if (res.data.code == 200) {
           ElMessage({
             message: res.data.msg,
             type: 'success',
           });
         }
-  }).finally(res=>{
+      })
+      .finally(res => {
         dialogappeal.value = false; //关闭申诉弹窗
         loadingappeal.value = false; //关闭加载效果
         console.log(res, '功返回值');
@@ -1955,7 +1974,6 @@ const settlementclaim = val => {
 };
 // 获取申诉列表
 const appealFn = val => {
-
   details.loadingObj.list = true; //开启动画加载
   AppealStatus.value = true; //开启申诉列表状态
   TimeoutStatus.value = false; //关闭 超时状态
@@ -1975,7 +1993,10 @@ const appealFn = val => {
     console.log(res, '申诉列表返回值');
 
     if (res.data.data.records.length) {
-      details.data = res.data.data.records;
+      // details.data = res.data.data.records;
+      for (let i = 1; i < 100; i++) {
+        details.data.push({});
+      }
     } else {
       details.data = [{}];
     }
@@ -1985,7 +2006,6 @@ const appealFn = val => {
 
 // 申诉列表
 const AppealTab = val => {
-
   if (val == 0) {
     AppealStatusT.value = false; //申诉列表关闭
     Tableheaderswitching(columnList); //切换表头
@@ -1999,7 +2019,6 @@ const AppealTab = val => {
     };
     IndexTable(data);
   } else {
-   
     AppealStatusT.value = true; //申诉列表开启
     console.log(val, '切换申诉列表');
     data.workOrderStatus = '';
@@ -2043,6 +2062,30 @@ const ModifyAmountFn = () => {
     dialogModifyAmount.value = false; //关闭超时金额弹窗修改
   });
 };
+function getWinHight() {
+    var windowHight = 0;
+    if (document.body.clientHeight && document.documentElement.clientHeight) {
+      windowHight =
+        document.body.clientHeight < document.documentElement.clientHeight
+          ? document.body.clientHeight
+          : document.documentElement.clientHeight;
+    } else {
+      // windowHight=(document.body.clientHeight>document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight;
+    }
+    // return windowHight;
+    return document.documentElement.clientHeight;
+  }
+
+
+const  height =(val)=>{
+  console.log('执行了计算高度');
+  var bodyContent = document.querySelectorAll('.maboxhi');  
+  const _height = getWinHight();
+  // 设置列表的高度
+  bodyContent.forEach(val => {
+      val.style.height = _height - val.getBoundingClientRect().top - (val) + 'px';
+  });
+}
 // 查询超时记录
 const TimeoutHandling = val => {
   timeoutList[3].checkarr = []; //异常类型名称
@@ -2144,6 +2187,18 @@ const tabChenge = val => {
     Tableheaderswitching(columnList); //表头切换
     empty();
     IndexTable(data);
+
+  console.log('执行了计算高度');
+  var bodyContent = document.querySelectorAll('.maboxhi');  
+  const _height = getWinHight();
+  // 设置列表的高度
+  bodyContent.forEach(val => {
+      val.style.height = _height - val.getBoundingClientRect().top - (65+20) + 'px';
+  });
+
+
+
+
   } else if (val == 7) {
     // 超时未处理
     ProcessingPartyState.value = false; //关闭处理方
@@ -2994,6 +3049,9 @@ const CompletedSubmission = () => {
   display: flex;
   align-items: flex-end;
   margin-bottom: 10px;
+  position: fixed;
+  bottom: 0;
+  right: 6px;
 }
 .el-times {
   :deep(.el-input__wrapper) {
@@ -3287,7 +3345,4 @@ const CompletedSubmission = () => {
     width: 100%;
   }
 }
-:deep(#bodys){
-  height: auto !important; 
-}
 </style>

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -2546,10 +2546,27 @@ const merge = (val, kindS) => {
   if (kindS == 'WX') {
     // 如果是外协就不进行下面的司机合并
     console.log('当前是外协');
+
+    if(!DataSubmit.value.tripartite.distributionCompany){
+    ElMessage({
+      message: '请选择外协来源',
+      type: 'warning',
+    });
+    return;
+  }
+
+
+    if (!DataSubmit.value.taskTime) {
+    ElMessage({
+      message: '请填写配送日期',
+      type: 'warning',
+    });
+    return;
+  }  
   state.value = true; //满足提交条件
   return;
   }
-  delete DataSubmit.value.tripartite; //删掉外协字段
+
   // 判断司机配置是否选择
   if (!DriverTemporaryStorage.value.length && !VehicleTemporaryStorage.value.length) {
     ElMessage({
@@ -2590,7 +2607,7 @@ const merge = (val, kindS) => {
     return;
   }
   //   如果是提交就不弹窗
-
+  delete DataSubmit.value.tripartite; //删掉外协字段
   //   合并司机和车辆信息
   let dataInfo = []; //暂存司机配置
   dataInfo = DriverTemporaryStorage.value.map((driver, index) => ({
@@ -2723,6 +2740,7 @@ const SubmitCommercial = async () => {
     editLoading.value = false; //关闭提交加载
 
     if (code !== 200) return;
+    state.value = false; //重置满足条件
     ElMessage.success('操作成功');
 
     ElMessageBox.alert('操作成功', '', {