sunChengjie 1 éve
szülő
commit
ffa24e1b04

+ 2 - 2
src/api/index.js

@@ -198,8 +198,8 @@ export function storagePrintSmallTab(data) {
     })
 }
 
-
-export function appFindInsideInfoByExpressNo(data){
+// 通过订单号查询内部件详情
+export function appFindInsideInfoByExpressNo(data) {
     return request({
         url: '/tianzong/express/appFindInsideInfoByExpressNo',
         method: 'post',

+ 19 - 8
src/pages/components/Waitsent.vue

@@ -15,9 +15,9 @@
                         <div class="jindu">派送进度 {{ item.signed }}/{{ item.sumAnd }}</div>
                     </div>
                     <!-- 各个运单 -->
-                    <div class="batchss"
-                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', height: item.openCard ? 'auto' : '140px', }">
-                        <div class="batch-middel" v-for="(unfold, index) in item.list" :key="index">
+                    <div class="batchss">
+                        <div class="batch-middel" v-for="(unfold, index) in batchsFilter(item.list, item.openCard) "
+                            :key="index">
                             <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;">
@@ -34,9 +34,12 @@
                                     <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
-                                            size="mini">拨打</a>
+                                            size="mini"><van-icon size="14" name="phone-o" /></a>
                                     </div>
+                                    <div class="batch-middel-text-style" style="width: 100%;">滞留原因:{{ unfold.sendRemark
+                                        }}</div>
                                 </div>
                             </div>
                             <div class="batch-middel-bottom">
@@ -168,7 +171,17 @@ export default {
         // this.getData();
     },
     methods: {
+        //
+        batchsFilter(list, openCard) {
+            if (Array.isArray(list) && list.length > 0) {
+                if (!openCard) {
+                    return [list[0]]
+                }
+                return list
+            }
+            return []
 
+        },
         // 搜索批次号
         async onSearch() {
             this.$refs.scrollRefresh.onRefresh()
@@ -294,9 +307,7 @@ export default {
     font-size: 12px;
 }
 
-.batchss {
-    min-height: 140px;
-}
+.batchss {}
 
 .container {
     height: 100%;
@@ -338,7 +349,7 @@ export default {
             background-color: #f7f8fa;
             border-radius: 12px;
             margin: 10px 6px;
-
+            padding-bottom: 8px;
 
             &-text {
                 padding: 0px 10px;

+ 1 - 3
src/pages/new/removal.vue

@@ -85,9 +85,7 @@ export default {
                 this.keyWorld = ''
                 return
             }
-
-            this.callback(this.keyWorld)
-            this.keyWorld = ''
+            this.iconCheck(this.keyWorld)
         },
         callback(code) {
             if (this.codes.length < 15) {

+ 3 - 0
src/pages/new/sign.vue

@@ -50,11 +50,14 @@ export default {
         },
         // 查询
         async check() {
+
             if (this.value == '') {
                 this.$toast('请输入快件单号或手机单号')
                 return
             }
+
             const Shipment = await appFindYourShipment({ expressNo: this.value }, { emulateJSON: true })
+
             if (Shipment.data == null) {
                 Toast('没有数据')
             }

+ 15 - 15
src/pages/new/storage.vue

@@ -63,7 +63,7 @@
                         @click="handleSubmit(true)" native-type="button">保存并打印</van-button>
 
                     <van-button size="small" style="border-radius: 5px; width: 35vw;" block type="info"
-                    @click="handleSubmit(false)"  native-type="button">仅保存</van-button>
+                        @click="handleSubmit(false)" native-type="button">仅保存</van-button>
                 </div>
             </van-form>
         </div>
@@ -105,14 +105,14 @@
 </template>
 
 <script>
-import { appGetEmployeeInfoByPhone, appGeLogisticsList, appSaveExpressRecord, getSysUserInfoByUserIdAPI, getListOfPrinters, storagePrintSmallTab ,appFindInsideInfoByExpressNo} from '@/api/index'
+import { appGetEmployeeInfoByPhone, appGeLogisticsList, appSaveExpressRecord, getSysUserInfoByUserIdAPI, getListOfPrinters, storagePrintSmallTab, appFindInsideInfoByExpressNo } from '@/api/index'
 import { Toast } from 'vant';
 import wx from "weixin-jsapi";
 export default {
     data() {
         return {
-            isPrint:false,//是否需要打印
-            expressInfo:{},// 快件信息
+            isPrint: false,//是否需要打印
+            expressInfo: {},// 快件信息
             gfg: {},
             isCompany: '否',
             inputValue: '',//输入手机号后四位聚焦
@@ -149,7 +149,7 @@ export default {
     async mounted() {
         this.getUser()
         this.floorId = this.$store.state.user.expressScope
-        const expressData = await appFindInsideInfoByExpressNo({insideNum:'S6000000363245086'})
+        const expressData = await appFindInsideInfoByExpressNo({ insideNum: 'S6000000363245086' })
         this.handleAppFindInsideInfoByExpressNoCallback(expressData)
     },
     methods: {
@@ -166,7 +166,7 @@ export default {
                         result = result1[result1.length - 1];
                     }
                     this.object.expressNo = result
-                    const expressData = await appFindInsideInfoByExpressNo({insideNum:result})
+                    const expressData = await appFindInsideInfoByExpressNo({ insideNum: result })
                     this.handleAppFindInsideInfoByExpressNoCallback(expressData.data)
                     console.log(expressData)
                 },
@@ -177,8 +177,8 @@ export default {
         },
 
         // 查询快递单号回调
-        handleAppFindInsideInfoByExpressNoCallback(data){
-            if(!data) return
+        handleAppFindInsideInfoByExpressNoCallback(data) {
+            if (!data) return
             this.expressInfo = data;
             this.object.value = this.$store.state.user.company;
             this.onGroupObject.phone = data.addressee_phone
@@ -187,7 +187,7 @@ export default {
             this.onGroupObject.mailRoomName = data.mailRoomName
             this.onGroupObject.seat_no = data.addressee_seat_no
             this.object.remark = data.express_remark
-            this.object.radio = data.express_type == '1'? '文件' :'物品'
+            this.object.radio = data.express_type == '1' ? '文件' : '物品'
         },
         // 手机号点击聚焦
         onFocus() {
@@ -235,7 +235,7 @@ export default {
             this.shelf = false;
         },
 
-        handleSubmit(isPrint){
+        handleSubmit(isPrint) {
             this.isPrint = isPrint;
             this.$refs.formRef.submit()
             console.log('submit')
@@ -264,7 +264,7 @@ export default {
                 ...originalObj
             }
 
-            if(values.isPayOnDelivery){
+            if (values.isPayOnDelivery) {
                 // 内部件
                 value.senderName = this.expressInfo.send_name
                 value.senderNumber = this.expressInfo.send_phone
@@ -275,7 +275,7 @@ export default {
             this.value14 = this.object.value4
             if (res.msg == 'success') {
                 this.$toast('入库成功')
-                if(this.isPrint){
+                if (this.isPrint) {
                     this.printerGo();
                 }
                 this.isPrint = false;
@@ -296,7 +296,7 @@ export default {
                     mailFloor: '',
                     seat_no: '',
                 },
-                this.checkbox = false
+                    this.checkbox = false
 
             } else if (res.msg == 'already') {
                 this.$toast('该账号已添加过')
@@ -314,11 +314,11 @@ export default {
         async printerGo() {
             const getPrinters = await getListOfPrinters({})
             console.log(getPrinters)
-            if(getPrinters.data.length === 0){
+            if (getPrinters.data.length === 0) {
                 Toast('该用户未绑定打印机')
                 return;
             }
-            if(getPrinters.data.length === 1){
+            if (getPrinters.data.length === 1) {
                 this.onPrinter(getPrinters.data)
                 return;
             }