修改所有列表页刷新方式

pages-approve/contract/detail.vue

@@ -268,6 +268,11 @@
 			}
 		},
 		onPullDownRefresh() {
+			if(this.ContractId!=0){
+				this.getContractDetail()
+			}else{
+				this.getApprovalDetail()
+			}
 			setTimeout(()=>{
 				uni.stopPullDownRefresh()
 			},1000)
@@ -285,6 +290,14 @@
 						title:'操作成功',
 						icon:'none'
 					})
+					// 已审批上传签回附件更新列表
+					if(this.detail.Status==='已审批'){
+						uni.$emit('contractApproveListUpdate',{
+							ContractApprovalId:this.ContractApprovalId,
+							ContractApprovalRecordId:this.ContractApprovalRecordId,
+							ContractId:this.ContractId
+						})
+					}
 					setTimeout(()=>{
 						this.showUpload=false
 						this.files=[]
@@ -386,12 +399,27 @@
  						}else{
  							this.getApprovalDetail()
  						}
+
+						// 更新列表
+						uni.$emit('contractApproveListUpdate',{
+							ContractApprovalId:this.ContractApprovalId,
+							ContractApprovalRecordId:this.ContractApprovalRecordId,
+							ContractId:this.ContractId
+						})
 					});
 				}
 			},
 			
 			//审批驳回
 			handleRefuse(){
+				uni.$once('contractApproveReject',()=>{
+					// 更新列表
+					uni.$emit('contractApproveListUpdate',{
+						ContractApprovalId:this.ContractApprovalId,
+						ContractApprovalRecordId:this.ContractApprovalRecordId,
+						ContractId:this.ContractId
+					})
+				})
 				uni.navigateTo({
 					url:"./reason?ContractId="+this.detail.ContractId
 				})

pages-approve/contract/list.vue

@@ -40,18 +40,33 @@
 		},
 		onLoad() {
 			this.initTabs()//初始化tab 栏
-		},
-		onShow() {
-			this.$nextTick(()=>{
-				this.selectComponent('#tabs').resize();// 解决初始渲染 vant tab 底部条
-			})
-			this.page=1
-			this.list=[]
 			if(this.status==='待提交'){
 				this.getContractList()
 			}else{
 				this.getList()
 			}
+			// 更新列表
+			uni.$on('contractApproveListUpdate',(e)=>{
+				console.log('更新列表');
+				this.list=this.list.filter(item=>{
+					return !(item.ContractApprovalId==e.ContractApprovalId&&item.ContractApprovalRecordId==e.ContractApprovalRecordId&&item.ContractId==e.ContractId)
+				})
+			})
+		},
+		onUnload(){
+			uni.$off('contractApproveListUpdate')
+		},
+		onShow() {
+			this.$nextTick(()=>{
+				this.selectComponent('#tabs').resize();// 解决初始渲染 vant tab 底部条
+			})
+			// this.page=1
+			// this.list=[]
+			// if(this.status==='待提交'){
+			// 	this.getContractList()
+			// }else{
+			// 	this.getList()
+			// }
 		},
 		onPullDownRefresh() {
 			this.page=1
@@ -121,6 +136,9 @@
 					if(!res.data.List||res.data.List.length===0){
 						this.finished=true
 					}else{
+						if(this.page===1&&res.data.List.length<20){
+							this.finished=true
+						}
 						let arr=res.data.List.map(item=>{
 							let backTime=''
 							if(item.Status==='已撤回'){

pages-approve/contract/reason.vue

@@ -40,6 +40,7 @@
 						title:"审批成功",
 						icon:'success'
 					})
+					uni.$emit('contractApproveReject')
 					setTimeout(()=>{
 						this.handleCancel()
 					},1000)

pages-approve/custome/detail.vue

@@ -171,6 +171,9 @@
 					}).then(() => {
 						// on close
 						this.getDetail()
+
+						// 更新列表
+						uni.$emit('customeApproveListUpdate',{CompanyApprovalId:this.id})
 					});
 				}
 			},

pages-approve/custome/list.vue

@@ -37,10 +37,22 @@
 				finished:false,
 			}
 		},
-		onShow() {
-			this.list=[]
-			this.page=1
+		onLoad(){
 			this.getList()
+			uni.$on('customeApproveListUpdate',(e)=>{
+				console.log('监听customeApproveListUpdate，携带参数为：' + e.CompanyApprovalId);
+				this.list=this.list.filter(item=>{
+					return item.id!=e.CompanyApprovalId
+				})
+			})
+		},
+		onUnload(){
+			uni.$off('customeApproveListUpdate')
+		},
+		onShow() {
+			// this.list=[]
+			// this.page=1
+			// this.getList()
 			this.selectComponent('#tabs').resize();// 解决初始渲染 vant tab 底部条
 		},
 		onPullDownRefresh() {

pages-approve/custome/reason.vue

@@ -48,6 +48,8 @@
 						title:"审批成功",
 						icon:"success"
 					})
+					// 更新列表
+					uni.$emit('customeApproveListUpdate',{CompanyApprovalId:this.CompanyApprovalId})
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta:1

pages-approve/seal/detail.vue

@@ -223,6 +223,15 @@
 			},1000)
 		},
 		methods: {
+			// 更新列表页
+			handleUpdateList(){
+				uni.$emit('sealApproveListUpdate',{
+					ContractApprovalId:this.ContractApprovalId,
+					ContractApprovalRecordId:this.ContractApprovalRecordId, 
+					SealId:this.SealId
+				})
+			},
+
 			// 合规删除合同附件
 			handleDeleteCheckFile(){
 				this.files={
@@ -263,6 +272,7 @@
 							title:'撤回成功',
 							icon:'none'
 						})
+						this.handleUpdateList()
 						this.getDetail()
 					}
 				}).catch(() => {
@@ -283,6 +293,9 @@
 			
 			//前去重审
 			handleEdit(){
+				uni.$once('sealEditSubmit',()=>{
+					this.handleUpdateList()
+				})
 				uni.navigateTo({
 					url:`./edit?ContractApprovalId=${this.ContractApprovalId}&ContractApprovalRecordId=${this.ContractApprovalRecordId}&SealId=${this.SealId}`
 				})
@@ -303,6 +316,7 @@
 							title:'操作成功',
 							icon:'none'
 						})
+						this.handleUpdateList()
 						this.getDetail()
 					}
 				}).catch(() => {
@@ -376,6 +390,7 @@
 						title: "处理成功",
 						confirmButtonColor: "#5890FB",
 					}).then(() => {
+						this.handleUpdateList()
 						this.getDetail()
 					});
 				}
@@ -392,6 +407,7 @@
 						title: "处理成功",
 						confirmButtonColor: "#5890FB",
 					}).then(() => {
+						this.handleUpdateList()
 						this.getDetail()
 					});
 				}
@@ -399,6 +415,9 @@
 			
 			//驳回
 			handleApprovalReject(){
+				uni.$once('sealApproveReject',()=>{
+					this.handleUpdateList()
+				})
 				uni.navigateTo({
 					url:`./reason?SealId=${this.detail.SealId}`
 				})

pages-approve/seal/edit.vue

@@ -483,6 +483,7 @@
 						title:"用印申请单已提交",
 						icon:"none"
 					})
+					uni.$emit('sealEditSubmit')
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta:2

pages-approve/seal/list.vue

@@ -53,11 +53,22 @@
 		},
 		onLoad() {
 			this.initTabs()
+			this.getList()
+			// 更新列表
+			uni.$on('sealApproveListUpdate',(e)=>{
+				console.log('更新列表');
+				this.list=this.list.filter(item=>{
+					return !(item.ContractApprovalId==e.ContractApprovalId&&item.ContractApprovalRecordId==e.ContractApprovalRecordId&&item.SealId==e.SealId)
+				})
+			})
+		},
+		onUnload(){
+			uni.$off('sealApproveListUpdate')
 		},
 		onShow() {
-			this.list=[]
-			this.page=1
-			this.getList()
+			// this.list=[]
+			// this.page=1
+			// this.getList()
 			this.$nextTick(()=>{
 				this.selectComponent('#tabs').resize();// 解决初始渲染 vant tab 底部条
 			})
@@ -134,6 +145,9 @@
 					if(!res.data.List||res.data.List.length===0){
 						this.finished=true
 					}else{
+						if(this.page===1&&res.data.List.length<20){
+							this.finished=true
+						}
 						let arr=res.data.List.map(item=>{
 							return {
 								title:item.CompanyName,

pages-approve/seal/reason.vue

@@ -42,6 +42,7 @@
 						icon:"success"
 					})
 					uni.$emit('updateSealDetail',{msg:'用印详情页面更新'})
+					uni.$emit('sealApproveReject')
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta:1

pages/mine/index.vue

@@ -14,15 +14,15 @@
 		<view class="base-info-wrap white-wrap">
 			<view style="font-size: 16px;font-weight: bold;">基本信息</view>
 			<view class="info-list">
-				<view class="info-item">
+				<view class="info-item flex">
 					<text class="label">公司名称</text>
 					<text>弘则弥道（上海）投资咨询有限公司</text>
 				</view>
-				<view class="info-item">
+				<view class="info-item flex">
 					<text class="label">所属部门</text>
 					<text></text>
 				</view>
-				<view class="info-item">
+				<view class="info-item flex">
 					<text class="label">角色</text>
 					<text>{{userInfo.RoleName}}</text>
 				</view>