From bb4850a5c2015dcda3915f6b4f8b03059fac2f2d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 20 Mar 2024 16:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/abnormalList.js       | 170 ++++++++
 .../distribution/artery/abnormalList.vue      | 394 ++++++++++++++++++
 .../distributionDeliveryListedt.vue           |   4 +-
 .../distribution/reservation/reservation.vue  |  99 +++--
 4 files changed, 621 insertions(+), 46 deletions(-)
 create mode 100644 src/option/distribution/abnormalList.js
 create mode 100644 src/views/distribution/artery/abnormalList.vue

diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js
new file mode 100644
index 00000000..260a6c75
--- /dev/null
+++ b/src/option/distribution/abnormalList.js
@@ -0,0 +1,170 @@
+/** 自提详情内表格 */
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'billladingCode',
+    label: '类型',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '异常状态',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'driverName',
+    label: '车类型',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carNumber',
+    label: '上报仓库',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carsNo',
+    label: '车次号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillNo',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '上报人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'trayCode',
+    label: '状态',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'firstPickName',
+    label: '处理人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'secondPickName',
+    label: '处理时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'materialName',
+    label: '上报时间',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+  },
+];
diff --git a/src/views/distribution/artery/abnormalList.vue b/src/views/distribution/artery/abnormalList.vue
new file mode 100644
index 00000000..922b4e82
--- /dev/null
+++ b/src/views/distribution/artery/abnormalList.vue
@@ -0,0 +1,394 @@
+<template>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search">
+          <el-form-item label="有效状态">
+            <el-select class="w100" v-model="query.value" clearable placeholder="有效状态">
+              <el-option label="有效" value="item.value" />
+              <el-option label="作废" value="item.value" />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="运单号:" class="el-times">
+            <el-input v-model="query.stockupArea" clearable placeholder="请输入运单号"></el-input>
+          </el-form-item>
+          <el-form-item label="制单时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="创建时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="送货时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+
+          <el-form-item label="签收时间:" class="el-times">
+            <el-date-picker
+              v-model="stockupDate"
+              type="daterange"
+              unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              :shortcuts="shortcuts"
+              clearable
+            />
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <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 class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left"></div>
+        <!-- 头部右侧按钮模块 -->
+        <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>
+        </div>
+      </div>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '运单号'">
+            <el-text @click="handleGoWaybillDetails(slotProps.scope)">
+              {{ slotProps.scope.row.waybillNo }}
+            </el-text>
+          </template>
+
+          <template v-else-if="slotProps.scope.column.label === '操作'">
+            <el-text @click="handleUploadReceipt(slotProps.scope)"> 上传回单 </el-text>
+            <el-text @click="handleViewOrderDetails(slotProps.scope)"> 查看订单 </el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </basic-container>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @setcolum="setnewcolum"
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    :columnList="details.columnList"
+  ></edittablehead>
+</template>
+
+<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';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util';
+import { columnList } from '@/option/distribution/abnormalList';
+import { useRouter } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import { getToken } from '@/utils/auth';
+
+// 获取路由实例
+const $router = useRouter();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 时间选择器数据 */
+  stockupDate: [],
+  /** 列表 */
+  columnList,
+  /** 列表数据 */
+  data: [],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    packageListLoading: false,
+    /** 页面loading */
+    pageLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    pageNum: 1,
+    pageSize: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 上传回单 */
+    view: false,
+    /** 运单打印模版 */
+    WaybillPrintTemplate: false,
+    /** 图片预览 */
+    dialogVisible: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+    WaybillPrintTemplate: false,
+  },
+});
+
+const {
+  search,
+  query,
+  shortcuts,
+  stockupDate,
+  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');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = async (page?: any, params = {}) => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    if (page) _page = page;
+    // 获取暂存单列表
+    // const res = await postWarehouseWaybillPageWaybillList(details.page, {
+    //   ...details.query,
+    //   ...params,
+    // });
+    // console.log('res :>> ', res);
+    // const { code, data } = res.data;
+    // if (code !== 200) return;
+    // details.data = data.records;
+    // details.page.total = data.total;
+  } catch (error) {
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+onLoad();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad(details.page);
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.stockupDate = [];
+  details.page.currentPage = 1;
+  onLoad(details.page);
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(details.listNode, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  details.query[row.prop] = index;
+  onLoad(details.page);
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  details.query[row.prop] = index;
+  if (!index) delete details.query[row.prop];
+  if (row.prop === 'certificateTypeName') {
+    details.query['certificateType'] = index;
+    if (!index) delete details.query['certificateType'];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (pageSize: number) => {
+  details.page.pageSize = pageSize;
+  onLoad(details.page);
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.pageNum = current;
+  onLoad();
+};
+
+/**
+ * 设置列表 -- 固定函数
+ * 弹窗的勾选回调，用于更改头部数组
+ * 固定搭配，只需要更换   columnList
+ *  */
+const setnewcolum = (newarr, headarr, type) => {
+  if (type == 1) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'checkList', headarr);
+  } else if (type == 2) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'flexList', headarr);
+  } else if (type == 3) {
+    details.columnList = newarr;
+    functions.setStorage(window.location.pathname + 'sortlist', headarr);
+  }
+};
+
+/** 弹出层开启前清除数据 */
+const beforeClose = done => {
+  done();
+  details.form = {};
+  details.selectionList = [];
+  details.view = false;
+};
+</script>
+
+<style scoped lang="scss">
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+</style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 01322f0f..791ed442 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -2112,7 +2112,7 @@ export default {
         {
           prop: 'signingStatusName',
           label: '签收状态',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -2199,7 +2199,7 @@ export default {
         {
           prop: 'pallet',
           label: '托盘码',
-          type: 2,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index ba12965a..85cfbcc9 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
@@ -136,15 +136,9 @@
                     <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                       >添加预约
                     </el-button>
-                    <el-button type="danger"  @click="handleStockUp()" plain
-                      >批量转备货
-                    </el-button>
-                    <el-button type="danger"  @click="handleDeliverys" plain
-                      >批量转配送
-                    </el-button>
-                    <el-button type="danger"  @click="batchPrintData" plain
-                      >批量打印
-                    </el-button>
+                    <el-button type="danger" @click="handleStockUp()" plain>批量转备货 </el-button>
+                    <el-button type="danger" @click="handleDeliverys" plain>批量转配送 </el-button>
+                    <el-button type="danger" @click="batchPrintData" plain>批量打印 </el-button>
                     <el-button
                       type="danger"
                       icon="el-icon-download"
@@ -253,7 +247,7 @@
       </el-row>
 
       <el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
-        <div>
+        <div class="printQr">
           <div v-html="html"></div>
         </div>
         <span slot="footer" class="dialog-footer">
@@ -852,20 +846,10 @@ export default {
       /** loading */
       loadingObj: {
         submitLoading: false,
+        pageLoading: false,
       },
     };
   },
-  watch: {
-    // '$route.query.reservationId': {
-    // handler(newVal, oldVal) {
-    //   console.log(newVal, oldVal);
-    //   // this.fetchData();
-    //   this.onLoad(this.page);
-    // },
-    // deep: false,
-    // immediate: true,
-    // }
-  },
   mounted() {
     this.init();
     this.onLoad(this.page);
@@ -1587,17 +1571,24 @@ export default {
         });
         return;
       }
-      const ids = this.selectionList.map(item => item.id);
-      this.html = '';
-      const res = await this.batchPrint(ids);
-      const { code, data } = res.data;
-      if (code === 200) {
-        this.dialogVisible = true;
-        console.log('data :>> ', data);
-        data.forEach(item => {
-          return (this.html += item.templateHtml);
-        });
-        this.html;
+      try {
+        this.loadingObj.pageLoading = true;
+
+        const ids = this.selectionList.map(item => item.id);
+        this.html = '';
+        const res = await this.batchPrint(ids);
+        const { code, data } = res.data;
+        if (code === 200) {
+          this.dialogVisible = true;
+          console.log('data :>> ', data);
+          data.forEach(item => {
+            return (this.html += item.templateHtml);
+          });
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
@@ -1605,16 +1596,35 @@ export default {
      * 单独打印
      */
     async printData(rowData) {
-      this.html = '';
-      const res = await this.batchPrint([rowData.row.id]);
-      const { code, data } = res.data;
-      if (code === 200) {
-        this.dialogVisible = true;
-        console.log('data :>> ', data);
-        data.forEach(item => {
-          return (this.html += item.templateHtml);
-        });
-        this.html;
+      // this.html = '';
+      // const res = await this.batchPrint([rowData.row.id]);
+      // const { code, data } = res.data;
+      // if (code === 200) {
+      //   this.dialogVisible = true;
+      //   console.log('data :>> ', data);
+      //   data.forEach(item => {
+      //     return (this.html += item.templateHtml);
+      //   });
+      // }
+
+      try {
+        this.loadingObj.pageLoading = true;
+
+        this.html = '';
+        const res = await this.batchPrint([rowData.row.id]);
+
+        const { code, data } = res.data;
+        if (code === 200) {
+          this.dialogVisible = true;
+          console.log('data :>> ', data);
+          data.forEach(item => {
+            return (this.html += item.templateHtml);
+          });
+        }
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
       }
     },
 
@@ -1622,7 +1632,8 @@ export default {
      * 调用打印机
      */
     printTemplate() {
-      const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+      // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
+      const orderNodeList = document.querySelectorAll('.printQr>div>div');
       print(orderNodeList);
     },