更新优化

pages.json

@@ -282,7 +282,7 @@
 			"path": "personnelDetails/personnelDetails",
 			"style": {
 				"navigationBarTitleText": "人员详细信息",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#0122C7",
 				"navigationBarTextStyle": "white"
 			}

subpkg/personnelDetails/personnelDetails.vue

@@ -266,7 +266,7 @@
 					</view>
 					<u-line color="#999999FF" style="margin: 31rpx 0"></u-line>
 					<view class="bottom">
-						<button class="send_btn" @click="addContract" v-if="timerCount == 0">
+						<button class="send_btn" @click="clickContract(2)" v-if="timerCount == 0">
 							发送合同
 						</button>
 						<button class="send_btn tips_center" v-else>
@@ -311,6 +311,7 @@
 				</view>
 			</block>
 		</view>
+    <u-modal :show="modelShow" title="提醒" :content="modelType==1?'请检查信息无误后再生成合同':'请检查合同无误后再发送'" closeOnClickOverlay showCancelButton cancel-text="我再看看" confirm-text="确认无误" close="modelShow=false" @cancel="modelShow=false" @confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal>
 	</view>
 </template>
 
@@ -357,7 +358,10 @@
 					contract: {},
 					roles: {}
 				},
-				contractTypeList: []
+				contractTypeList: [],
+        modelShow: false,
+        modelType: 1,
+        nowContractType: -1
 			}
 		},
 		onLoad(options) {
@@ -377,6 +381,11 @@
 				return this.timerCount;
 			}
 		},
+    onPullDownRefresh(){
+      this.loadUserDetail().then(()=>{
+        uni.stopPullDownRefresh()
+      });
+    },
 		methods: {
 			// 查看合同
 			naviToContract(contract_no) {
@@ -421,12 +430,14 @@
 				}
 			},
 			changeType(e) {
-				// console.log(this.contractTypeList[e.detail.value]);
+				// console.log(this.contractTypeList[]);
-				this.createContract({
+        this.nowContractType = e.detail.value;
-					party_b: this.userInfo.id,
+        this.clickContract(1);
-					contract_type: this.contractTypeList[e.detail.value].id,
+				// this.createContract({
-					type: 2 //1-公司,2-个人
+				// 	party_b: this.userInfo.id,
-				})
+				// 	contract_type: this.contractTypeList[e.detail.value].id,
+				// 	type: 2 //1-公司,2-个人
+				// })
 			},
 			// 初始化合同类型
 			async initContractTypeList() {
@@ -438,61 +449,67 @@
 				})
 				this.contractTypeList = res.data;
 			},
+      clickContract(e){
+        this.modelType = e;
+        this.modelShow = true;
+      },
 			// 生成合同
-			createContract(data) {
+			async createContract() {
-				uni.showModal({
+        uni.showLoading({
-					content: '请检查信息无误后再生成合同',
+        	title: '合同生成中',
-					confirmText: '确认无误',
+        	mask: true
-					cancelText: '我再看看',
+        })
-					confirmColor: '#3175f9',
+        let res = await userInitiateContract({
-					success: async (e) => {
+        	party_b: this.userInfo.id,
-						if (e.confirm) {
+        	contract_type: this.contractTypeList[this.nowContractType].id,
-							uni.showLoading({
+        	type: 2
-								title: '合同生成中',
+        })
-								mask: true
+        this.loadUserDetail();
-							})
+        uni.hideLoading();
-							let res = await userInitiateContract({
+        Toast('合同已生成');
-								party_b: data.party_b,
+        this.navTo('/subpkg/submit/submit?type=' + 1);
-								contract_type: data.contract_type,
+				// uni.showModal({
-								type: data.type
+				// 	content: '请检查信息无误后再生成合同',
-							})
+				// 	confirmText: '确认无误',
-							this.loadUserDetail();
+				// 	cancelText: '我再看看',
-							uni.hideLoading();
+				// 	confirmColor: '#3175f9',
-							Toast('合同已生成');
+				// 	success: async (e) => {
-							this.navTo('/subpkg/submit/submit?type=' + 1);
+				// 		if (e.confirm) {
-						}
+							
-					}
+				// 		}
-				})
+				// 	}
+				// })
 			},
 			// 发送合同
-			async addContract(data) {
+			async addContract() {
-				uni.showModal({
+        try {
-					content: '请检查合同无误后再发送',
+        	uni.showLoading({
-					confirmText: '确认无误',
+        		title: '合同发送中',
-					cancelText: '我再看看',
+        		mask: true
-					confirmColor: '#3175f9',
+        	})
-					success: async (e) => {
+        	let res = await userDraftingcontracts({
-						if (e.confirm) {
+        		id: this.userInfo.id
-							try {
+        	});
-								uni.showLoading({
+        	this.loadUserDetail();
-									title: '合同发送中',
+        	this.startTimer();
-									mask: true
+        	uni.hideLoading();
-								})
+        	Toast('合同已发送');
-								let res = await userDraftingcontracts({
+        	// this.navTo('/subpkg/submit/submit?type='+2);
-									id: this.userInfo.id
+        } catch (e) {
-								});
+        	uni.hideLoading();
-								this.loadUserDetail();
+        	Toast(e.msg || '合同发送失败');
-								this.startTimer();
+        }
-								uni.hideLoading();
+				// uni.showModal({
-								Toast('合同已发送');
+				// 	content: '请检查合同无误后再发送',
-								// this.navTo('/subpkg/submit/submit?type='+2);
+				// 	confirmText: '确认无误',
-							} catch (e) {
+				// 	cancelText: '我再看看',
-								uni.hideLoading();
+				// 	confirmColor: '#3175f9',
-								Toast(e.msg || '合同发送失败');
+				// 	success: async (e) => {
-							}
+				// 		if (e.confirm) {
-						}
+							
-					}
+				// 		}
-				})
+				// 	}
+				// })
 			},
 			// 发送短信
 			async getPostsms() {
@@ -526,14 +543,13 @@
 					}
 				}, 1000);
 			},
-			loadUserDetail() {
+			async loadUserDetail() {
 				if (!this.id) return;
-				companyUserDetail({
+				let res = await companyUserDetail({
 					id: this.id
-				}).then(res => {
-					this.userInfo = res.data;
-					this.skeleton = false;
 				})
+        this.userInfo = res.data;
+        this.skeleton = false;
 			},
 			previewImg(urls, index = 0) {
 				uni.previewImage({
@@ -541,9 +557,6 @@
 					current: index
 				})
 			}
-		},
-		onPullDownRefresh() {
-			uni.stopPullDownRefresh()
 		}
 	}
 </script>