样式更改

src/pages/addper.vue

@@ -1,239 +0,0 @@
-<template>
-	<div>
-		
-		<!-- 表单 -->
-		<van-form @submit="onSubmit">
-		  <van-field v-model="name" class="m" name="中文名" label="中文名" placeholder="请填写中文名"/>
-		  <van-field v-model="englishName" type="" name="英文名" label="英文名" placeholder="请填写英文名"/>
-		  <van-field v-model="email" class="m" type="" name="邮箱地址" label="邮箱地址" placeholder="请填写邮箱地址"/>
-		  <van-field v-model="phone" class="m" type="number" name="手机号" label="手机号" placeholder="请填写手机号"/>
-      <van-field v-model="phoneOne"  type="number" name="备用手机号1" label="备用手机号1" placeholder="请填写备用手机号1"/>
-      <van-field v-model="phoneTwo"  type="number" name="备用手机号2" label="备用手机号2" placeholder="请填写备用手机号2"/>
-      <van-field v-model="phoneThree"  type="number" name="备用手机号2" label="备用手机号3" placeholder="请填写备用手机号3"/>
-      <van-field v-model="telephone"  type="number" name="座机号" label="座机号" placeholder="请填写座机号"/>
-      <van-field v-model="telephone2"  type="number" name="座机-分机号" label="座机-分机号" placeholder="请填写座机-分机号"/>
-
-		  <van-field v-model="stationNum" type="" name="工号" label="工号" placeholder="请填写工号"/>
-
-		  <van-field readonly clickable :value="company" class="m" name="公司" label="公司" placeholder="请选择公司" @click="showPicker = true"/>
-		  <van-popup v-model="showPicker" position="bottom">
-		    <van-picker
-		      show-toolbar
-		      :columns="companyList"
-			  value-key="company"
-		      @confirm="onConfirm"
-		      @cancel="showPicker = false"
-		    />
-		  </van-popup>
-
-		  <van-field readonly clickable :value="department" class="m" name="部门" label="部门" placeholder="请选择部门" @click="showPicker2 = true"/>
-		  <van-popup v-model="showPicker2" position="bottom">
-		    <van-picker
-		      show-toolbar
-		      :columns="departmentList"
-			  value-key="department"
-		      @confirm="onConfirm2"
-		      @cancel="showPicker2 = false"
-		    />
-		  </van-popup>
-
-		  <van-field readonly clickable :value="costCenterName"  name="成本中心" label="成本中心" placeholder="请填写成本中心" @click="showPicker3 = true"/>
-		  <van-popup v-model="showPicker3" position="bottom">
-		    <van-picker
-		      show-toolbar
-		      :columns="costCenterNameList"
-			  value-key="costCenterName"
-		      @confirm="onConfirm3"
-		      @cancel="showPicker3 = false"
-		    />
-		  </van-popup>
-
-		  <van-field v-model="build" type="" name="幢/座" label="幢/座" placeholder="请填写幢/座"/>
-		  <van-field v-model="floor" type="" name="楼层" label="楼层" placeholder="请填写楼层"/>
-		  <van-field v-model="seat" type="" name="座位" label="座位" placeholder="请填写座位"/>
-		  <van-field v-model="remark" type="" name="备注" label="备注" placeholder="请填写备注"/>
-		  <div style="margin: 16px;">
-		    <van-button round block type="info" native-type="submit">保存</van-button>
-		  </div>
-		</van-form>
-	</div>
-</template>
-
-<script>
-	import { Form,Toast } from 'vant'
-	export default{
-		data(){
-			return {
-				titlename:"新增临时收件人",
-				name:"",
-				englishName:"",
-				email:"",
-				phone:"",
-        phoneOne:"",
-        phoneTwo:"",
-        phoneThree:"",
-        telephone:"",
-        telephone2:"",
-				stationNum:"",
-				build:"",
-				floor:"",
-				seat:"",
-				remark:"",
-				company:"",
-				companyList:[],
-				showPicker:false,
-				department:'',
-				departmentList:[],
-				showPicker2:false,
-				costCenterName:'',
-				costCenterId:'',
-				costCenterNameList:[],
-				showPicker3:false,
-				companyid:'',//公司id
-			}
-		},
-		created:function(){
-			
-			this.openid = this.$store.state.openId;
-			this.getData();
-		},
-		methods:{
-			getData(){
-				Toast.loading({
-				    message: '加载中...',
-				    forbidClick: true,
-				    duration:0
-				});
-
-				this.$http.post(this.$store.state.host+"/solic/getTemporaryList.do",{mailRoomId: localStorage.getItem('roomId')},{emulateJSON:true})
-					.then(res=>{
-						//发送成功
-						if(res.body.msg=='success'){
-							this.companyList = res.body.companyList;
-							this.departmentList = res.body.departList;
-							this.costCenterNameList = res.body.costCenterList;
-						}
-				},res=>{
-						//发送失败
-					Toast("网络错误!")
-				})
-				Toast.clear()
-			},
-			//所属公司
-			onConfirm(val){
-				this.company = val.company;
-				this.companyid = val.user_id;
-				this.showPicker = false;
-			},
-			//部门
-			onConfirm2(val){
-				this.department = val.department;
-				this.showPicker2 = false;
-			},
-			//成本中心
-			onConfirm3(val){
-				this.costCenterName = val.costCenterName;
-				this.costCenterId = val.id;
-				this.showPicker3 = false;
-			},
-			//提交
-			onSubmit(){
-				if(this.name==''||this.name==undefined){
-					Toast('请填写中文名');
-					return;
-				}
-				if(this.email==''||this.email==undefined){
-					Toast('请填写邮箱地址');
-					return;
-				}
-				if(this.phone==''||this.phone==undefined){
-					Toast('请填写手机号');
-					return;
-				}
-				if(this.company==''||this.company==undefined){
-					Toast('请选择公司');
-					return;
-				}
-				if(this.department==''||this.department==undefined){
-					Toast('请选择部门');
-					return;
-				}
-				// if(this.costCenterName==''||this.costCenterName==undefined){
-				// 	Toast('请选择成本中心');
-				// 	return;
-				// }
-				this.$http.post(this.$store.state.host+"/solic/saveTemporaryEmployee",{
-					mailRoomId: localStorage.getItem('roomId'),
-					name:this.name,//中文名
-					companyId:this.companyid,
-					englishName:this.englishName,//英文名
-					email:this.email,
-					//sex
-					phone:this.phone,
-          phoneOne:this.phoneOne,
-          phoneTwo:this.phoneTwo,
-          phoneThree:this.phoneThree,
-					telephone:this.telephone,
-          telephone2:this.telephone2,
-					stationNum:this.stationNum,//工号
-					company:this.company,//所属公司
-					costCenterName:this.costCenterName,//成本中心
-					costCenterId:this.costCenterId,
-					department:this.department,//部门
-					build:this.build,
-					floor:this.floor,
-					seat:this.seat,//座位号
-					remark:this.remark
-				},{emulateJSON:true})
-					.then(res=>{
-						//发送成功
-						if(res.body.msg=='success'){
-							Toast("保存成功");
-							let that = this;
-							setTimeout(function(){
-								that.$router.push({path:'/Sjdj',query:{}});
-							},500)
-						}else{
-							Toast('保存失败!')
-						}
-				},res=>{
-						//发送失败
-					Toast("网络错误!")
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="less" scoped>
-	/deep/.van-form{
-	  .van-button--info{
-	    background-color: #00c4b8;
-	    border: 1px solid #00c4b8;
-	    border-radius: 5px;
-	  }
-	  .m .van-field__label::before{
-		  content:"*";
-		  color: red;
-	  }
-	  .van-cell{
-	    font-size: .26rem;
-	    }
-	  .textarea{
-	    font-size: .26rem;
-	    padding: 10px 16px;
-	    color: #646566;
-	    textarea{
-	      width: 98%;
-	      height: 150px;
-	      border-color: #e5e5e5;
-	      color: #999999;
-	      margin-top: 16px;
-	      padding: 10px 1%;
-	    }
-	  }
-	}
-	/deep/.van-field__control{
-	  text-align: right;
-	}
-</style>

src/pages/components/Sented.vue

@@ -8,7 +8,7 @@
             <template v-slot="slotProps">
                 <div class="onther" v-for="(item, index) in  slotProps.list" :key="index">
                     <div class="onther-top">
-                        <div style="font-size: 16px;">批次号：{{ item.dispatchBatchNo
+                        <div style="font-size: 12px;">批次号：{{ item.dispatchBatchNo
                             }}
                         </div>
                         <div class="jindu">派送进度 {{ item.signed }}/{{ item.sumAnd }}</div>
@@ -30,8 +30,10 @@
         <van-popup v-model="show" style="width: 100%; height: 60%;">
             <div class="batch-middel" v-for="(item, index) in popupList" :key="index">
                 <div class="batch-middel-text">
-                    <div class="batch-middel-text-style">[{{ item.expressCompany }}]运单号:{{
-                item.expressNo }}</div>
+                    <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>
@@ -161,7 +163,7 @@ export default {
             flex-wrap: wrap;
 
             &-style {
-                width: 165px;
+                font-size: 12px;
                 margin-top: 10px;
             }
         }
@@ -202,10 +204,9 @@ export default {
 }
 
 .batch-middel {
-    height: 130px;
     background-color: #f2f2f2;
     border-radius: 12px;
-    margin: 5px;
+    padding: 10px 8px;
 
     &-text {
         display: flex;

src/pages/components/Waitsent.vue

@@ -1,39 +1,44 @@
 <template>
     <div class="container">
-        <div style="display: flex; justify-content: space-between; background-color: #fff;">
+        <div class="container-searchNumber">
             <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-icon class="container-searchNumber-icon" @click="onSearch" size="20" name="search" />
         </div>
-        <ScrollRefresh height="calc(100vh - 99px)" ref="scrollRefresh" :request="request">
+        <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 style="font-size: 16px;">批次号:{{ item.dispatchBatchNo
+                        <div class="batch-top-dispatchBatchNo">批次号:{{ item.dispatchBatchNo
                             }}
                         </div>
                         <div class="jindu">派送进度 {{ item.signed }}/{{ item.sumAnd }}</div>
                     </div>
                     <!-- 各个运单 -->
                     <div class="batchss"
-                        :style="{ overflow: item.openCard ? 'auto' : 'hidden', height: item.openCard ? 'auto' : '150px', }">
+                        :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="batch-middel-text">
-                                <div class="batch-middel-text-style">[{{ unfold.expressCompany }}]运单号:{{
+                                <div class="batch-middel-text-style"
+                                    style="text-align: left; width: 100%; margin-left: -6px;">【{{
+                unfold.expressCompany }}】运单号:{{
                 unfold.expressNo }}</div>
-                                <div class="batch-middel-text-style">收件人1：{{ unfold.recipient }}xxx</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.sendSeat }}</div>
-                                <div style="display: flex;" class="batch-middel-text-style">联系方式:{{ unfold.phone }}
-                                    <a :href="'tel:' + unfold.phone" style="margin-top: -5px; border-radius: 6px;"
-                                        type="info" plain size="mini">拨打</a>
+                                <div style="display: flex; justify-content:  space-between; flex-wrap: wrap;">
+                                    <div class="batch-middel-text-style">收件人：{{ unfold.recipient }}xxx</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.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>
+                                    </div>
                                 </div>
                             </div>
-                            <div style="display: flex; justify-content:space-around; padding-top: 5px;">
-                                <van-button style="width: 100px; border-radius: 6px;" size="small" plain type="info"
+                            <div class="batch-middel-bottom">
+                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="info"
                                     @click="onReceiving(unfold)">签收
                                 </van-button>
-                                <van-button style="width: 100px; border-radius: 6px;" size="small" plain type="danger"
+                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="danger"
                                     @click="onSureRetention(unfold)">设为滞留</van-button>
                             </div>
                         </div>
@@ -275,52 +280,75 @@ export default {
 
 
 .container {
-    height: 100%
-}
-
-
-.batchss {
-    // height: 130px;
-    // overflow: hidden;
-}
-
-.batch {
-    background-color: #fff;
-    margin: 10px;
+    height: 100%;
 
-    &-top {
+    &-searchNumber {
         display: flex;
         justify-content: space-between;
-        align-items: center;
-        padding: 10px 0 6px 0;
+        background-color: #fff;
 
-        .jindu {
-            color: #169bd5
+
+        &-icon {
+            margin: 19px 8px 0 0px;
         }
     }
 
-    &-middel {
-        // height: 120px;
-        background-color: #f2f2f2;
-        border-radius: 12px;
-        margin: 10px 6px;
-
+    .batch {
+        background-color: #fff;
+        margin: 10px;
 
-        &-text {
+        &-top {
             display: flex;
-            flex-wrap: wrap;
+            justify-content: space-between;
+            align-items: center;
+            padding: 10px 6px 6px 6px;
+
+            &-dispatchBatchNo {
+                font-size: 12px;
 
-            &-style {
-                width: 50%;
-                margin-top: 10px;
             }
 
+            .jindu {
+                color: #169bd5
+            }
         }
-    }
 
-    &-bottom {
-        padding: 10px 4px;
-        color: #169bd5;
+        &-middel {
+            // height: 120px;
+            background-color: #f7f8fa;
+            border-radius: 12px;
+            margin: 10px 6px;
+
+
+            &-text {
+                padding: 0px 10px;
+
+                &-style {
+                    width: 50%;
+                    font-size: 12px;
+                    padding-top: 8px;
+                }
+
+            }
+
+            &-bottom {
+                display: flex;
+                justify-content: flex-end;
+                padding-top: 5px;
+
+                &-buttom {
+                    width: 70px;
+                    height: 25px;
+                    border-radius: 6px;
+                    margin-right: 12px
+                }
+            }
+        }
+
+        &-bottom {
+            padding: 10px 4px;
+            color: #169bd5;
+        }
     }
 }
 </style>

src/pages/new/combine.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div class="container" v-if="isCombine === true">
-            <div style="padding: 20px 0;">找到n个属于"xxx"&部门xxx&xxx的快件:</div>
+            <div style="padding: 10px 0 20px;">找到{{ goods.length }}个属于"{{ goods[0].recipient
+                }}"&部门"{{ goods[0].departmentId }}"&座位号:"{{ goods[0].sendSeat }}"的快件:</div>
 
             <van-checkbox :disabled="allCheckedDisable" style="margin-bottom: 10px;" v-model="isAllChecked"
                 shape="square">全选</van-checkbox>
@@ -101,6 +102,13 @@ export default {
             }
         }
     },
+    watch: {
+        signList(newValue) {
+            this.goods = newValue
+            this.checkedGoods = []; // 选中的商品ID集合
+            this.goodsList = [];//筛选后的数据
+        }
+    }
 
 };
 </script>

src/pages/new/sign.vue

@@ -1,15 +1,13 @@
 <template>
     <div>
-        <div class="container" v-if="isSign">
-            <van-search v-model="value" placeholder="请输入快件单号或手机单号" />
+        <div class="container">
+            <van-search @search="check" v-model="value" placeholder="请输入快件单号或手机单号" />
             <img @click="onImg" src="@/assets/user/u4.png" alt="">
 
-            <van-button style="width: 200px; border-radius: 6px; margin-left: 10px;" type="info"
-                @click="check">查询</van-button>
+            <!-- <van-button style="width: 200px; border-radius: 6px; margin-left: 10px;" type="info"
+                @click="check">查询</van-button> -->
+            <Combine :isSign="isSign" :signList="signList" @isSign="isCombine" v-if="!isSign"></Combine>
         </div>
-
-
-        <Combine :isSign="isSign" :signList="signList" @isSign="isCombine" v-else></Combine>
     </div>
 </template>
 
@@ -84,14 +82,14 @@ export default {
 <style lang="less" scoped>
 .container {
     background-color: #fff;
-    height: 640px;
+    height: 100vh;
 
     img {
         position: fixed;
         height: 20px;
         width: 20px;
         right: 22px;
-        top: 62px;
+        top: 18px;
     }
 }
 </style>

src/pages/new/storage.vue

@@ -51,7 +51,7 @@
                     <van-field name="isPayOnDelivery" label="到付件">
                         <template #input>
                             <van-checkbox :disabled="ischeckDisabled" v-model="checkbox" @change="onCheckboxChange"
-                                shape="square" /><span>到付</span>
+                                shape="square" /><span style="margin-left: 4px;">到付</span>
                         </template>
                     </van-field>
                     <van-field :rules="[{ required: checkbox }]" :disabled="isdisabled" v-model="object.payMoney"
@@ -344,6 +344,7 @@ export default {
 .popupStyle {
     height: 100vh;
     width: 100vw;
+    margin-top: -1px;
 
     &-top {
         display: flex;

src/router/index.js

@@ -13,7 +13,6 @@ import Combine from '@/pages/new/combine'
 import SureCombine from '@/pages/new/sureCombine'
 import Batched from '@/pages/new/batched'
 import ScannerResult from '@/pages/new/scannerResult'
-import Addper from '@/pages/addper'
 import Box from '@/pages/box'
 import Pjpc from '@/pages/pjpc'
 import Sign from '@/pages/sign'
@@ -197,14 +196,6 @@ export default new Router({
 			needLogin: true //需要加校检判断的路由
 		}
 	},
-	{ //新增收件人
-		path: '/Addper',
-		name: 'Addper',
-		component: Addper,
-		meta: {
-			needLogin: true //需要加校检判断的路由
-		}
-	},
 	{ //柜子
 		path: '/Box',
 		name: 'Box',