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

---
 pages/oaTask/oaTask.vue                      |  4 +--
 subpkg/archives/archives.vue                 |  5 +++-
 subpkg/archivesDetail/archivesDetail.vue     |  9 +++++--
 subpkg/captain/captain.vue                   | 28 +++++++++++---------
 subpkg/newArchives/newArchives.vue           |  1 -
 subpkg/newPersonnel/newPersonnel.vue         | 24 ++++++++---------
 subpkg/personnel/personnel.vue               | 26 ++++++++++--------
 subpkg/personnelDetails/personnelDetails.vue |  3 ++-
 8 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/pages/oaTask/oaTask.vue b/pages/oaTask/oaTask.vue
index 3dd2e3c..1074f33 100644
--- a/pages/oaTask/oaTask.vue
+++ b/pages/oaTask/oaTask.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="all_box">
-    <view class="task_list">
+    <u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
+    <view v-else class="task_list">
       <!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
       <view v-for="item in list" :key="item.id">
         <task-item :datas="item"></task-item>
       </view>
-      <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
     </view>
     <!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 7b78060..844e82e 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -6,7 +6,10 @@
           <image class="avatar" src="../../static/img/public/record.png"></image>
           <view class="body">
             <view>姓名:<text class="name">{{item.name}}</text></view>
-            <view>片区:<text class="name">{{item.address}}</text></view>
+            <view>
+              片区:<text class="name">{{item.village_name}}</text>
+              <text class="name" style="margin-left: 0;" v-for="brigade_name in item.brigade_name">{{brigade_name.brigade_name}}</text>
+            </view>
             <view>电话:<text class="name">{{item.phone}}</text></view>
           </view>
         </view>
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index 2c843dd..2405f46 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -182,8 +182,13 @@
     computed: {
       nowAddress() {
         let address = this.$store.state.app.userInfo;
-        return address.province_name + address.city_name + address.area_name + address.street_name + address
-          .village_name + address.brigade_name;
+        let str = '';
+        address.province_name?str+=address.province_name:null;
+        address.city_name?str+=address.city_name:null;
+        address.area_name?str+=address.area_name:null;
+        address.street_name?str+=address.street_name:null;
+        address.village_name?str+=address.village_name:null;
+        return str;
       }
     },
     methods: {
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index b309a53..3391f11 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -47,16 +47,20 @@
                 </text>
                 <view class="item">
                   <view class="location">
-                    <text>{{ item.street_name+item.village_name }}</text>
+                    <text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
                     <text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
                   </view>
                 </view>
               </view>
-              <view class="company">
-                <text>
+              <view class="info_bottom">
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -316,7 +320,7 @@
 
             .item {
               display: flex;
-              align-items: center;
+              align-items: flex-start;
             }
 
             .phone {
@@ -325,12 +329,12 @@
 
             .location {
               width: 320rpx;
-              white-space: nowrap;
-              /* 不换行 */
-              overflow: hidden;
-              /* 将超出文本隐藏 */
-              text-overflow: ellipsis;
-              /* 使用省略号表示被隐藏的文本 */
+              // white-space: nowrap;
+              // /* 不换行 */
+              // overflow: hidden;
+              // /* 将超出文本隐藏 */
+              // text-overflow: ellipsis;
+              // /* 使用省略号表示被隐藏的文本 */
               color: #000;
             }
           }
@@ -351,7 +355,7 @@
               // /* 将超出文本隐藏 */
               // text-overflow: ellipsis;
               // /* 使用省略号表示被隐藏的文本 */
-              // color: #000;
+              color: #000;
             }
           }
         }
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index f357b93..6fb1662 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -235,7 +235,6 @@
       address.area_name?str+=address.area_name:null;
       address.street_name?str+=address.street_name:null;
       address.village_name?str+=address.village_name:null;
-      address.brigade_name?str+=address.brigade_name:null;
       return str;
 		}
 	},
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 160fd90..d600184 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -103,23 +103,23 @@
     data() {
       return {
         formData: {
-          account: '17685151643', //账号
+          account: '', //账号
           password: '123456', //密码
           password_confirm: '', //确认密码
           // channel: 6, //注册渠道[1-微信小程序 2-微信公众号 3-手机H5 4-电脑PC 5-苹果APP 6-安卓APP]
-          id_card: '522636199812121212',
+          id_card: '',
           is_captain: '',// 队长标识
           sex: '',
-          avatar: 'sdgdgxgxfxxxfg',
-          nickname: 'dddd',
-          address: '测试地址',
+          avatar: '',
+          nickname: '',
+          address: '',
           qualification: {
-            id_card: "sdgsdgds",
-            id_card_b: "sdgdsgdsg",
-            car_card: "sdgsd",
-            car_card_b: "gsdgds",
-            bank_account: "sdgdsgsd",
-            bank_account_b: "sdgsdgdg"
+            id_card: "",
+            id_card_b: "",
+            car_card: "",
+            car_card_b: "",
+            bank_account: "",
+            bank_account_b: ""
           },
         },
         rules: {
@@ -228,7 +228,7 @@
               title: "添加成功",
               success: () => {
                 setTimeout(() => {
-                  // uni.navigateBack()
+                  uni.navigateBack()
                 }, 1000)
               }
             })
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index eca2eb6..3b33aa6 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -23,14 +23,18 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
+                  <view class="location">{{ (item.street_name||'')+(item.village_name||'') }}</view>
                 </view>
               </view>
-              <view class="company">
-                <text>
+              <view class="info_bottom">
+                <text class="item phone">
                   所属公司:
                 </text>
-                <view class="itm" v-if="item.company">{{item.company.company_name}}</view>
+                <view class="item" v-if="item.company">
+                  <view class="location">
+                    {{item.company.company_name}}
+                  </view>
+                </view>
               </view>
             </view>
           </view>
@@ -223,7 +227,7 @@
 
               .item {
                 display: flex;
-                align-items: center;
+                align-items: flex-start;
               }
 
               .phone {
@@ -232,12 +236,12 @@
 
               .location {
                 width: 350rpx;
-                white-space: nowrap;
-                /* 不换行 */
-                overflow: hidden;
-                /* 将超出文本隐藏 */
-                text-overflow: ellipsis;
-                /* 使用省略号表示被隐藏的文本 */
+                // white-space: nowrap;
+                // /* 不换行 */
+                // overflow: hidden;
+                // /* 将超出文本隐藏 */
+                // text-overflow: ellipsis;
+                // /* 使用省略号表示被隐藏的文本 */
                 color: #000;
               }
             }
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index dd9df62..93a577f 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -37,7 +37,8 @@
 						</view>
 					</view>
 					<view class="bottom">
-						负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}
+						负责区域:<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">
 						<view class="popup">