Merge branch 'dev' into pre-production

src/api/distribution/AddVehicleStowage.js

@@ -144,7 +144,7 @@ export const postAddOrderToFinalNodeId = data => {
 };
 
 /**
- * 新增调度池订单
+ * 编辑配载计划
  */
 export const postUpdateCarsLoadBasicData = data => {
   return request({

src/option/storagecost/Traincostbreakdown.js

@@ -25,6 +25,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'deliveryDriver',
+    label: '配送司机',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'distributionModel',
     label: '配送车型',
@@ -327,6 +338,18 @@ export const columnList = [
     head: false,
     isshowSummary: true,
   },
+  {
+    prop: 'deliveryRemark',
+    label: '配送备注',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true,
+  },
   {
     prop: 'changeAmount',
     label: '异动金额',

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -246,6 +246,7 @@
                     label="调查经过"
                     v-if="displaySettings.investigationPocess"
                   >
+                  <el-tooltip :content="Indexform.investigationProcess" placement="top">
                     <el-input
                       :rows="2"
                       type="textarea"
@@ -253,13 +254,15 @@
                       disabled
                       placeholder="暂无调查经过"
                     />
+                  </el-tooltip>
+         
                   </el-form-item>
                 </div>
               </div>
             </el-tab-pane>
           </el-tabs>
 
-          <el-tabs type="border-card" class="el_nint"     v-if="Indexform.discoveryNode != 3">
+          <el-tabs type="border-card" class="el_nint" v-if="Indexform.discoveryNode != 3">
             <el-tab-pane>
               <template #label>
                 <span class="custom-tabs-label">
@@ -534,7 +537,20 @@
             </template>
             <!-- 照片 -->
             <div class="Transport_damage_photos">
-              <el-upload
+              <el-image
+                v-for="(item, index) in Indexform.packList"
+                :key="index"
+                style="width: 80px; height: 80px"
+                :src="item.url"
+                :zoom-rate="1.2"
+                :max-scale="7"
+                :min-scale="0.2"
+                :preview-src-list="Indexform.packList.map(v => v.url)"
+                :z-index="index"
+                :initial-index="index"
+                fit="cover"
+              />
+              <!-- <el-upload
                 disabled
                 v-model:file-list="Indexform.packList"
                 list-type="picture-card"
@@ -561,7 +577,7 @@
                   :initial-index="4"
                   fit="cover"
                 />
-              </el-dialog>
+              </el-dialog> -->
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -699,14 +715,15 @@
                       </div> -->
                       <div class="img" v-if="item.img">
                         <el-image
-                          v-for="(item, index) in item.imgList"
+                          v-for="(items, indexs) in item.imgList"
                           :key="index"
-                          :src="item"
+                          :src="items"
                           :zoom-rate="1.2"
                           :max-scale="7"
                           :min-scale="0.2"
-                          :preview-src-list="[item]"
+                          :preview-src-list="item.imgList"
-                          :initial-index="4"
+                          :initial-index="indexs"
+                          :z-index="indexs"
                           fit="cover"
                         />
                       </div>
@@ -1179,6 +1196,9 @@ const Completionpermissions = computed(() => {
   if (myDataStr) {
     Mydata.value = JSON.parse(myDataStr);
   }
+  console.log(CompensationParty.value,'CompensationParty.value');
+  console.log(CompletedView.value,'CompletedView.value');
+  
   if (CompensationParty.value && CompensationParty.value.length) {
     if (CompletedView.value.includes(Mydata.value.id) || UserPermissions.value != '仓库客服') {
       return true;
@@ -1965,18 +1985,10 @@ const ResultDetermination = () => {
   }
 }
 
-.Transport_damage_photos {
+:deep(.Transport_damage_photos) {
-  display: flex;
+  margin-top: 3px;
-  margin-top: 20px;
+  .el-image-viewer__wrapper {
-  flex-direction: column;
+    z-index: 999999999999999999 !important;
-
-  .title {
-    width: 100px;
-    display: block;
-    margin-bottom: 10px;
-    font-size: 14px;
-    font-weight: bold;
-    color: #5b5b5b;
   }
 }
 
@@ -2483,7 +2495,11 @@ const ResultDetermination = () => {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      height: auto;
+      height: 20px;
+      h4 {
+        padding: 0;
+        margin: 0;
+      }
       .el-tag {
         width: 70px;
       }
@@ -2569,7 +2585,6 @@ const ResultDetermination = () => {
   span {
     width: 40px;
   }
-
   :deep(.el-select) {
     width: 100%;
   }
@@ -2603,8 +2618,8 @@ const ResultDetermination = () => {
     height: 20%;
     overflow: scroll;
     .el-image {
-      width: 20%;
+      width: 50px;
-      height: 100%;
+      height:50px;
 
       margin: 4px;
     }
@@ -2937,7 +2952,10 @@ const ResultDetermination = () => {
 :deep(.el-upload-list__item-thumbnail) {
   object-fit: inherit;
 }
-:deep(.el-tabs__header){
+:deep(.el-tabs__header) {
   background-color: #fdfdfd;
 }
+:deep(.el-image-viewer__wrapper) {
+  z-index: 999999999999999 !important;
+}
 </style>

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -160,7 +160,9 @@
                   </el-form-item>
                   <!-- 必填 -->
                   <el-form-item label="运单商场" v-if="displaySettings.waybillMall">
-                    <el-input v-model="endFrom.waybillMall" disabled />
+                    <el-tooltip :content="endFrom.waybillMall" placement="top">
+                      <el-input v-model="endFrom.waybillMall" disabled />
+                    </el-tooltip>
                   </el-form-item>
 
                   <el-form-item label="合作模式" v-if="displaySettings.typeServiceName">
@@ -229,7 +231,7 @@
                     class="inpuit_Investigationprocess"
                     v-if="displaySettings.investigationProcess"
                   >
-                    <el-input v-model="endFrom.investigationProcess" disabled />
+                    <el-input v-model="endFrom.investigationProcess" disabled   type="textarea" :rows="2"/>
                   </el-form-item>
                 </div>
               </div>
@@ -585,7 +587,21 @@
               v-if="endFrom.packageImage.length"
             >
               <el-tab-pane label="照片">
-                <el-upload
+                <el-image
+                  v-for="(item, index) in endFrom.packageImage"
+                  :key="index"
+                  style="width: 80px; height: 80px"
+                  :src="item.url"
+                  :zoom-rate="1.2"
+                  :max-scale="7"
+                  :min-scale="0.2"
+                  :preview-src-list="endFrom.packageImage.map(v => v.url)"
+                  :z-index="index"
+                  :initial-index="index"
+                  fit="cover"
+                />
+
+                <!-- <el-upload
                   disabled
                   v-model:file-list="endFrom.packageImage"
                   list-type="picture-card"
@@ -611,7 +627,7 @@
                     :initial-index="4"
                     fit="cover"
                   />
-                </el-dialog>
+                </el-dialog> -->
               </el-tab-pane>
             </el-tabs>
 
@@ -669,7 +685,7 @@
             >
             <el-button
               type="primary"
-              v-if="PermissionButton.information_editing && endFrom.discoveryNode !='3'"
+              v-if="PermissionButton.information_editing && endFrom.discoveryNode != '3'"
               @click="EditInformation"
               >修改内部责任划分</el-button
             >
@@ -787,14 +803,15 @@
 
                         <div class="img" v-if="item.img">
                           <el-image
-                            v-for="(item, index) in item.imgList"
+                            v-for="(items, indexs) in item.imgList"
-                            :key="index"
+                            :key="indexs"
-                            :src="item"
+                            :src="items"
                             :zoom-rate="1.2"
                             :max-scale="7"
                             :min-scale="0.2"
-                            :preview-src-list="[item]"
+                            :preview-src-list="item.imgList"
-                            :initial-index="4"
+                            :initial-index="indexs"
+                            :z-index="indexs"
                             fit="cover"
                           />
                         </div>
@@ -1262,15 +1279,16 @@ const Completedsubmission = () => {
     //已经完结了的，可以给仓库客服展示
     return true;
   }
-  // 否则只能总部客服和经理展示
+  // // 否则只能总部客服和经理展示
-  if (
+  // if (
-    UserPermissions.value == Useridentity.Headquarters_customer_service ||
+  //   UserPermissions.value == Useridentity.Headquarters_customer_service ||
-    UserPermissions.value == Useridentity.Headquarters_Manager
+  //   UserPermissions.value == Useridentity.Headquarters_Manager
-  ) {
+  // ) {
-    return true;
+  //   return true;
-  }
+  // }
   return false;
 };
+
 const CompletedPresentation = () => {
   if (
     UserPermissions.value == Useridentity.Headquarters_customer_service ||
@@ -3077,7 +3095,7 @@ const AppealEstablished = () => {
     justify-content: flex-start;
   }
   :deep(.el-tabs__content) {
-    padding: 0 10px;
+    padding: 4px 10px;
   }
 }
 .payanindemnity {
@@ -3353,9 +3371,8 @@ const AppealEstablished = () => {
     height: 20%;
     overflow: scroll;
     .el-image {
-      width: 20%;
+      width:50px;
-      height: 100%;
+      height:50px;
-
       margin: 4px;
     }
     img {
@@ -3388,7 +3405,11 @@ const AppealEstablished = () => {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    height: auto;
+    height: 20px;
+    h4 {
+      padding: 0;
+      margin: 0;
+    }
     :deep(.el-tag) {
       width: 70px;
     }
@@ -3600,6 +3621,9 @@ const AppealEstablished = () => {
   .is-active {
     font-weight: bold;
   }
+  .el-image-viewer__wrapper {
+    z-index: 99999999999999999999 !important;
+  }
 }
 :deep(.topClass) {
   border-bottom: none;
@@ -3830,7 +3854,10 @@ const AppealEstablished = () => {
     top: 0;
   }
 }
-:deep(.el-tabs__header){
+:deep(.el-tabs__header) {
   background-color: #fdfdfd;
 }
+:deep(.el-image-viewer__wrapper) {
+  z-index: 999999999999999 !important;
+}
 </style>

src/views/distribution/artery/AddVehicleStowage.vue

@@ -164,6 +164,16 @@
               </el-form-item>
             </div>
 
+            <!-- 外请站点 -->
+            <!-- <div
+              class="form_row_item"
+              v-if="Number(form.driverType) === 3 || Number(form.driverType) === 4"
+            >
+              <el-form-item inline label="外请站点">
+                <el-input v-model="form.outsideStation" placeholder="请输入外请站点" />
+              </el-form-item>
+            </div> -->
+
             <!-- 副驾司机 -->
             <div class="form_row_item">
               <el-form-item inline label="副驾司机">

src/views/distribution/inventory/CreateOrder.vue

@@ -3777,6 +3777,11 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
     const timer = setTimeout(async () => {
       try {
+        // if (!details.query.shipperId)
+        //   return ElMessage.warning('未选择系统内维护的发货单位，请选择或维护');
+        // if (!details.query.consigneeId)
+        //   return ElMessage.warning('未选择系统内维护的收货单位，请选择或维护');
+
         // 检测货物名称和件数是否正确填写
         for (let i = 0; i < details.goodsList.length; i++) {
           const val = details.goodsList[i];

src/views/waybill/CreateZeroOrder.vue

@@ -2945,6 +2945,11 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
 
       const timer = setTimeout(async () => {
         try {
+          // if (!details.query.shipperId)
+          //   return ElMessage.warning('请选择系统内维护的发货单位，请选择或维护');
+          // if (!details.query.consigneeId)
+          //   return ElMessage.warning('请选择系统内维护的收货单位，请选择或维护');
+
           let _arr = [];
 
           for (let i = 0; i < details.goodsList.length; i++) {