From c5cd85cb47e2c5853844dbf851b92ef3289eaf50 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 25 Oct 2024 23:36:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/abnormalList.js       | 30 ++++----
 src/option/finance/WaybillAudit.js            | 10 +++
 src/option/waybill/WaybillOrderList.js        | 10 +++
 .../distribution/artery/AddVehicleStowage.vue |  6 +-
 .../distribution/artery/abnormalList.vue      | 77 ++++++++++++++-----
 src/views/finance/CustomerSettlement.vue      |  6 +-
 src/views/waybill/TemporaryStorageList.vue    |  4 +-
 src/views/waybill/WaybillOrderList.vue        | 52 +++++++++++++
 8 files changed, 156 insertions(+), 39 deletions(-)

diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js
index bd557152..0fa27015 100644
--- a/src/option/distribution/abnormalList.js
+++ b/src/option/distribution/abnormalList.js
@@ -29,6 +29,19 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'abnormalStatusName',
+    label: '异常状态',
+    type: 14,
+    values: '',
+    width: '130',
+    checkarr: [
+      { value: 0, label: '待处理' },
+      { value: 1, label: '完结' },
+    ],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'abnormalTypeName',
     label: '异常类型',
@@ -114,11 +127,11 @@ export const columnList = [
     checkarr: [
       {
         label: '是',
-        value: '1',
+        value: 1,
       },
       {
         label: '否',
-        value: '0',
+        value: 0,
       },
     ],
     fixed: false,
@@ -146,19 +159,6 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
-  {
-    prop: 'abnormalStatusName',
-    label: '异常状态',
-    type: 14,
-    values: '',
-    width: '130',
-    checkarr: [
-      { value: 0, label: '待处理' },
-      { value: 1, label: '完结' },
-    ],
-    fixed: false,
-    sortable: true,
-  },
   {
     prop: 'upTime',
     label: '上报时间',
diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js
index 8a0ae86e..4da52239 100644
--- a/src/option/finance/WaybillAudit.js
+++ b/src/option/finance/WaybillAudit.js
@@ -58,6 +58,16 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'consigneeCode',
+    label: '收货单位编码',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'consignee',
     label: '收货单位',
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index 2efc1418..6a1c2563 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -138,6 +138,16 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'consigneeCode',
+    label: '收货单位编码',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'consignee',
     label: '收货单位',
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index dfcd21f1..01e4602b 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -799,7 +799,7 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import { ref, reactive, toRefs, computed, onMounted, nextTick, onActivated } from 'vue';
 import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
@@ -2573,6 +2573,10 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 //   if ($route.path !== '/distribution/artery/AddVehicleStowage') return;
 //   onLoad();
 // });
+
+onActivated(() => {
+  handleFindVehicle();
+});
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
index e96e06e4..bdd56f32 100644
--- a/src/views/distribution/artery/abnormalList.vue
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -63,7 +63,18 @@
       <!-- 控件模块 -->
       <div class="avue-crud__header">
         <!-- 头部左侧按钮模块 -->
-        <div class="avue-crud__left"></div>
+        <div class="avue-crud__left">
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="批量处理不支持零担，且需要异常类型为相同的异常"
+            placement="top-start"
+          >
+            <el-button type="primary" icon="Edit" @click="handleBatchAbnormarl">
+              批量处理
+            </el-button>
+          </el-tooltip>
+        </div>
         <!-- 头部右侧按钮模块 -->
         <div class="avue-crud__right">
           <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
@@ -144,7 +155,7 @@
   <el-dialog
     title="异常处理"
     :visible.sync="details.popUpShow.abnormalVisited"
-    width="780px"
+    width="500px"
     :align-center="true"
     v-model="details.popUpShow.abnormalVisited"
   >
@@ -331,14 +342,13 @@ const details = reactive<any>({
   },
   /** 处理的异常信息 */
   abnormalInfo: {},
+  /** 是否为异常处理 */
+  isBatch: false,
 });
 
 const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page, popUpShow } =
   toRefs(details);
 
-/** vuex */
-const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
-
 onMounted(() => {
   const timer = setTimeout(() => {
     details.listNode = document.querySelector('.maboxhi');
@@ -468,6 +478,8 @@ const handleAnException = async ({ row }) => {
   details.abnormalInfo = { ...row };
   details.abnormalInfo.handleNum = 0;
 
+  details.isBatch = false;
+
   // 获取零担异常品类详情
   if (Number(row.abnormalType) === 5) {
     try {
@@ -503,20 +515,29 @@ const handleAbnormal = (dealType, title) => {
       details.popUpShow.abnormalVisited = false;
       try {
         details.loadingObj.pageLoading = true;
-        const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType };
-        if (dealType === 6) {
-          let _handleNum = 0;
-
-          for (let i = 0; i < details.abnormalInfo.zeroGoodsArr.length; i++) {
-            const val = details.abnormalInfo.zeroGoodsArr[i];
-            val.handleNum = val.handleNum || 0;
-            val.enterNum = val.handleNum || 0;
-            _handleNum += val.handleNum || 0;
+        const submitData = { abnormalRecordIds: [], dealType } as any;
+        // 是否为批量操作
+        if (details.isBatch) {
+          for (let i = 0; i < details.selectionList.length; i++) {
+            submitData.abnormalRecordIds.push(details.selectionList[i].id);
+          }
+        } else {
+          submitData.abnormalRecordIds[0] = details.abnormalInfo.id;
+
+          if (dealType === 6) {
+            let _handleNum = 0;
+
+            for (let i = 0; i < details.abnormalInfo.zeroGoodsArr.length; i++) {
+              const val = details.abnormalInfo.zeroGoodsArr[i];
+              val.handleNum = val.handleNum || 0;
+              val.enterNum = val.handleNum || 0;
+              _handleNum += val.handleNum || 0;
+            }
+
+            if (!_handleNum) return ElMessage.warning('请输入入库数量');
+            submitData.zeroPackageDTOS = details.abnormalInfo.zeroGoodsArr;
+            submitData.num = _handleNum;
           }
-
-          if (!_handleNum) return ElMessage.warning('请输入入库数量');
-          submitData.zeroPackageDTOS = details.abnormalInfo.zeroGoodsArr;
-          submitData.num = _handleNum;
         }
         const res = await postDealAbnormal(submitData);
 
@@ -534,6 +555,26 @@ const handleAbnormal = (dealType, title) => {
     })
     .catch(() => {});
 };
+
+/** 批量处理异常 */
+const handleBatchAbnormarl = () => {
+  if (details.selectionList.length === 0) return ElMessage.warning('请选择需要处理的异常数据');
+
+  const _abnormalType = details.selectionList[0].abnormalType;
+
+  for (let i = 0; i < details.selectionList.length; i++) {
+    const val = details.selectionList[i];
+
+    if (Number(val.abnormalStatus) === 1) return ElMessage.warning('存在已处理的异常数据，请移除');
+    if (_abnormalType !== val.abnormalType) return ElMessage.warning('批量处理仅支持同一异常类型');
+    if (Number(val.isZero) === 1) return ElMessage.warning('零担数据不支持批量操作，请移除');
+  }
+
+  details.abnormalInfo = { ...details.selectionList[0] };
+
+  details.isBatch = true;
+  details.popUpShow.abnormalVisited = true;
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/finance/CustomerSettlement.vue b/src/views/finance/CustomerSettlement.vue
index a623fa6e..ceb60651 100644
--- a/src/views/finance/CustomerSettlement.vue
+++ b/src/views/finance/CustomerSettlement.vue
@@ -55,7 +55,7 @@
           background
           @size-change="sizeChange"
           @current-change="currentChange"
-          :current-page="page.currentPage"
+          :current-page="page.pageNum"
           :page-sizes="[30, 50, 80, 120]"
           :page-size="page.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
@@ -154,7 +154,7 @@ const details = reactive<any>({
   drawerShow: false,
   /** 分页参数 */
   page: {
-    currentPage: 1,
+    pageNum: 1,
     pageSize: 30,
     total: 0,
   },
@@ -220,7 +220,7 @@ const searchChange = () => {
 /** 清空表单 */
 const searchReset = () => {
   details.query = {};
-  details.page.currentPage = 1;
+  details.page.pageNum = 1;
   handleClearTableQuery(details.columnList);
   initOnLoad();
 };
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index 9977993d..bba46ca9 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -697,8 +697,8 @@ const details = reactive<any>({
         value: '',
         checkArr: [],
         rule: [
-          { required: true, message: '请输入服务号', trigger: 'change' },
-          { required: true, message: '请输入服务号', trigger: 'blur' },
+          // { required: true, message: '请输入服务号', trigger: 'change' },
+          // { required: true, message: '请输入服务号', trigger: 'blur' },
         ],
       },
       {
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index b749aff4..ff7a76aa 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -19,6 +19,26 @@
               placeholder="支持多运单查询,逗号拼接"
             ></el-input>
           </el-form-item>
+
+          <el-form-item label="目的仓:">
+            <el-select
+              v-model="details.query.destinationWarehouseIds"
+              class="w100"
+              clearable
+              placeholder="请选择目的仓"
+              filterable
+              multiple
+              :reserve-keyword="false"
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="制单时间:" class="el-times">
             <el-date-picker
               v-model="details.query.documentMakingTime"
@@ -298,6 +318,7 @@ import { useRouter } from 'vue-router';
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getToken } from '@/utils/auth';
+import { getListName } from '@/api/basicdata/basicdataVehicle';
 import type { UploadProps, UploadUserFile } from 'element-plus';
 import { utils } from 'sortablejs';
 
@@ -392,6 +413,7 @@ const details = reactive<any>({
     return { 'Blade-Auth': 'Bearer ' + getToken() };
   }),
   html: '',
+  warehouseOption: [],
 });
 
 const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page, popUpShow } =
@@ -473,6 +495,13 @@ const onLoad = async (page?: any, params = {}) => {
       submitData.waybillNoList = submitData.waybillNoList.replaceAll('，', ',').split(',');
     } else delete submitData.waybillNoList;
 
+    for (const key in submitData) {
+      const value = submitData[key];
+
+      if (getObjType(value) === 'string' && !value) delete submitData[key];
+      else if (getObjType(value) === 'array' && value.length === 0) delete submitData[key];
+    }
+
     delete submitData.createTime;
     delete submitData.documentMakingTime;
 
@@ -944,6 +973,13 @@ const handleExport = () => {
         submitData.waybillNoList = submitData.waybillNoList.replaceAll('，', ',').split(',');
       } else delete submitData.waybillNoList;
 
+      for (const key in submitData) {
+        const value = submitData[key];
+
+        if (getObjType(value) === 'string' && !value) delete submitData[key];
+        else if (getObjType(value) === 'array' && value.length === 0) delete submitData[key];
+      }
+
       delete submitData.createTime;
       delete submitData.documentMakingTime;
 
@@ -963,6 +999,18 @@ const handleExport = () => {
     }
   });
 };
+
+/** 初始化请求仓库数据 */
+getListName({ name: '' }).then(res => {
+  const { code, data } = res.data;
+  if (code !== 200 || getObjType(data) !== 'array') return;
+  details.warehouseOption = data.map(val => {
+    return {
+      dictKey: val.id,
+      dictValue: val.name,
+    };
+  });
+});
 </script>
 
 <style scoped lang="scss">
@@ -1016,6 +1064,10 @@ const handleExport = () => {
   //   }
   // }
 }
+
+:deep(.header_search) {
+  align-items: start;
+}
 </style>
 
 <style>