From a1055a316f1a1ed28852afab0a9563505a96ccae Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Sat, 19 Oct 2024 20:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/addVehicleStowage.js  | 11 +++
 .../distribution/artery/AddVehicleStowage.vue | 96 +++++++++++++------
 .../distribution/reservation/reservation.vue  | 14 +--
 .../reservation/reservationMarket.vue         | 12 +--
 .../reservation/reservationSelf.vue           | 12 +--
 src/views/mail/reservation/list.vue           |  4 +-
 6 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index a84b3ee6..a2b3df4a 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -227,6 +227,17 @@ export const columnList = [
     sortable: true,
     isshowSummary: false,
   },
+  {
+    prop: 'shipperName',
+    label: '发货人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: false,
+  },
   {
     prop: 'consignee',
     label: '收货单位',
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 41e2ba0d..27ec20ef 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -314,24 +314,48 @@
               <!-- 搜索区域 -->
               <div v-h5uShow="!search">
                 <el-form inline label-width="80px" :model="details.oldQuery" class="el-fr-d">
-                  <!-- <el-form-item label="订单号" class="el-times">
-                    <el-input v-model.trim="query.orderCode" clearable></el-input>
+                  <el-form-item label="关键词" style="width: 100%" class="el-times">
+                    <el-input
+                      v-model.trim="query.orderCode"
+                      placeholder="请输入运单/发货人/收货人/收货单位"
+                      clearable
+                    ></el-input>
                   </el-form-item>
+
                   <el-form-item label="目的网点" class="el-times">
-                    <el-input></el-input>
+                    <el-select
+                      v-model="details.query.destinationWarehouseName"
+                      class="w100"
+                      clearable
+                      placeholder="请选择目的仓"
+                      filterable
+                      multiple
+                    >
+                      <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-input></el-input>
+                    <el-input v-model="query.destination" clearable></el-input>
                   </el-form-item>
-                  <el-form-item label="目标品类" class="el-times">
-                    <el-input></el-input>
+
+                  <el-form-item label="品类名称" class="el-times">
+                    <el-input v-model="query.goodsName" clearable></el-input>
                   </el-form-item>
+
                   <el-form-item label="备注" class="el-times">
-                    <el-input></el-input>
+                    <el-input v-model="query.remark" clearable></el-input>
                   </el-form-item>
+
                   <el-form-item label="托盘码" class="el-times">
-                    <el-input></el-input>
-                  </el-form-item> -->
+                    <el-input v-model="query.taryName" clearable></el-input>
+                  </el-form-item>
+
                   <el-form-item label="开单时间" class="el-times">
                     <el-date-picker
                       v-model="query.openTime"
@@ -432,24 +456,24 @@
                   :model="details.newQuery"
                   class="el-fr-d"
                 >
-                  <!-- <el-form-item label="关键词" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item>
-                    <el-form-item label="目的网点" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item>
-                    <el-form-item label="到站" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item>
-                    <el-form-item label="目标品类" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item>
-                    <el-form-item label="备注" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item>
-                    <el-form-item label="托盘码" class="el-times">
-                      <el-input></el-input>
-                    </el-form-item> -->
+                  <el-form-item label="关键词" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
+                  <el-form-item label="目的网点" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
+                  <el-form-item label="到站" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
+                  <el-form-item label="目标品类" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
+                  <el-form-item label="备注" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
+                  <el-form-item label="托盘码" class="el-times">
+                    <el-input></el-input>
+                  </el-form-item>
                   <el-form-item label="开单时间" class="el-times">
                     <el-date-picker
                       v-model="item.timeQuery.createTimeArr"
@@ -765,6 +789,7 @@ import {
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useStore } from 'vuex';
+import { getListName } from '@/api/basicdata/basicdataVehicle';
 import type { FormInstance, FormRules } from 'element-plus';
 
 // 获取节点信息列表, 除开节点名称
@@ -960,6 +985,7 @@ const details = reactive<any>({
   /** 当前所在仓库 */
   warehouseId: '',
   warehouseName: '',
+  warehouseOption: [],
 });
 
 /** 始发仓数据 */
@@ -1001,6 +1027,18 @@ onMounted(() => {
   setTabelHeight();
 });
 
+/** 初始化请求仓库数据 */
+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,
+    };
+  });
+});
+
 // 清空复选框
 const clearSelectionList = () => {
   details.selectionList = [];
@@ -2566,4 +2604,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 :deep(.el-tabs__item.is-active) {
   font-weight: bold;
 }
+
+:deep(.el-form-item__content) {
+  width: 250px !important;
+}
 </style>
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 110caf93..6ee485c0 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -111,7 +111,7 @@
                 >取消预约
               </el-text>
               <el-text
-                v-if="this.queryA.reservationStatus === '1' && permissionList.Confirm_appointment"
+                v-if="this.queryA.reservationStatus === '10' && permissionList.Confirm_appointment"
                 size="small"
                 @click="confirmReservation(slotProps.scope)"
                 >确认预约
@@ -241,7 +241,7 @@
                   </el-text>
                   <el-text
                     v-if="
-                      this.queryB.reservationStatus === '1' && permissionList.Confirm_appointment
+                      this.queryB.reservationStatus === '10' && permissionList.Confirm_appointment
                     "
                     size="small"
                     @click="confirmReservation(slotProps.scope)"
@@ -980,12 +980,12 @@ export default {
         // 未
         nulName = '待确定预约单数据.xlsx';
         row = { ...row, ...this.queryA };
-        row.reservationStatus = '1';
+        row.reservationStatus = '10';
       } else {
         // 已
         nulName = '已确定预约单数据.xlsx';
         row = { ...row, ...this.queryB };
-        row.reservationStatus = '2';
+        row.reservationStatus = '20';
       }
       reservationExport(row).then(res => {
         console.log(res.data);
@@ -1305,11 +1305,11 @@ export default {
       });
     },
     aaa() {
-      this.queryA.reservationStatus = '1';
+      this.queryA.reservationStatus = '10';
       this.onLoad(this.page);
     },
     bbb() {
-      this.queryB.reservationStatus = '2';
+      this.queryB.reservationStatus = '20';
       this.onLoad(this.page);
     },
     handleView(row) {
@@ -1512,7 +1512,7 @@ export default {
         //   this.query.reservationStatus = '1';
         // }
         let query = this.queryB;
-        query.reservationStatus = '2';
+        query.reservationStatus = '20';
         console.log('this.activename :>> ', this.activename);
         if (this.activename === 'nocheck') {
           console.log('123123 :>> ', 123123);
diff --git a/src/views/distribution/reservation/reservationMarket.vue b/src/views/distribution/reservation/reservationMarket.vue
index f7cc70a5..f6f46d97 100644
--- a/src/views/distribution/reservation/reservationMarket.vue
+++ b/src/views/distribution/reservation/reservationMarket.vue
@@ -17,7 +17,7 @@
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
             <el-button
-              v-if="this.query.reservationStatus === '1'"
+              v-if="this.query.reservationStatus === '10'"
               type="danger"
               icon="el-icon-delete"
               @click="handleConfirmReservations"
@@ -25,7 +25,7 @@
               >批量确认
             </el-button>
             <el-button
-              v-if="this.query.reservationStatus === '2'"
+              v-if="this.query.reservationStatus === '20'"
               type="danger"
               icon="el-icon-delete"
               @click="handleStockUp"
@@ -33,7 +33,7 @@
               >批量转备货</el-button
             >
             <el-button
-              v-if="this.query.reservationStatus === '2'"
+              v-if="this.query.reservationStatus === '20'"
               type="danger"
               icon="el-icon-delete"
               @click="handleDeliverys"
@@ -652,11 +652,11 @@ export default {
       });
     },
     aaa() {
-      this.query.reservationStatus = '1';
+      this.query.reservationStatus = '10';
       this.onLoad(this.page);
     },
     bbb() {
-      this.query.reservationStatus = '2';
+      this.query.reservationStatus = '20';
       this.onLoad(this.page);
     },
     handleView(row) {
@@ -778,7 +778,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       if (!this.query.reservationStatus) {
-        this.query.reservationStatus = '1';
+        this.query.reservationStatus = '10';
       }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
diff --git a/src/views/distribution/reservation/reservationSelf.vue b/src/views/distribution/reservation/reservationSelf.vue
index 3346ee1e..640ed394 100644
--- a/src/views/distribution/reservation/reservationSelf.vue
+++ b/src/views/distribution/reservation/reservationSelf.vue
@@ -17,7 +17,7 @@
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
             <el-button
-              v-if="this.query.reservationStatus === '1'"
+              v-if="this.query.reservationStatus === '10'"
               type="danger"
               icon="el-icon-delete"
               @click="handleConfirmReservations"
@@ -25,7 +25,7 @@
               >批量确认
             </el-button>
             <el-button
-              v-if="this.query.reservationStatus === '2'"
+              v-if="this.query.reservationStatus === '20'"
               type="danger"
               icon="el-icon-delete"
               @click="handleStockUp"
@@ -33,7 +33,7 @@
               >批量转备货</el-button
             >
             <el-button
-              v-if="this.query.reservationStatus === '2'"
+              v-if="this.query.reservationStatus === '20'"
               type="danger"
               icon="el-icon-delete"
               @click="handleDeliverys"
@@ -651,11 +651,11 @@ export default {
       });
     },
     aaa() {
-      this.query.reservationStatus = '1';
+      this.query.reservationStatus = '10';
       this.onLoad(this.page);
     },
     bbb() {
-      this.query.reservationStatus = '2';
+      this.query.reservationStatus = '20';
       this.onLoad(this.page);
     },
     handleView(row) {
@@ -777,7 +777,7 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       if (!this.query.reservationStatus) {
-        this.query.reservationStatus = '1';
+        this.query.reservationStatus = '10';
       }
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
diff --git a/src/views/mail/reservation/list.vue b/src/views/mail/reservation/list.vue
index 2c680e94..97d14ad5 100644
--- a/src/views/mail/reservation/list.vue
+++ b/src/views/mail/reservation/list.vue
@@ -810,12 +810,12 @@ export default {
         // 未
         nulName = '待确定预约单数据.xlsx';
         row = { ...row, ...this.queryA };
-        row.reservationStatus = '1';
+        row.reservationStatus = '10';
       } else {
         // 已
         nulName = '已确定预约单数据.xlsx';
         row = { ...row, ...this.queryB };
-        row.reservationStatus = '2';
+        row.reservationStatus = '20';
       }
       reservationExport(row).then(res => {
         console.log(res.data);