sunChengjie hai 1 ano
pai
achega
0b59189268
Modificáronse 2 ficheiros con 15 adicións e 32 borrados
  1. 1 1
      src/pages/components/HomePage.vue
  2. 14 31
      src/pages/components/Waitsent.vue

+ 1 - 1
src/pages/components/HomePage.vue

@@ -99,7 +99,7 @@ export default {
 			let myChart = this.$echarts.init(document.getElementById('myChart1'))
 			var option = {
 				tooltip: {
-					show: false,
+					// show: false,
 					trigger: 'item'
 				},
 				legend: {

+ 14 - 31
src/pages/components/Waitsent.vue

@@ -2,16 +2,13 @@
     <div class="container">
         <div class="container-searchNumber">
             <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">
             <template v-slot="slotProps">
                 <div class="batch" v-for="(item, index) in slotProps.list" :key="index">
                     <div class="batch-top">
-                        <div class="batch-top-dispatchBatchNo">批次号:{{ item.dispatchBatchNo
-                            }}
-                        </div>
+                        <div class="batch-top-dispatchBatchNo">批次号:{{ item.dispatchBatchNo }}</div>
                         <div class="jindu">派送进度 {{ item.signed }}/{{ item.sumAnd }}</div>
                     </div>
                     <!-- 各个运单 -->
@@ -21,20 +18,19 @@
                             <div class="batch-middel-text">
                                 <div class="batch-middel-text-style"
                                     style="text-align: left; width: 100%; margin-left: -6px; display: flex;justify-content: space-between; align-items: center;">
-                                    <div> 【{{ unfold.expressCompany }}】运单号:{{ unfold.expressNo }}</div>
-                                    <div
+                                    <div>【{{ unfold.expressCompany }}】运单号:{{ unfold.expressNo }}</div>
+                                    <div class="batch-middel-text-style-corner"
                                         :style="{ color: unfold.expressStatus == 0 ? '#00c4b8' : (unfold.expressStatus == 1 ? '#4fc1f1' : (unfold.expressStatus == 2 ? '#fbc015' : '#ee0a24')) }">
                                         {{ unfold.expressStatus == 0 ? '已入库' : `${unfold.expressStatus == 1 ? '派送中' :
                                             `${unfold.expressStatus == 2 ? '已签收' : '滞留件'}`}` }}</div>
-
                                 </div>
                                 <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.floorNum }}</div>
                                     <div class="batch-middel-text-style">座位号:{{ unfold.sendSeat }}</div>
-                                    <div style="display: flex;" class="batch-middel-text-style">联系方式:{{ unfold.phone }}
-
+                                    <div style="display: flex; align-items: center;" class="batch-middel-text-style">
+                                        联系方式:{{ unfold.phone }}
                                         <a :href="'tel:' + unfold.phone" style="padding-left: 6px;" type="info" plain
                                             size="mini"><van-icon color="#359cc6" size="14" name="phone-o" /></a>
                                     </div>
@@ -51,10 +47,6 @@
                                     class="batch-middel-bottom-buttom" size="small" plain type="danger"
                                     @click="onSureRetention(unfold)">设为滞留</van-button>
                             </div>
-                            <!-- <div class="batch-middel-bottom" v-if="unfold.expressStatus === '2'">
-                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="info">已签收
-                                </van-button>
-                            </div> -->
                         </div>
                     </div>
 
@@ -63,12 +55,10 @@
                             {{ item.openCard ? "收起....." : "展开....." }}
                         </div>
                     </div>
-
                 </div>
             </template>
         </ScrollRefresh>
 
-
         <!-- 签收 -->
         <van-popup position="bottom" v-model="receiving" style="width: 100%; height: 90%;">
             <div style="font-size: 20px; text-align: center; margin-top: 12px;">派件签收</div>
@@ -157,7 +147,6 @@ export default {
             wer: '',
             ert: '',
             uploader: [],
-
             params: {
                 search: '', //'SF202303221917',
             },
@@ -167,10 +156,6 @@ export default {
             getFileUrl: '',//返回的图片地址
         };
     },
-    mounted() {
-        // 获取数据
-        // this.getData();
-    },
     methods: {
         //
         batchsFilter(list, openCard) {
@@ -181,7 +166,6 @@ export default {
                 return list
             }
             return []
-
         },
         // 搜索批次号
         async onSearch() {
@@ -193,7 +177,6 @@ export default {
                 deliveryPeopleId: localStorage.getItem('courierId'), //派送员id
                 isFinish: '2',//完成 1已完成 2未完成
                 ..._params
-
             }
             const res = await appOutboundInquiry({ ...parmas }, { emulateJSON: true })
             res.data = res.data.map((item) => {
@@ -201,8 +184,7 @@ export default {
                 return item
             })
             return res
-        }
-        ,
+        },
         // 签收控制显示
         onReceiving(value) {
             this.onReceivingVlaue = value
@@ -218,7 +200,6 @@ export default {
         },
         // 滞留控制显示
         onSureRetention(value) {
-
             this.onSureRetentionVlaue = value
             this.retention = true;
         },
@@ -239,7 +220,6 @@ export default {
             }
             this.otherCause = ''
             this.$refs.scrollRefresh.onRefresh()
-
         },
         // 原因
         onRetention(value) {
@@ -308,8 +288,6 @@ export default {
     font-size: 12px;
 }
 
-.batchss {}
-
 .container {
     height: 100%;
 
@@ -333,7 +311,7 @@ export default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            padding: 10px 6px 6px 6px;
+            padding: 10px 10px 0px 10px;
 
             &-dispatchBatchNo {
                 font-size: 12px;
@@ -349,7 +327,7 @@ export default {
             // height: 120px;
             background-color: #f7f8fa;
             border-radius: 12px;
-            margin: 10px 6px;
+            margin: 10px 6px 0px;
             padding-bottom: 8px;
 
             &-text {
@@ -359,6 +337,11 @@ export default {
                     width: 50%;
                     font-size: 12px;
                     padding-top: 8px;
+
+                    &-corner {
+                        width: 41px;
+                        margin-right: -14px;
+                    }
                 }
 
             }
@@ -372,7 +355,7 @@ export default {
                     width: 70px;
                     height: 25px;
                     border-radius: 6px;
-                    margin-right: 12px
+                    margin-right: 5px
                 }
             }
         }