From 33ecd1c80c27ec37aedf4da18332609a7e27dd80 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 14:47:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index aa0afd1..02e2f64 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -42,7 +42,7 @@
 			</view>
 
 			<!-- 占位 -->
-			<view style="height: 130rpx"></view>
+			<view style="height: 150rpx"></view>
 			<!-- 任务状态 -->
 			<!-- <view class="task_panel">
         <block v-for="(item,index) in assessData" :key="index">

From 02420993bf1febf7384f84ba20d9a18e3433c62d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 15:34:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |   2 +-
 subpkg/personnelDetails/personnelDetails.vue | 149 ++++++++++---------
 2 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/pages.json b/pages.json
index 7fd0b50..e2deb82 100644
--- a/pages.json
+++ b/pages.json
@@ -282,7 +282,7 @@
 			"path": "personnelDetails/personnelDetails",
 			"style": {
 				"navigationBarTitleText": "人员详细信息",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#0122C7",
 				"navigationBarTextStyle": "white"
 			}
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 60a69d6..a91b79b 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/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]);
-				this.createContract({
-					party_b: this.userInfo.id,
-					contract_type: this.contractTypeList[e.detail.value].id,
-					type: 2 //1-公司,2-个人
-				})
+				// console.log(this.contractTypeList[]);
+        this.nowContractType = e.detail.value;
+        this.clickContract(1);
+				// this.createContract({
+				// 	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) {
-				uni.showModal({
-					content: '请检查信息无误后再生成合同',
-					confirmText: '确认无误',
-					cancelText: '我再看看',
-					confirmColor: '#3175f9',
-					success: async (e) => {
-						if (e.confirm) {
-							uni.showLoading({
-								title: '合同生成中',
-								mask: true
-							})
-							let res = await userInitiateContract({
-								party_b: data.party_b,
-								contract_type: data.contract_type,
-								type: data.type
-							})
-							this.loadUserDetail();
-							uni.hideLoading();
-							Toast('合同已生成');
-							this.navTo('/subpkg/submit/submit?type=' + 1);
-						}
-					}
-				})
+			async createContract() {
+        uni.showLoading({
+        	title: '合同生成中',
+        	mask: true
+        })
+        let res = await userInitiateContract({
+        	party_b: this.userInfo.id,
+        	contract_type: this.contractTypeList[this.nowContractType].id,
+        	type: 2
+        })
+        this.loadUserDetail();
+        uni.hideLoading();
+        Toast('合同已生成');
+        this.navTo('/subpkg/submit/submit?type=' + 1);
+				// uni.showModal({
+				// 	content: '请检查信息无误后再生成合同',
+				// 	confirmText: '确认无误',
+				// 	cancelText: '我再看看',
+				// 	confirmColor: '#3175f9',
+				// 	success: async (e) => {
+				// 		if (e.confirm) {
+							
+				// 		}
+				// 	}
+				// })
 			},
 			// 发送合同
-			async addContract(data) {
-				uni.showModal({
-					content: '请检查合同无误后再发送',
-					confirmText: '确认无误',
-					cancelText: '我再看看',
-					confirmColor: '#3175f9',
-					success: async (e) => {
-						if (e.confirm) {
-							try {
-								uni.showLoading({
-									title: '合同发送中',
-									mask: true
-								})
-								let res = await userDraftingcontracts({
-									id: this.userInfo.id
-								});
-								this.loadUserDetail();
-								this.startTimer();
-								uni.hideLoading();
-								Toast('合同已发送');
-								// this.navTo('/subpkg/submit/submit?type='+2);
-							} catch (e) {
-								uni.hideLoading();
-								Toast(e.msg || '合同发送失败');
-							}
-						}
-					}
-				})
+			async addContract() {
+        try {
+        	uni.showLoading({
+        		title: '合同发送中',
+        		mask: true
+        	})
+        	let res = await userDraftingcontracts({
+        		id: this.userInfo.id
+        	});
+        	this.loadUserDetail();
+        	this.startTimer();
+        	uni.hideLoading();
+        	Toast('合同已发送');
+        	// this.navTo('/subpkg/submit/submit?type='+2);
+        } catch (e) {
+        	uni.hideLoading();
+        	Toast(e.msg || '合同发送失败');
+        }
+				// uni.showModal({
+				// 	content: '请检查合同无误后再发送',
+				// 	confirmText: '确认无误',
+				// 	cancelText: '我再看看',
+				// 	confirmColor: '#3175f9',
+				// 	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>

From e54660d2513ecfb39e37f18bbb0253debdef2926 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 15:42:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/mybtn/mybtn.vue         | 11 ++++++++++-
 subpkg/companyInfo/companyInfo.vue |  8 +++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/components/mybtn/mybtn.vue b/components/mybtn/mybtn.vue
index 126b30c..978b011 100644
--- a/components/mybtn/mybtn.vue
+++ b/components/mybtn/mybtn.vue
@@ -1,7 +1,11 @@
 <template>
 	<view>
 		<button @click.stop="click"
-			:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">{{text}}</button>
+      class="button"
+			:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">
+      <slot></slot>
+      {{text}}
+    </button>
 	</view>
 </template>
 
@@ -35,6 +39,11 @@
 </script>
 
 <style lang="scss" scoped>
+  .button{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 	.my_btn_new_btn {
 		position: fixed;
 		bottom: 0;
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 93b5291..04d665d 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -90,11 +90,13 @@
 
 				<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
 					:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-				<!-- <mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn> -->
-				<u-button class="btns" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
+				<mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
+					<u-icon name="plus" color="white" size="18" style="margin-right: 10rpx;"></u-icon>
+        </mybtn>
+				<!-- <u-button class="btns" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
 					<u-icon name="plus" color="white" size="18" style="margin-right: 10rpx;"></u-icon>
 					新建签约
-				</u-button>
+				</u-button> -->
 				<!-- <u-button class="btns" type="primary" icon="plus" text="新建签约"></u-button> -->
 			</view>
 			<view class="company_info" v-show="current==2">

From fb8fbb6d834ff7b9f040fc8cd242f2340b8c3ec5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 21 Aug 2023 15:47:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/company/company.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/company/company.vue b/components/company/company.vue
index f40a1cc..c73e838 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -498,7 +498,8 @@
 				height: 100rpx;
 				line-height: 30rpx;
 				display: flex;
-				// justify-content: space-between;
+				justify-content: left;
+        align-items: center;
 			}
 
 			.cards_content {