Merge branch 'pre-production'

src/option/aftersales/vueTvemp.js

@@ -2028,17 +2028,6 @@ export const columnList2 = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'a',
-    label: '总部处理客服',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
   {
     prop: 'a',
     label: '内部责任方',

src/views/aftersales/aftersalesWorkOrder.vue

@@ -330,7 +330,7 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="BatchReturn.BatchReturn.dialogReturn = false">取消</el-button>
+          <el-button @click="BatchReturn.dialogReturn = false">取消</el-button>
           <el-button type="primary" @click="ConfirmReturn()" :disabled="BatchReturn.repulseloading">
             提交
           </el-button>
@@ -942,7 +942,7 @@ const ButtonPermissions = computed(() => {
     case 2: //处理完毕
       return {
         add: false, //新增按钮
-        batchReject: UserPermissions.value == Useridentity.Headquarters_customer_service, //批量打回
+        batchReject: UserPermissions.value == Useridentity.Headquarters_customer_service || UserPermissions.value == Useridentity.Headquarters_Manager, //批量打回
         assignment:
           UserPermissions.value == Useridentity.Headquarters_Manager ||
           UserPermissions.value == Useridentity.Headquarters_customer_service, //工单指派
@@ -2528,6 +2528,8 @@ const BatchReturnResults = () => {
     });
     return;
   }
+  BatchReturn.value.BatchFrom.txt = ''
+  BatchReturn.value.BatchFrom.businessDepartment = []
   BatchReturn.value.dialogReturn = true; //展开弹窗
 };
 const ConfirmReturn = async () => {
@@ -2836,6 +2838,10 @@ const getCurrentTime = () => {
 };
 // 导出表格
 const exportReport = () => {
+  if(!details.query.startCreateTime || !details.query.endCreateTime){
+    ElMessage.warning('请搜索创建日期');
+    return
+  }
   ElMessageBox.confirm('是否确认导出数据?', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -2990,7 +2996,7 @@ const JExportAll = async dataID => {
   }
 }
 :deep(.plAllret) {
-  height: 30%;
+  height: 40%;
   display: flex;
   flex-direction: column;
   .el-select {

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -512,7 +512,7 @@
                       v-model="item.description"
                       placeholder="请输入说明"
                       type="textarea"
-                      :autosize="{ minRows: 1, maxRows: 4 }"
+                      :autosize="{ minRows: 1, maxRows: 1 }"
                       clearable
                     />
                   </el-form-item>
@@ -1918,11 +1918,19 @@ const TabactiveClick = (a, b) => {
   }
 }
 .responsibilities {
+  width: 100%;
+  :deep(.el-tabs__content) {
+    width: 100%;
+  }
+
   :deep(.el-upload-dragger) {
     display: flex;
     align-items: center;
     justify-content: center;
   }
+  :deep(.el-tab-pane) {
+    width: 100%;
+  }
   // .el-dialog{
   //   height: 40% !important;
   //   img{
@@ -1930,6 +1938,7 @@ const TabactiveClick = (a, b) => {
   //   }
   // }
   .el_responsibilities {
+    width: 100%;
     display: flex;
     flex-wrap: wrap;
     align-items: center;

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -259,7 +259,7 @@
             </el-tab-pane>
           </el-tabs>
 
-          <el-tabs type="border-card" class="el_nint" v-if="FangAddList.length">
+          <el-tabs type="border-card" class="el_nint"     v-if="Indexform.discoveryNode != 3">
             <el-tab-pane>
               <template #label>
                 <span class="custom-tabs-label">
@@ -598,7 +598,7 @@
         >
         <el-button
           type="primary"
-          v-if="PermissionButton.information_editing"
+          v-if="PermissionButton.information_editing && Indexform.discoveryNode != 3"
           @click="EditInformation"
           >修改内部责任划分</el-button
         >

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -44,7 +44,7 @@
             </el-form-item>
           </div>
           <el-tabs type="border-card" class="PackageInformation">
-            <el-tab-pane label="包件信息">
+            <el-tab-pane :label="`包件信息-总件数${PackageInfo.length}`">
               <div class="ResponsibilityBoxS">
                 <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
                   <div class="leftbox">
@@ -79,9 +79,9 @@
                     </el-form-item>
                   </div>
                 </div>
-                <div class="NumTotal">
+                <!-- <div class="NumTotal">
                   <span>总件数:{{ PackageInfo.length }}</span>
-                </div>
+                </div> -->
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -172,21 +172,23 @@
                       disabled
                     />
                   </el-form-item>
-
+                
                   <!-- 干线卸车  -->
                   <el-form-item
                     label="责任方"
                     class="processor_box"
-                    style="width: 42%"
                     v-if="displaySettings.processorEntityList"
                   >
                     <el-select
+               
                       v-model="endFrom.processorEntityList"
                       placeholder="请选择责任方"
                       disabled
                       multiple
                       filterable
                       clearable
+                      collapse-tags-tooltip  
+                      collapse-tags
                     >
                       <el-option
                         v-for="item in warehouseData"
@@ -201,7 +203,6 @@
                     class="processor_box"
                     label="处理方"
                     v-if="displaySettings.processor"
-                    style="width: 42%"
                   >
                     <el-select
                       v-model="endFrom.processor"
@@ -211,6 +212,8 @@
                       default-first-option
                       :reserve-keyword="false"
                       disabled
+                      collapse-tags-tooltip  
+                      collapse-tags
                     >
                       <el-option
                         v-for="item in warehouseData"
@@ -220,10 +223,11 @@
                       />
                     </el-select>
                   </el-form-item>
-
+           
                   <el-form-item
                     style="min-width: 100%"
                     label="调查经过"
+                    class="inpuit_Investigationprocess"
                     v-if="displaySettings.investigationProcess"
                   >
                     <el-input v-model="endFrom.investigationProcess" disabled />
@@ -233,7 +237,7 @@
             </el-tab-pane>
           </el-tabs>
 
-          <el-tabs type="border-card" class="Responsible_box" v-if="FangAddList.length">
+          <el-tabs type="border-card" class="Responsible_box" v-if="endFrom.discoveryNode !='3'">
             <el-tab-pane label="内部责任划分">
               <div class="ResponsibilityBox">
                 <div></div>
@@ -296,7 +300,7 @@
                       <span class="title">金额（元）</span>
                       <el-input
                         v-model="item.responsibilityRatio"
-                        placeholder="请输入占比 "
+                        placeholder="请输入金额 "
                         clearable
                         :rows="2"
                         disabled
@@ -330,7 +334,7 @@
             <div class="selector">
               <div class="el-form-item selector">
                 <el-tabs type="border-card" style="width: 100%">
-                  <el-tab-pane label="处理结果">
+                  <el-tab-pane :label="`处理结果-总金额${TotalClaimAmount || 0}`">
                     <el-select
                       v-model="endFrom.result"
                       multiple
@@ -420,9 +424,9 @@
                           type="textarea"
                         />
                       </el-form-item>
-                      <div class="el_tool">
+                      <!-- <div class="el_tool">
                         <span>总金额:{{ TotalClaimAmount }}元</span>
-                      </div>
+                      </div> -->
                     </div>
                   </el-tab-pane>
                 </el-tabs>
@@ -722,6 +726,9 @@
                       multiple
                       filterable
                       default-first-option
+                      collapse-tags-tooltip  
+                      collapse-tags
+                      :max-collapse-tags="3"
                       :reserve-keyword="false"
                       placeholder="请选择处理方"
                       @change="Msgresponsibility"
@@ -3050,7 +3057,6 @@ const AppealEstablished = () => {
   height: 300px !important;
 }
 .Improveinformation {
-  margin-top: 32px;
   width: 100%;
 
   :deep(.custom-tabs-label) {
@@ -3072,6 +3078,9 @@ const AppealEstablished = () => {
     display: flex;
     justify-content: flex-start;
   }
+  :deep(.el-tabs__content){
+    padding: 0 10px;
+  }
 }
 .payanindemnity {
   display: flex;
@@ -3437,16 +3446,23 @@ const AppealEstablished = () => {
   display: flex;
   justify-content: flex-end;
 }
-.PackageInformation {
+:deep(.PackageInformation) {
   width: 100%;
-  margin-bottom: 10px;
+  margin-bottom: 4px;
+  .is-active{
+    font-weight: bold;
+  }
+  .el-tabs__content{
+    padding: 0 12px;
+  }
 }
 .ResponsibilityBoxS {
   width: 100%;
   display: flex;
   flex-direction: column;
-  margin-bottom: 10px;
+  margin-bottom:2px;
   justify-content: flex-start;
+  
   .leftbox {
     width: 100%;
     display: flex;
@@ -3480,7 +3496,7 @@ const AppealEstablished = () => {
   }
   .el_btbox {
     display: flex;
-    margin-top: 10px;
+    margin-top: 2px;
   }
 }
 .NumTotal {
@@ -3623,22 +3639,26 @@ const AppealEstablished = () => {
   :deep(.is-active) {
     font-weight: bold;
   }
+  :deep(.el-tabs__content){
+    padding: 0 12px;
+  }
   .el_information {
     width: 100%;
     display: flex;
     flex-wrap: wrap;
 
     :deep(.el-form-item) {
-      width: 16%;
+      width: 19%;
       height: auto;
       display: flex;
       align-items: flex-start;
-      flex-direction: column;
+      flex-direction: row;
       flex: none;
+      margin: 2px 0;
       margin-right: 4px;
-      margin-bottom: 0;
       .el-form-item__label {
         margin-left: 0;
+        padding-right: 2px;
       }
       .el-form-item__content {
         width: 100% !important;
@@ -3653,6 +3673,25 @@ const AppealEstablished = () => {
   .el-select {
     width: 100;
   }
+  .inpuit_Investigationprocess{
+    display: flex;
+    flex-direction: row !important;
+    margin: 2px 0;
+  }
+  .processor_box{
+    display: flex;
+    flex-direction: row !important;
+    margin: 2px 0;
+  }
+  :deep(.el_Responsibilityhandling){
+    width: 100%;
+    display: flex;
+    margin: 3px 0;
+    justify-content: space-between;
+    .el-form-item{
+      margin: 0;
+    }
+  }
 }
 :deep(.el_Processingresults) {
   display: flex;
@@ -3707,7 +3746,7 @@ const AppealEstablished = () => {
 }
 :deep(.Responsible_box) {
   width: 100%;
-  margin-top: 10px;
+  margin-top: 4px;
   .is-active {
     font-weight: bold;
   }

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -990,7 +990,7 @@ const ruleForm = reactive({
 
   businessId: [{ required: true, message: '请选择责任方', trigger: ['bulr', 'change'] }],
   personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['bulr', 'change'] }],
-  responsibilityRatio: [{ required: false, message: '请输入占比', trigger: ['bulr', 'change'] }],
+  responsibilityRatio: [{ required: false, message: '请输入金额', trigger: ['bulr', 'change'] }],
   tripartite: [{ required: false, message: '请输入三方责任人', trigger: ['bulr', 'change'] }],
   description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }],
   money: [{ required: false, message: '请输入金额', trigger: ['bulr', 'change'] }],

src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue

@@ -464,7 +464,7 @@ const Getdriver = async () => {
         if (res.data.data.length) {
           res.data.data.forEach(item => {
             driver.value.push({
-              value: item.id,
+              value: item.userId,
               label: item.name,
             });
           });

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -287,9 +287,12 @@
             </el-form-item>
           </el-form>
           <div class="imgName">
-            <span>上门照</span>
-            <br />
-            <el-button type="primary" @click="UploadTheScanningMap(1)">上传扫描图</el-button>
+            <div class="mb10 mt10">
+              <span>上门照</span>
+            </div>
+            <el-button class="mb10" type="primary" @click="UploadTheScanningMap(1)">
+              上传扫描图
+            </el-button>
             <el-upload
               v-model:file-list="DoorstepPhoto"
               :action="doubledCount"
@@ -320,9 +323,12 @@
           </div>
 
           <div class="imgName">
-            <span>堆码照</span>
-            <br />
-            <el-button type="primary" @click="UploadTheScanningMap(2)">上传扫描图</el-button>
+            <div class="mb10 mt10">
+              <span>堆码照</span>
+            </div>
+            <el-button class="mb10" type="primary" @click="UploadTheScanningMap(2)">
+              上传扫描图
+            </el-button>
             <el-upload
               v-model:file-list="StackingPhoto"
               :action="doubledCount"
@@ -352,9 +358,12 @@
           </div>
 
           <div class="imgName">
-            <span>易碎照</span>
-            <br />
-            <el-button type="primary" @click="UploadTheScanningMap(3)">上传扫描图</el-button>
+            <div class="mb10 mt10">
+              <span>易碎照</span>
+            </div>
+            <el-button class="mb10" type="primary" @click="UploadTheScanningMap(3)">
+              上传扫描图
+            </el-button>
             <el-upload
               v-model:file-list="FragilePhotos"
               :action="doubledCount"
@@ -384,9 +393,12 @@
           </div>
 
           <div class="imgName">
-            <span>家配照</span>
-            <br />
-            <el-button type="primary" @click="UploadTheScanningMap(4)">上传扫描图</el-button>
+            <div class="mb10 mt10">
+              <span>家配照</span>
+            </div>
+            <el-button class="mb10" type="primary" @click="UploadTheScanningMap(4)"
+              >上传扫描图</el-button
+            >
             <el-upload
               v-model:file-list="HomePhotos"
               :action="doubledCount"
@@ -416,9 +428,13 @@
           </div>
 
           <div class="imgName">
-            <span>签收照</span>
-            <br />
-            <el-button type="primary" @click="UploadTheScanningMap(5)">上传扫描图</el-button>
+            <div class="mb10 mt10">
+              <span>签收照</span>
+            </div>
+            <el-button class="mb10" type="primary" @click="UploadTheScanningMap(5)">
+              上传扫描图
+            </el-button>
+
             <el-upload
               v-model:file-list="SignForPhotos"
               :action="doubledCount"
@@ -2733,4 +2749,12 @@ export default {
 :deep(.el-date-editor.el-input__wrapper) {
   height: 100% !important;
 }
+
+:deep(.el-upload-list--picture-card) {
+  --el-upload-list-picture-card-size: 80px !important;
+}
+
+:deep(.el-upload) {
+  --el-upload-picture-card-size: 80px !important;
+}
 </style>