fix：样式+楼层

src/pages/components/Sented.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="container">
         <div style="display: flex; justify-content: space-between; background-color: #fff;">
-            <van-search style="width: 100%;" v-model="params.search" placeholder="请输入批次号" />
-            <van-icon @click="onSearch" size="20" style="margin: 19px 8px 0 0px;" name="search" />
+            <van-search @search="onSearch" style="width: 100%;" v-model="params.search" placeholder="请输入批次号" />
+            <!-- <van-icon @click="onSearch" size="20" style="margin: 19px 8px 0 0px;" name="search" /> -->
         </div>
         <ScrollRefresh height="calc(100vh - 99px)" ref="scrollRefresh" :request="request" :defaultLimit="6">
             <template v-slot="slotProps">
@@ -32,11 +32,11 @@
                 <div class="batch-middel-text">
                     <div class="batch-middel-text-style" style="width: 100%; margin-left: -4px;margin-top: 0px;">【{{
                         item.expressCompany
-                    }}】运单号:{{
+                        }}】运单号:{{
                             item.expressNo }}</div>
                     <div class="batch-middel-text-style">收件人：{{ item.recipient }}</div>
                     <div class="batch-middel-text-style">部门：{{ item.departmentId }}</div>
-                    <div class="batch-middel-text-style">楼层：{{ item.floor }}</div>
+                    <div class="batch-middel-text-style">楼层：{{ item.floorNum }}</div>
                     <div class="batch-middel-text-style">座位号：{{ item.sendSeat }}</div>
                     <div style="display: flex;" class="batch-middel-text-style">联系方式:{{ item.phone }} </div>
                     <div class="batch-middel-text-style">当前状态:
@@ -205,7 +205,7 @@ export default {
 }
 
 .batch-middel {
-    background-color: #f2f2f2;
+    background-color: #f7f8fa;
     border-radius: 12px;
     padding: 10px 8px;
     height: auto;

src/pages/components/Waitsent.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="container">
         <div class="container-searchNumber">
-            <van-search style="width: 100%;" v-model="params.search" placeholder="请输入批次号" />
-            <van-icon class="container-searchNumber-icon" @click="onSearch" size="20" name="search" />
+            <van-search @search="onSearch" style="width: 100%;" v-model="params.search" placeholder="请输入批次号" />
+            <!-- <van-icon class="container-searchNumber-icon" @click="onSearch" size="20" name="search" /> -->
         </div>
         <ScrollRefresh style="background-color: #f0eff4;" height="calc(100vh - 99px)" ref="scrollRefresh"
             :request="request">
@@ -26,7 +26,7 @@
                                 <div style="display: flex; justify-content:  space-between; flex-wrap: wrap;">
                                     <div class="batch-middel-text-style">收件人：{{ unfold.recipient }}</div>
                                     <div class="batch-middel-text-style">部门：{{ unfold.departmentId }}</div>
-                                    <div class="batch-middel-text-style">楼层：{{ unfold.floor }}</div>
+                                    <div class="batch-middel-text-style">楼层：{{ unfold.floorNum }}</div>
                                     <div class="batch-middel-text-style">座位号：{{ unfold.sendSeat }}</div>
                                     <div style="display: flex;" class="batch-middel-text-style">联系方式:{{ unfold.phone }}
                                         <a :href="'tel:' + unfold.phone" style="padding-left: 6px;" type="info" plain
@@ -59,7 +59,7 @@
 
 
         <!-- 签收 -->
-        <van-popup v-model="receiving" style="width: 100%; height: 84%;">
+        <van-popup position="bottom" v-model="receiving" style="width: 100%; height: 90%;">
             <div style="font-size: 20px; text-align: center; margin-top: 12px;">派件签收</div>
             <van-form @submit="onReceipt">
                 <van-field name="expressNo" label="运单号" :value="onReceivingVlaue.expressNo" readonly />
@@ -68,7 +68,7 @@
                 <van-field label="部门" :value="onReceivingVlaue.departmentId" readonly />
                 <van-field label="座位号" :value="onReceivingVlaue.sendSeat" readonly />
                 <van-field label="收件人" :value="onReceivingVlaue.recipient" readonly />
-                <van-field label="楼层" :value="onReceivingVlaue.floor" readonly />
+                <van-field label="楼层" :value="onReceivingVlaue.floorNum" readonly />
                 <van-field label="联系方式" :value="onReceivingVlaue.phone" readonly />
 
                 <van-field readonly clickable name="picker" :value="selectedOption" label="签收类型" placeholder="点击签收类型"
@@ -92,7 +92,7 @@
         </van-popup>
 
         <!-- 设为滞留 -->
-        <van-popup v-model="retention" style="width: 100%; height: 75%;">
+        <van-popup position="bottom" v-model="retention" style="width: 100%; height: 85%;">
             <div style="font-size: 20px; text-align: center; ">派件滞留</div>
             <van-form @submit="onSetRetention">
                 <van-field name="expressNo" label="运单号" :value="onSureRetentionVlaue.expressNo" readonly />
@@ -101,7 +101,7 @@
                 <van-field label="部门" :value="onSureRetentionVlaue.departmentId" readonly />
                 <van-field label="座位号" :value="onSureRetentionVlaue.sendSeat" readonly />
                 <van-field label="收件人" :value="onSureRetentionVlaue.recipient" readonly />
-                <van-field label="楼层" :value="onSureRetentionVlaue.floor" readonly />
+                <van-field label="楼层" :value="onSureRetentionVlaue.floorNum" readonly />
                 <van-field label="联系方式" :value="onSureRetentionVlaue.phone" readonly />
 
                 <van-field readonly clickable name="picker" :value="selectedRetention" label="滞留原因" placeholder="点击签收类型"
@@ -215,9 +215,8 @@ export default {
             if (res.code == 0) {
                 this.$toast('滞留完成')
                 this.retention = false
-                // this.request()
-                this.$router.push('/DeliveryInquiry')
             }
+            this.$refs.scrollRefresh.onRefresh()
         },
         // 原因
         onRetention(value) {

src/pages/new/removal.vue

@@ -45,8 +45,12 @@ export default {
             isRemoval: true,
             BatDispatchBatchNo: '',//传过去的生成的快递单号
             codesList: [],//传过去的数据
+            floorId: '',//楼层id
         };
     },
+    mounted() {
+        // this.floorId = this.$store.state.user.expressScope
+    },
     methods: {
         onImg() {
             wx.scanQRCode({
@@ -93,7 +97,8 @@ export default {
             let data = {
                 deliveryPeopleId: localStorage.getItem('courierId'), //派送员id
                 deliveryId: this.codes.join(','),    //快件单号
-                dispatchBatchNo: getCompanyExpressNo()    //批次号
+                dispatchBatchNo: getCompanyExpressNo(),    //批次号
+                // floor:expressScope
             }
             const res = await appDeliveryPersonDeliveries({ ...data }, { emulateJSON: true })
             if (res.msg == 'success') {

src/pages/new/storage.vue

@@ -26,8 +26,7 @@
                     readonly />
                 <van-field :value="onGroupObject.mailRoomName" name="mailRoom" label="所属收发室" placeholder="自动填充"
                     readonly />
-                <van-field :value="onGroupObject.mailFloor" name="departmentId" label="收件人楼层" placeholder="自动填充"
-                    readonly />
+                <van-field :value="onGroupObject.floorNum" name="" label="收件人楼层" placeholder="自动填充" readonly />
                 <van-field :value="onGroupObject.seat_no" name="sendSeat" label="收件人座位" placeholder="自动填充" readonly />
 
                 <van-field name="expressType" label="快件类型">
@@ -124,11 +123,13 @@ export default {
             shelfs: ['货架A', '货架B', '货架C'], //收发室
             shelf: false, //收发室
             pattern: /^[0-9]*$/,
+            floorId: '',
 
         };
     },
     mounted() {
         this.getUser()
+        this.floorId = this.$store.state.user.expressScope
     },
     methods: {
         // 快递单号
@@ -203,6 +204,7 @@ export default {
 
             // const phone = values.phone.split(",")[0]
             const params = {
+
                 isCompany: this.isCompany,
                 mailRoomId: this.onGroupObject.ROOM_ID,//收发室Id
                 // payMoney,
@@ -219,6 +221,7 @@ export default {
                 // phone
                 // remark,
             }
+
             const originalObj = {
                 isPayOnDelivery: values.isPayOnDelivery == true ? '是' : '否',
             };
@@ -226,7 +229,8 @@ export default {
                 ...values,
                 ...originalObj
             }
-            const res = await appSaveExpressRecord({ ...params, ...value }, { emulateJSON: true })
+            console.log(value, '==========================value ')
+            const res = await appSaveExpressRecord({ ...params, ...value, departmentId: this.onGroupObject.departmentName }, { emulateJSON: true })
             this.value14 = this.object.value4
             console.log(res[0], 'res===')
             if (res.msg == 'success') {