Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/distribution/distributionDeliveryList.js

@@ -389,11 +389,11 @@ export const $_retentionScan = data => {
   });
 };
 
-//滞留
+//滞留(已弃用！)
 export const $_retentionSave = data => {
   return request({
     url: '/api/logpm-distribution/deliveryList/retentionSave',
     method: 'post',
     data,
   });
-};
+};

src/api/distribution/distributionSignfor.js

@@ -383,3 +383,11 @@ export const postPageCount = params => {
     params,
   });
 };
+    //滞留
+export const $_retentionScan = data => {
+      return request({
+        url: '/api/logpm-distribution/deliveryList/retentionPC',
+        method: 'post',
+        data,
+      });
+    };

src/components/tablecmt/tablecmt.vue

@@ -142,7 +142,7 @@
             >
               <slot :scope="scope"> </slot>
             </div>
-            <el-image
+            <!-- <el-image
               preview-teleported
               v-else-if="column.type == 7"
               style="width: 60px; height: 60px; margin-left: 10px"
@@ -151,6 +151,16 @@
               v-for="(item, index) in scope.row[column.prop].split(',')"
               :src="item"
               :preview-src-list="scope.row[column.prop].split(',')"
+            /> -->
+            <el-image
+              preview-teleported
+              v-else-if="column.type == 7"
+              style="width: 60px; height: 60px; margin-left: 10px"
+              :initial-index="index"
+              :z-index="100"
+              v-for="(item, index) in scope.row[column.prop]?.split(',')"
+              :src="item"
+              :preview-src-list="scope.row[column.prop]?.split(',')"
             />
           </template>
         </el-table-column>

src/option/distribution/DeliveryExceptionReview.js

@@ -452,7 +452,7 @@ export const AbnormalReview = [
     label: '操作',
     type: 6,
     values: '',
-    width: '80',
+    width: '120',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/views/basicdata/brand/basicBrand.vue

@@ -121,7 +121,7 @@
           <el-form-item label="品牌编号" prop="brandCode">
             <el-input v-model="form.brandCode" placeholder="请输入品牌编号" />
           </el-form-item>
-          <el-form-item label="品牌图标" prop="brandIcon">
+          <el-form-item label="品牌图标">
             <!--            <el-input v-model="form.brandIcon" placeholder="请输入品牌图标"/>-->
             <el-upload
               class="avatar-uploader"
@@ -330,7 +330,7 @@ export default {
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
         brandCode: [{ required: true, message: '请输入品牌编号', trigger: 'change' }],
-        brandIcon: [{ required: true, message: '请上传图标', trigger: 'blur' }],
+        brandIcon: [{ required: false, message: '请上传图标', trigger: 'blur' }],
         acceptanceTime: [{ required: true, message: '请选择承接时间', trigger: 'blur' }],
       },
       loadingObj: {

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -883,7 +883,7 @@
     <MyPrint :html="html" v-model="dialogVisibleF" width="70%"></MyPrint>
 
     <el-dialog
-      title="异常装车包件列表"
+      title="异常包件列表"
       v-model="abnormalBox"
       width="67%"
       append-to-body
@@ -922,6 +922,11 @@
               @click="RejectFn(slotProps.scope.row)"
               >驳回
             </el-text>
+            <el-text
+              v-if="slotProps.scope.row.auditingStatusName == '已驳回'"
+              @click="abnormalretention(slotProps.scope.row)"
+              >滞留
+            </el-text>
           </template>
         </template>
       </tablecmt>
@@ -980,7 +985,6 @@ import {
   $_showInventoryPackgeCode,
   $_loadingAbnormalPackageListTurnDown,
   $_retentionScan,
-  $_retentionSave,
 } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { exportBlob } from '@/api/common';
@@ -4030,7 +4034,7 @@ export default {
           });
           this.AbnormalReviewloading = false; //关闭加载
           console.log();
-          this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
+          this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
         }
       });
     },
@@ -4647,6 +4651,40 @@ export default {
         })
         .catch(() => {});
     },
+
+        // 异常审核滞留
+    abnormalretention(row) {
+      
+      ElMessageBox.confirm('是否确认滞留操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          let data = {
+            barcode: row.packageCode,
+            deliveryId: row.deliveryListId,
+            retentionType: '1',
+          };
+          this.loading = true;
+          $_retentionScan(data)
+            .then(res => {
+              console.log(res, 'res');
+              if (res.data.code == 200) {
+                ElMessage({
+                  message: '滞留成功',
+                  type: 'success',
+                });
+                this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
+    },
+
     // 包件批量签收
     Batchpackages() {
       if (!this.selectionList.length) {

src/views/distribution/signfor/asurcharge.vue

@@ -489,6 +489,8 @@ const onLoad = () => {
       if (res.data.code == 200) {
         if (res.data.data == null || !res.data.data?.addvalueDetailId) {
           details.data = [];
+          TcZcInput.value.floolNum = 0; //上楼费
+          TcZcInput.value.distance = 0; //平移距离
           addvalueDetailId.value = null;
           return;
         }
@@ -624,7 +626,7 @@ const preservation = () => {
     addvalueType: tabName.value, //类型
     deliveryId: $route.query.id,
     reservationId: $route.query.reservationId,
-    packageEntityList: [],
+    packageEntityList: details.data || [],
   };
 
   if (tabName.value == 2) {

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -176,11 +176,7 @@
               @click="handleSign(slotProps.scope.row)"
               >复 核</el-text
             >
-            <el-text
-              size="small"
-              @click="asurcharge(slotProps.scope.row)"
-              >附加费</el-text
-            >
+            <el-text size="small" @click="asurcharge(slotProps.scope.row)">附加费</el-text>
           </template>
 
           <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
@@ -447,6 +443,13 @@
             size="small"
             >审 核</el-button
           >
+          <el-button
+            v-if="scope.row.auditingStatusName === '已驳回'"
+            @click="retention(scope.row)"
+            type="text"
+            size="small"
+            >滞 留</el-button
+          >
           <!--                    <el-button type="text" size="small">编辑</el-button>-->
         </template>
       </el-table-column>
@@ -515,6 +518,7 @@ import {
   getSignforExport,
   numberDetail,
   $_isSignt,
+  $_retentionScan,
 } from '@/api/distribution/distributionSignfor';
 import { update as updatesign } from '@/api/distribution/distributionSignfor';
 import option from '@/option/distribution/distributionSignfor';
@@ -1839,8 +1843,8 @@ export default {
       }
     },
     // 附加费
-    asurcharge(row){
-      console.log(row,'附加费');
+    asurcharge(row) {
+      console.log(row, '附加费');
       this.$router.push({
         path: '/distribution/signfor/asurcharge',
         query: {
@@ -1989,6 +1993,37 @@ export default {
       const { row } = scope;
       console.log(row);
     },
+    // 滞留
+    retention(row) {
+      ElMessageBox.confirm('是否确认滞留操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          let data = {
+            barcode: row.packageCode,
+            deliveryId: row.deliveryListId,
+            retentionType: '1',
+          };
+          this.loading = true;
+          $_retentionScan(data)
+            .then(res => {
+              console.log(res, 'res');
+              if (res.data.code == 200) {
+                ElMessage({
+                  message: '滞留成功',
+                  type: 'success',
+                });
+                this.AbnormalreviewFn(this.abnormalReview);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
+    },
     //审批异常装车包件
     auditing(row) {
       this.Abnormalloading = true;