From 5fe5efabc54145704d12108fec15ab4b0ba0dc7b Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 10 Aug 2023 11:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F,=E5=BC=80=E5=90=AF=E4=B8=8B=E6=8B=89=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/company/company.vue               | 45 +++++-----
 components/task/taskItem.vue                 |  1 +
 pages.json                                   |  5 +-
 pages/oaTask/oaTask.vue                      |  5 +-
 subpkg/captain/captain.vue                   |  3 +-
 subpkg/companyInfo/companyInfo.vue           | 25 ++++--
 subpkg/contract/contract.vue                 | 89 +++++++++++---------
 subpkg/newArchives/newArchives.vue           | 14 ++-
 subpkg/newPersonnel/newPersonnel.vue         |  1 +
 subpkg/personnel/personnel.vue               | 19 +++--
 subpkg/personnelDetails/personnelDetails.vue | 27 +++---
 11 files changed, 141 insertions(+), 93 deletions(-)

diff --git a/components/company/company.vue b/components/company/company.vue
index 96c0338..e469723 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -11,14 +11,14 @@
               <view class="text">
                 <view class="name">{{company.company_name}}</view>
                 <view class="right">{{company.company_type_name||company.company_type}}</view>
-                <view class="code">社会代码{{company.organization_code}}</view>
+                <view class="code">社会代码：<text @click="copyPhone(company.master_email, '社会代码')">{{company.organization_code}}</text></view>
               </view>
             </view>
           </view>
           <view class="bottom">
             <view class="left">
               <uni-icons type="location" color="#666666" size="14"></uni-icons>
-              <view class="location">区域:</view>
+              <view class="location">区域：</view>
             </view>
             <view style="flex: 1;">{{company.address}}</view>
           </view>
@@ -69,7 +69,7 @@
         <view class="card">
           <view class="one">
             <view class="linkman">
-              <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
+              <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
               </view>
               主要联系人
             </view>
@@ -80,22 +80,19 @@
               <view class="info_item" @click="copyPhone(company.master_email, '邮箱')">邮箱：{{company.master_email}}</view>
             </view>
           </view>
-          <view style="height: 32rpx;"></view>
-          <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
-            <block v-if="other.name!=''">
-              <view class="linkman">
-                <view
-                  style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
-                </view>
-                其他联系人
+          <view class="one" v-for="(other, index) in company.other_contacts" v-if="other.name!=''" :key="index">
+            <view class="linkman">
+              <view
+                style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
               </view>
-              <view class="info">
-                <view class="info_item">姓名：{{other.name}}</view>
-                <view class="info_item">职位：{{other.position}}</view>
-                <view class="info_item" @click="copyPhone(other.phone)">联系电话：{{other.phone}}</view>
-                <view class="info_item" @click="copyPhone(other.email, '邮箱')">邮箱：{{other.email}}</view>
-              </view>
-            </block>
+              其他联系人
+            </view>
+            <view class="info">
+              <view class="info_item">姓名：{{other.name}}</view>
+              <view class="info_item">职位：{{other.position}}</view>
+              <view class="info_item" @click="copyPhone(other.phone)">联系电话：{{other.phone}}</view>
+              <view class="info_item" @click="copyPhone(other.email, '邮箱')">邮箱：{{other.email}}</view>
+            </view>
           </view>
         </view>
       </block>
@@ -252,7 +249,11 @@
 
 <style lang="scss" scoped>
   .item {
-    padding: 31.5rpx 28rpx;
+    padding: 32rpx 28rpx;
+    padding-top: 0;
+    &:nth-child(1){
+      padding-top: 32rpx;
+    }
 
     .title {
       margin-bottom: 21rpx;
@@ -279,8 +280,10 @@
 
         .left {
           display: flex;
+          align-items: center;
 
           image {
+            flex-shrink: 0;
             width: 142rpx;
             height: 142rpx;
             margin-right: 28rpx;
@@ -335,6 +338,10 @@
       }
 
       .one {
+        margin-top: 32rpx;
+        &:nth-child(1){
+          margin-top: 0;
+        }
         .linkman {
           // height: 44rpx;
           font-size: 32rpx;
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 1f2f40d..b942d5c 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -35,6 +35,7 @@
 </template>
 
 <script>
+import { Toast } from '../../libs/uniApi';
   export default {
     name: "task",
     props: {
diff --git a/pages.json b/pages.json
index 188b20b..5316a7d 100644
--- a/pages.json
+++ b/pages.json
@@ -51,6 +51,7 @@
 			"path": "pages/oaTask/oaTask",
 			"style": {
 				"navigationBarTitleText": "今日任务",
+        "enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#3175f9",
 				"navigationBarTextStyle": "white"
 			}
@@ -227,7 +228,7 @@
 			"path": "contract/contract",
 			"style": {
 				"navigationBarTitleText": "合同管理",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#3175f9",
 				"navigationBarTextStyle": "white"
 			}
@@ -407,7 +408,7 @@
 			"path": "captain/captain",
 			"style": {
 				"navigationBarTitleText": "队长列表",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#3175f9",
 				"navigationBarTextStyle": "white"
 			}
diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 1074f33..c17925b 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -47,11 +47,10 @@
       }
     },
     onPullDownRefresh() {
-      this.close()
-      uni.stopPullDownRefresh()
+      this.loadList();
+      this.$u.sleep(500).then(()=>{uni.stopPullDownRefresh()});
     },
     onReachBottom() {
-      
     },
   }
 </script>
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index 3391f11..b2f532d 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -115,6 +115,7 @@
         this.loadConfig.status = "loadmore";
         this.list = [];
         this.loadList();
+        uni.stopPullDownRefresh();
       },
       async loadList() {
         if (this.loadConfig.status == "nomore") return;
@@ -135,7 +136,7 @@
       },
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+      this.initLoad();
     }
   }
 </script>
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 8628aea..4ff3189 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -21,10 +21,16 @@
           <view class="bottom">
             <image src="../../static/img/contract/company.png"></image>
             <view class="text">
-              <view>主要联系人：{{item.master_name}}</view>
-              <view @click="copyPhone(item.master_phone)">联系方式：{{item.master_phone}}</view>
-              <view style="display: flex;">
-                <view class="">区县乡镇：</view>
+              <view class="text_item">
+                <view class="left_text">主要联系人：</view>
+                <view>{{item.master_name}}</view>
+              </view>
+              <view class="text_item" @click="copyPhone(item.master_phone)">
+                <view class="left_text">联系方式：</view>
+                <view>{{item.master_phone}}</view>
+              </view>
+              <view class="text_item">
+                <view class="left_text">区县乡镇：</view>
                 <view>{{item.city_name+'/'+item.area_name+'/'+item.street_name}}</view>
               </view>
               <!-- <view>片区经理：</view> -->
@@ -96,7 +102,6 @@
         this.loadConfig.status = "loadmore";
         this.companyList = [];
         await this.loadCompanyList();
-		uni.stopPullDownRefresh()
       },
       // 加载公司列表
       async loadCompanyList() {
@@ -139,7 +144,9 @@
       }
     },
     onPullDownRefresh() {
-      this.initLoad()
+      if(this.current==1) this.initLoad();
+      
+      this.$u.sleep(500).then(()=>{uni.stopPullDownRefresh()})
     }
   }
 </script>
@@ -281,6 +288,12 @@
           display: flex;
           flex-direction: column;
           justify-content: space-between;
+          .text_item{
+            display: flex;
+            .left_text{
+              flex-shrink: 0;
+            }
+          }
         }
       }
     }
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 9404598..d33e160 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -21,10 +21,18 @@
             </view>
             <view class="date">
               <!-- <text class="time">2023-04-27 至 2024-04-28 </text> -->
-			  <view class="number">合同编号:{{item.contract_no}}</view>
-			  <view class="number">合同类型:{{item.company.contract_type_name}}</view>
-			  
-              <text class="time">修改时间:{{item.update_time}}</text>
+              <view class="number">
+                <view class="num_left">合同编号:</view>
+                <text>{{item.contract_no}}</text>
+              </view>
+              <view class="number">
+                <view class="num_left">合同类型:</view>
+                <view>{{item.company.contract_type_name}}</view>
+              </view>
+              <view class="time">
+                <view class="num_left">修改时间:</view>
+                <view>{{item.update_time}}</view>
+              </view>
             </view>
           </view>
         </view>
@@ -36,8 +44,10 @@
         </view>
       </view>
     </view>
-    <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="暂无合同" icon="/static/img/empty/data.png"></u-empty>
-    <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
+    <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="暂无合同"
+      icon="/static/img/empty/data.png"></u-empty>
+    <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
+      :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
   </view>
 </template>
 
@@ -48,7 +58,7 @@
       return {
         changeType: 0,
         list: [],
-        loadConfig:{
+        loadConfig: {
           page: 1,
           limit: 15,
           loadingText: '努力加载中',
@@ -60,8 +70,7 @@
     },
     onLoad() {},
     onShow() {
-      this.initLoadConfig()
-      this.initContractList()
+      this.initLoadConfig();
     },
     onReady() {
       uni.setNavigationBarColor({
@@ -76,34 +85,36 @@
             url: url
           }) : Toast('暂未开放')
       },
-      initLoadConfig(){
+      initLoadConfig() {
         this.loadConfig.page = 1;
         this.loadConfig.status = "loadmore";
         this.list = [];
+        this.initContractList();
+        uni.stopPullDownRefresh();
       },
       async initContractList() {
-        try{
-          if(this.loadConfig.status=="nomore")return;
-          this.loadConfig.status="loading"
+        try {
+          if (this.loadConfig.status == "nomore") return;
+          this.loadConfig.status = "loading"
           let res = await contractList({
             page: this.loadConfig.page,
             limit: this.loadConfig.limit
           })
-          this.loadConfig.status="loadmore"
-          if(res.data.data.length<this.loadConfig.limit){
-            this.loadConfig.status="nomore"
-          }else {
+          this.loadConfig.status = "loadmore"
+          if (res.data.data.length < this.loadConfig.limit) {
+            this.loadConfig.status = "nomore"
+          } else {
             this.loadConfig.page++;
           }
           this.list = [...this.list, ...res.data?.data]
-        }catch(e){
+        } catch (e) {
           this.initLoadConfig();
           this.loadConfig.status = "nomore"
         }
       }
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+      this.initLoadConfig();
     }
   }
 </script>
@@ -144,7 +155,6 @@
       font-weight: 400;
       color: #999999;
       line-height: 0rpx;
-      -webkit-background-clip: text;
     }
   }
 
@@ -168,7 +178,8 @@
 
       .top {
         display: flex;
-        margin-bottom: 10rpx;
+        margin-bottom: 28rpx;
+
         image {
           width: 87.6rpx;
           height: 87.6rpx;
@@ -177,33 +188,33 @@
         }
 
         .text {
-          flex: 1;
           display: flex;
           flex-direction: column;
           justify-content: space-between;
 
           .name {
-            display: flex;
-            justify-content: space-between;
-            align-items: flex-end;
             .title {
               font-size: 32rpx;
               font-weight: 400;
               color: #333333;
               margin-right: 17.5rpx;
             }
-
-            .number {
-              font-size: 25rpx;
-              font-weight: 400;
-              color: #3274F9;
-            }
           }
 
           .date {
             font-size: 25rpx;
             font-weight: 400;
             color: #F9AA32;
+            line-height: 36rpx;
+            
+            .number, .time{
+              display: flex;
+              justify-content: left;
+              flex-wrap: wrap;
+              .num_left{
+                margin-right: 18rpx;
+              }
+            }
 
             .time {
               color: #CCCCCCFF;
@@ -217,7 +228,8 @@
       .bottom {
         display: flex;
         justify-content: space-between;
-		margin-top: 10rpx;
+        margin-top: 28rpx;
+
         .left {
           font-size: 28rpx;
           font-weight: 400;
@@ -230,14 +242,15 @@
 
         .right {
           width: 158rpx;
-          height: 53rpx;
-          display: flex;
-          justify-content: center;
-          align-items: center;
+          // height: 53rpx;
+          // border-radius: 26rpx 26rpx 26rpx 26rpx;
+          // border: 2rpx solid #3274F9;
+          // display: flex;
+          // justify-content: center;
+          // align-items: center;
+          text-align: right;
           background: #FFFFFF;
-          border-radius: 26rpx 26rpx 26rpx 26rpx;
           opacity: 1;
-          border: 2rpx solid #3274F9;
           font-size: 28rpx;
           font-weight: 400;
           color: #3274F9;
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index f27961b..729f1e7 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -330,8 +330,18 @@
       },
       // 初始化商机分类
       async initCategoryBusinessList() {
-        let res = await categoryBusinessList();
-        this.demandList = res.data;
+        try{
+          uni.showLoading({
+            title:'加载中',
+            mask:true
+          })
+          let res = await categoryBusinessList();
+          this.demandList = res.data;
+        }catch(e){
+          console.log(e);
+        }finally{
+          uni.hideLoading()
+        }
       },
       initBrigadeList(){
         try{
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index d600184..558fb98 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -228,6 +228,7 @@
               title: "添加成功",
               success: () => {
                 setTimeout(() => {
+                  uni.$emit('initPersonnel');
                   uni.navigateBack()
                 }, 1000)
               }
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 3b33aa6..300e48e 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -79,8 +79,9 @@
       }
     },
     onLoad() {
-		this.loadUserList()
-	},
+      this.loadUserList();
+      uni.$on('initPersonnel', this.initLoad);
+    },
     methods: {
       navTo(url) {
         url ?
@@ -88,13 +89,13 @@
             url: url,
           }) : Toast('暂未开放')
       },
-	  async initLoad() {
-	    this.loadConfig.page = 1;
-	    this.loadConfig.status = "loadmore";
-	    this.userList = [];
-	    await this.loadUserList();
-		uni.stopPullDownRefresh();
-	  },
+      async initLoad() {
+        this.loadConfig.page = 1;
+        this.loadConfig.status = "loadmore";
+        this.userList = [];
+        await this.loadUserList();
+        uni.stopPullDownRefresh();  
+      },
       async loadUserList() {
         let that = this;
         if (this.loadConfig.status == "nomore") return;
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 93a577f..f322dc2 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -37,7 +37,7 @@
 						</view>
 					</view>
 					<view class="bottom">
-						负责区域:<text>{{userInfo.street_name+(userInfo.village_name||'')}}</text>
+						负责区域:<text>{{(userInfo.street_name||'')+(userInfo.village_name||'')}}</text>
             <text v-for="(item, index) in userInfo.brigade_name">{{item.brigade_name}}</text>
 					</view>
 					<u-popup :show="show" :round="10" mode="center">
@@ -78,6 +78,18 @@
 						</image>
 					</view>
 				</view>
+        <view class="c_item">
+        	<uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx" type="line">
+        	</uni-section>
+        	<view class="card_box">
+        		<image :src="userInfo.qualification&&userInfo.qualification.bank_account"
+        			@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)">
+        		</image>
+        		<image :src="userInfo.qualification&&userInfo.qualification.bank_account_b"
+        			@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 1)">
+        		</image>
+        	</view>
+        </view>
 				<view class="c_item">
 					<uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line">
 					</uni-section>
@@ -90,18 +102,7 @@
 						</image>
 					</view>
 				</view>
-				<view class="c_item">
-					<uni-section style="background-color: transparent;" title="银行卡照片" titleFontSize="32rpx" type="line">
-					</uni-section>
-					<view class="card_box">
-						<image :src="userInfo.qualification&&userInfo.qualification.bank_account"
-							@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 0)">
-						</image>
-						<image :src="userInfo.qualification&&userInfo.qualification.bank_account_b"
-							@click="previewImg([userInfo.qualification&&userInfo.qualification.bank_account,userInfo.qualification&&userInfo.qualification.bank_account_b], 1)">
-						</image>
-					</view>
-				</view>
+				
 			</block>
 		</view>
 		<view class="contract">