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

src/api/distribution/distributionDeliveryList.js

@@ -397,3 +397,14 @@ export const $_retentionSave = data => {
     data,
   });
 };
+
+// 异常包件列表取消配送
+export const $_cancelLoadingAbnormal = data => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/cancelLoadingAbnormal',
+    method: 'post',
+    data,
+  });
+};
+
+

src/api/work/work.js

@@ -85,7 +85,7 @@ export const getMyWarehouseList = data => {
     data,
   });
 };
-
+// 获取仓库当前登录人仓库信息
 export const getMyCurrentWarehouse = params => {
   return request({
     url: '/api/logpm-basicdata/warehouse/getCurrentWarehouse',

src/option/distribution/DeliveryExceptionReview.js

@@ -49,6 +49,7 @@ export const AbnormalReview = [
     head: false,
   },
 
+
   {
     prop: 'orderCode',
     label: '订单自编号',
@@ -391,7 +392,17 @@ export const AbnormalReview = [
     sortable: false,
     head: false,
   },
-
+  {
+    prop: 'completeName',
+    label: '是否完成',
+    type: 1,
+    values: '',
+    width: '100',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+    head: false,
+  },
   {
     prop: 'auditingTime',
     label: '审核时间',

src/option/warehouse/PreStoragePackage.js

@@ -37,7 +37,7 @@ export const columnList = [
     label: '订单自编号',
     type: 1,
     values: '',
-    width: '240',
+    width: '140',
     checkarr: [],
     fixed: true,
     sortable: true,
@@ -176,6 +176,27 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'conditionsName',
+    label: '包件类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+        label: '定制品',
+        value: 1,
+      },
+      {
+        label: '零担',
+        value: 3,
+      },
+    ],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+
   {
     prop: 'inWarehouseName',
     label: '是否入库',

src/option/warehouse/PreStorageTrainNumber.js

@@ -54,6 +54,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'driverName',
+    label: '司机',
+    type: 2,
+    values: '',
+    width: '240',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'taskTime',
+    label: '配送时间',
+    type: 1,
+    values: '',
+    width: '240',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalNum',
     label: '总件数',
@@ -63,6 +85,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'inNum',
@@ -73,6 +96,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'restNum',
@@ -83,13 +107,14 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: '',
     label: '操作',
     type: 6,
     values: '',
-    width: '250',
+    width: '90',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/views/cost/Deliverycostmanagement/Categorypricingunit.vue

@@ -454,8 +454,26 @@ const remoteMethod = goodsName => {
 
 // 新增品类
 const Categoryaddition = async () => {
+  if (!$route.query.id && !props.templateData.id) {
+    ElMessage({
+      message: '请先新增模板',
+      type: 'error',
+    });
+    return;
+  }
+
   ruleFormRef.value.validate(valid => {
     if (valid) {
+      const categoryMap = new Map(details.data.map(item => [item.categoryId, item]));
+      //这里查找是否已经存在添加过的品类（只能查询当前页）
+      if (categoryMap.has(form.value.categoryId)) {
+        ElMessage({
+          message: '该品类已存在',
+          type: 'warning',
+        });
+        return;
+      }
+      // 判断是否存在多个品类
       let data = {
         categoryId: form.value.categoryId, //成本结算品类
         unit: form.value.unit, //计价单位

src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue

@@ -82,7 +82,7 @@
           <el-form-item label="超区点位计费模式">
             <el-radio-group v-model="form.overZoneSiteMode">
               <el-radio :label="1">统一计费</el-radio>
-              <el-radio :label="2">区域计费</el-radio>
+              <el-radio :label="2" v-if="form.overZoneKilometerRule!=1">区域计费</el-radio>
             </el-radio-group>
           </el-form-item>
         </template>

src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue

@@ -103,8 +103,10 @@
         label-width="auto"
         v-loading="tcloading"
         element-loading-text="Loading..."
+        ref="ruleFormRef"
+        :rules="rules"
       >
-        <el-form-item label="服务仓:">
+        <el-form-item label="服务仓:" prop="warehouseId">
           <el-select
             @change="changServiceWarehouse"
             v-model="form.warehouseId"
@@ -119,7 +121,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="司机:">
+        <el-form-item label="司机:" prop="driverId">
           <el-select v-model="form.driverId" placeholder="请选择司机">
             <el-option
               v-for="item in driver"
@@ -129,7 +131,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="价格模板:">
+        <el-form-item label="价格模板:" prop="templateId">
           <el-select v-model="form.templateId" placeholder="请选择价格模板">
             <el-option
               v-for="item in PriceTemplate"
@@ -191,6 +193,12 @@ const PriceTemplate = ref([]); //价格模板
 const Priceconfiguration = ref(false);
 const WarehouseId = ref('');
 const queryTop = ref({});
+const ruleFormRef = ref(null);
+const rules = reactive({
+  warehouseId: [{ required: true, message: '请选择服务仓', trigger: 'blur' }],
+  driverId: [{ required: true, message: '请选择司机', trigger: 'blur' }],
+  templateId: [{ required: true, message: '请选择价格模板', trigger: 'blur' }],
+});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -467,7 +475,20 @@ const PageOnload = async () => {
 //页面初始化方法
 PageOnload();
 // 价格配置提交
-const Priceconfigurationsubmission = () => {
+const Priceconfigurationsubmission = async () => {
+  const _flag = await ruleFormRef.value.validate();
+  if (!_flag) {
+    return;
+  }
+  const categoryMap = new Map(details.data.map(item => [item.driverId, item]));
+  //这里查找是否已经存在添加过的品类（只能查询当前页）
+  if (categoryMap.has(form.value.driverId)) {
+    ElMessage({
+      message: '司机已经存在',
+      type: 'warning',
+    });
+    return;
+  }
   let data = {
     warehouseName:
       ServiceWarehouse.value.find(res => res.value == form.value.warehouseId)?.label || '', //仓库名称

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -438,7 +438,7 @@
                     @click="signingReservationPackage(slotProps.scope.row)"
                     >PC签收</el-text
                   >
-                  <el-text
+                  <!-- <el-text
                     v-if="
                       accessControl &&
                       slotProps.scope.row.orderPackageStatus != '70' &&
@@ -447,7 +447,7 @@
                     size="small"
                     @click="retention(slotProps.scope.row)"
                     >滞留</el-text
-                  >
+                  > -->
                 </template>
               </template>
             </tablecmt>
@@ -770,6 +770,7 @@
       @close="Abnormalshutdown"
       class="el_abnormalBox"
     >
+      <el-button type="primary" @click="BatchcancellationAll">批量取消</el-button>
       <el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
       <tablecmt
         :columnList="AbnormalReview"
@@ -798,8 +799,14 @@
                 @click="RejectFn(slotProps.scope.row)"
                 >驳回
               </el-text>
-            </div>
 
+              <el-text
+              @click="Canceldelivery(slotProps.scope.row)"
+              v-if="slotProps.scope.row.abnormalTypeName == '装车异常'"
+              >取消</el-text
+            >
+            </div>
+     
             <el-text
               @click="abnormalViewQRcode(2, slotProps.scope.row)"
               style="margin-left: 10px"
@@ -817,9 +824,9 @@
         </template>
       </tablecmt>
 
-      <div class="el_examine_approve">
+      <!-- <div class="el_examine_approve">
         <el-button type="primary" @click="allauditing">一键审批</el-button>
-      </div>
+      </div> -->
     </el-dialog>
 
     <el-dialog v-model="dialogViReject" title="驳回" width="500">
@@ -889,6 +896,7 @@ import {
   $_showInventoryPackgeCode,
   $_loadingAbnormalPackageListTurnDown,
   $_retentionScan,
+  $_cancelLoadingAbnormal,
 } from '@/api/distribution/distributionDeliveryList';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
@@ -3848,6 +3856,88 @@ export default {
         this.loadingObj.pageLoading = false;
       }
     },
+    // 批量异常取消
+    BatchcancellationAll() {
+      if (!this.selectionList.length) {
+        ElMessage({
+          message: '请勾选要取消的数据，【审核状态】必须为待审核，斌且【异常类型】状态只能为装车异常',
+          type: 'warning',
+        });
+        return;
+      }
+      let _state = this.selectionList.every(item => item.auditingStatusName =='待审核' && item.abnormalTypeName == '装车异常' );
+      console.log(_state);
+      if (!_state) {
+        ElMessage({
+          message: '勾选数据【审核状态】必须全部为待审核，并且【异常类型】必须全部满足:装车异常,',
+          type: 'warning',
+        });
+        return;
+      }
+
+      ElMessageBox.confirm(`当前已经勾选${this.selectionList.length}条数据，是否确认取消`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          try {
+            let data = {
+              deliveryId: this.selectionList[0].deliveryListId,
+              reservationId: this.selectionList[0].reservationId,
+              loadingAbnormalIds: this.selectionList.map(item => item.id).join(','),
+            };
+            this.AbnormalReviewloading = true;
+            let _res = await $_cancelLoadingAbnormal(data);
+            if (_res.data.code == 200) {
+              ElMessage({
+                message: _res.data.msg,
+                type: 'success',
+              });
+              this.viewAbnormalLoading(this.toexamineID); //取消完成更新数据
+            }
+          } catch (error) {
+            console.log(error, 'error');
+          } finally {
+            this.AbnormalReviewloading = false;
+          }
+        })
+        .catch(() => {});
+    },
+    // 异常包件取消
+    async Canceldelivery(row) {
+      console.log(row);
+
+      ElMessageBox.confirm('是否确认取消配送?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(async () => {
+          try {
+            let data = {
+              deliveryId: row.deliveryListId,
+              reservationId: row.reservationId,
+              loadingAbnormalIds: row.id,
+            };
+            this.AbnormalReviewloading = true;
+            let _res = await $_cancelLoadingAbnormal(data);
+            if (_res.data.code == 200) {
+              ElMessage({
+                message: _res.data.msg,
+                type: 'success',
+              });
+              this.viewAbnormalLoading(this.toexamineID); //取消完成更新数据
+            }
+            console.log(_res);
+          } catch (error) {
+            console.log(error, 'error');
+          } finally {
+            this.AbnormalReviewloading = false;
+          }
+        })
+        .catch(() => {});
+    },
     // 库存品查看二维码
     async handleStockQRCode(row) {
       try {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -297,7 +297,7 @@
       <!-- </template> -->
 
       <!-- 零担品类信息 -->
-      <el-dialog v-model="zeroOrderShow" title="零担品类信息" width="50%" :model="zeroOrderData">
+      <el-dialog v-model="zeroOrderShow" title="零担品类信息" width="80%" :model="zeroOrderData">
         <el-row :gutter="24" class="rows">
           <el-col :xl="4" :lg="7" :md="8" :sm="24">
             <h3>
@@ -312,16 +312,16 @@
               <el-col :xl="2" :lg="4" :md="4" :sm="12">
                 <span>名称：{{ item.firsts }}</span>
               </el-col>
-              <!-- <el-col :xl="4" :lg="7" :md="8" :sm="24">
+              <el-col :xl="2" :lg="4" :md="4" :sm="12">
-                <span>总数量：{{ item.quantity }} </span>
+                <span>总数量：{{ item.number }} </span>
-              </el-col> -->
+              </el-col>
-              <!-- <el-col :xl="4" :lg="7" :md="8" :sm="24">
+              <el-col :xl="2" :lg="4" :md="4" :sm="12">
                 <span>在库数量：{{ item.handQuantity }} </span>
-              </el-col> -->
+              </el-col>
-              <el-col :xl="2" :lg="4" :md="8" :sm="24">
+              <el-col :xl="2" :lg="4" :md="4" :sm="12">
                 <span>冻结数量：{{ item.deliveryQuantity }} </span>
               </el-col>
-              <el-col :xl="4" :lg="7" :md="8" :sm="24">
+              <el-col :xl="2" :lg="4" :md="4" :sm="12">
                 <span>出库数量：{{ item.outboundQuantity }} </span>
               </el-col>
               <!-- <el-col :xl="4" :lg="7" :md="8" :sm="24">

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -534,8 +534,8 @@
           >
           <el-table :data="isZeroTable" border style="width: 100%">
             <el-table-column fixed prop="firsts" label="名称" />
-            <!-- <el-table-column prop="quantity" label="数量" /> -->
+            <el-table-column prop="number" label="数量" />
-            <!-- <el-table-column prop="handQuantity" label="在库数量" /> -->
+            <el-table-column prop="handQuantity" label="在库数量" />
             <el-table-column prop="deliveryQuantity" label="冻结数量" />
             <el-table-column prop="outboundQuantity" label="出库数量" />
             <!-- <el-table-column label="可用数量">
@@ -1709,14 +1709,14 @@ const Entering = val => {
 };
 
 // 数量录入
-const QuantityEntry = val => {
+const QuantityEntry = async val => {
   console.log(dataInfo.value, 'dataInfo.value');
 
   dataId.value = findIndexById(val.id); //记录当前点击的订单
-
+  editLoading.value=true
   //   编辑状态
   if (RouteId.value) {
-    $_getDeliveryZeroOrderDetail({
+   await $_getDeliveryZeroOrderDetail({
       deliveryId: RouteId.value,
       orderId: val.id,
     }).then(res => {
@@ -1733,14 +1733,14 @@ const QuantityEntry = val => {
       SjTc.value = false; //关闭司机弹窗
       console.log(res, '编辑状态在库录入');
       //   冻结数量-数量操作 =冻结数量
-      for (let item of res.data.data) {
+      // for (let item of res.data.data) {
-        item.deliveryQuantity = item.deliveryQuantity - item.reservationNum;
+      //   item.deliveryQuantity = item.deliveryQuantity - item.reservationNum;
-      }
+      // }
       isZeroTable.value = res.data.data;
     });
   } else {
     // 新增状态
-    getZeroOrderDetail(val.id).then(res => {
+   await getZeroOrderDetail(val.id).then(res => {
       if (res.data.code == 200) {
         console.log(res, '数量录入返回信息');
         isZeroTable.value = res.data.data;
@@ -1751,6 +1751,7 @@ const QuantityEntry = val => {
       }
     });
   }
+  editLoading.value=false;
 };
 // 修改零担数量
 const ModifyLCL = () => {

src/views/financialsector/Financialse/FinancialDelivery.vue

@@ -933,12 +933,12 @@ const search = val => {
 // 是否附加费
 
 const isdispatchIsAddFee = value => {
-  (form.value.dispatchIsSortFee = 0), //是否有分货费
+  form.value.dispatchIsSortFee = 0; //是否有分货费
-    (form.value.dispatchIsStairsCarryingCharge = 0), //是否有上楼费
+  form.value.dispatchIsStairsCarryingCharge = 0; //是否有上楼费
-    (form.value.dispatchIsFeeFloor = null), //是否配置免费层数
+  form.value.dispatchIsFeeFloor = null; //是否配置免费层数
-    (form.value.dispatchIsShiftingCharge = 0), //是否有平移费
+  form.value.dispatchIsShiftingCharge = 0; //是否有平移费
-    (form.value.dispatchIsOperateFee = 0), //是否有操作装卸
+  form.value.dispatchIsOperateFee = 0; //是否有操作装卸
-    (form.value.dispatchIsCategorySubjoin = 0); //附加费是否按品类计费
+  form.value.dispatchIsCategorySubjoin = 0; //附加费是否按品类计费
 };
 function updateOptions(allDropdowns) {
   // 拉平所有的下拉框组到一个单一数组中
@@ -1091,20 +1091,22 @@ const onLoad = async () => {
     if (request.value.dispatchPieceCategory) {
       if (request.value.dispatchPieceCategorys.length) {
         request.value.dispatchPieceCategorys.forEach((res, index) => {
-          form.value.dispatchPieceCategoryData.push({
+          if (res) {
-            index: index + 1,
+            form.value.dispatchPieceCategoryData.push({
-            Warehousecategory: res.id,
+              index: index + 1,
-            options: [
+              Warehousecategory: res.id,
-              {
+              options: [
-                label: res.name,
+                {
-                value: res.id,
+                  label: res.name,
-              },
+                  value: res.id,
-            ],
+                },
-            plus: true,
+              ],
-            reduce: false,
+              plus: true,
-            StateName: 'storage', //仓储标识
+              reduce: false,
-            loading: false,
+              StateName: 'storage', //仓储标识
-          });
+              loading: false,
+            });
+          }
         });
       }
     } else {
@@ -1184,8 +1186,9 @@ const onLoad = async () => {
     }
 
     // 附加品类回显
-    form.value.dispatchSubjoinCategoryData = [];
+
     if (request.value.dispatchSubjoinCategory) {
+      form.value.dispatchSubjoinCategoryData = [];
       if (request.value.dispatchSubjoinCategorys.length) {
         request.value.dispatchSubjoinCategorys.forEach((res, index) => {
           form.value.dispatchSubjoinCategoryData.push({
@@ -1203,8 +1206,9 @@ const onLoad = async () => {
             loading: false,
           });
         });
-      } else {
+      } 
-        form.value.dispatchSubjoinCategoryData = [
+    }else{
+      form.value.dispatchSubjoinCategoryData = [
           {
             index: 1,
             Warehousecategory: '',
@@ -1215,7 +1219,6 @@ const onLoad = async () => {
             loading: false,
           },
         ];
-      }
     }
     if (form.value.dispatchServiceType) {
       form.value.WarehousebillingmodeTitle = Warehousebillingmode.value.find(

src/views/warehouse/prewarehousing/PreStoragePackage.vue

@@ -100,7 +100,6 @@
 
 <script setup lang="ts">
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
-import functions from '@/utils/functions.js';
 import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */

src/views/warehouse/prewarehousing/PreStorageTrainNumber.vue

@@ -2,15 +2,25 @@
   <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
       <!-- 搜索模块 -->
-      <!-- <div v-h5uShow="!search">
+      <div v-h5uShow="!search">
         <el-form :inline="true" :model="query" class="header_search">
-         
+          <el-form-item label="配送时间">
+            <el-date-picker
+              v-model="query.time"
+              type="daterange"
+              range-separator="到"
+              value-format="YYYY-MM-DD"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            />
+          </el-form-item>
+
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
           </el-form-item>
         </el-form>
-      </div> -->
+      </div>
 
       <div class="avue-crud__header">
         <!-- 头部左侧按钮模块 -->
@@ -19,7 +29,7 @@
         <div class="avue-crud__right">
           <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
           <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-          <!-- <el-button icon="Search" @click="searchHide" circle></el-button> -->
+          <el-button icon="Search" @click="searchHide" circle></el-button>
         </div>
       </div>
 
@@ -227,6 +237,14 @@ initOnLoad();
 
 /** 搜索 */
 const searchChange = () => {
+  const { time } = details.query;
+  if (time?.length) {
+    [details.query.taskTimeStart, details.query.taskTimeEnd] = time;
+  } else {
+    delete details.query.taskTimeStart;
+    delete details.query.taskTimeEnd;
+  }
+
   initOnLoad();
 };