From 1524b529280ed94bba90c2222accf70a604a43aa Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 12 Aug 2023 17:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E9=98=9F=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../districtSelector/districtSelectorTow.vue   | 18 +++---------------
 subpkg/captain/captain.vue                     |  3 +--
 subpkg/newPersonnel/newPersonnel.vue           |  4 ++--
 subpkg/personnel/personnel.vue                 |  2 +-
 subpkg/personnelDetails/personnelDetails.vue   | 11 +++++------
 5 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/components/districtSelector/districtSelectorTow.vue b/components/districtSelector/districtSelectorTow.vue
index b2caa71..96b31ed 100644
--- a/components/districtSelector/districtSelectorTow.vue
+++ b/components/districtSelector/districtSelectorTow.vue
@@ -14,17 +14,9 @@
         <u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input>
         <u-icon slot="right" name="arrow-right"></u-icon>
       </u-form-item>
-      <u-form-item v-if="!formDataRead.brigade" label="小队" :required="!readonly" prop="brigade" borderBottom>
-        <u-checkbox-group 
-            placement="row"
-            @change="changeBrigade"
-            >
-        	<view class="box">
-            <view class="box_item" v-for="item in brigadeList" :key="item.id">
-              <u-checkbox style="checkbox" :customStyle="{marginBottom: '12px',marginRight: '12px'}" activeColor="#3175f9" :label="item.brigade_name" :name="item.id"></u-checkbox>
-            </view>
-          </view>
-        </u-checkbox-group>
+      <u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom>
+        <u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input>
+        <u-icon slot="right" name="arrow-right"></u-icon>
       </u-form-item>
     </u--form>
     <u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm"
@@ -161,10 +153,6 @@
         this.changeType = type;
         this.showProvince = true;
       },
-      // 多选小队
-      changeBrigade(e){
-        this.formData.brigade = e;
-      },
       // 选择列表
       changeList() {
         return this[this.changeType + 'List'];
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index b2f532d..153deba 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -47,8 +47,7 @@
                 </text>
                 <view class="item">
                   <view class="location">
-                    <text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
-                    <text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
+                    <text>{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}</text>
                   </view>
                 </view>
               </view>
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 558fb98..122b72f 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -228,8 +228,8 @@
               title: "添加成功",
               success: () => {
                 setTimeout(() => {
-                  uni.$emit('initPersonnel');
-                  uni.navigateBack()
+                  // uni.$emit('initPersonnel');
+                  // uni.navigateBack();
                 }, 1000)
               }
             })
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 6515a69..3f2acdc 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -23,7 +23,7 @@
                   分管片区:
                 </text>
                 <view class="item">
-                  <view class="location">{{ (item.street_name||'')+(item.village_name||'') }}</view>
+                  <view class="location">{{ (item.street_name||'')+(item.village_name||'')+(item.brigade_name||'') }}</view>
                 </view>
               </view>
               <view class="info_bottom">
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index befcabf..f9d9ecb 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -16,18 +16,18 @@
                 <!-- <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
               </view>
               <view class="id_card">
-                <view>身份证号:{{userInfo.id_card}}</view>
+                <view>身份证号：{{userInfo.id_card}}</view>
                 <!-- <view class="update" @click="updateShow(userInfo.id_card, 'id_card')">
                   <uni-icons type="compose" color="#F9AA32"></uni-icons>
                 </view> -->
               </view>
               <view class="phone">
-                联系电话:{{userInfo.phone}}
+                联系电话：{{userInfo.phone}}
               </view>
             </view>
           </view>
           <view class="bottom" style="margin-bottom: 10rpx;display: flex;align-items: center;">
-            是否为小队长:
+            是否为小队长：
             <u-radio-group v-model="userInfo.is_captain" style="margin-left: 16rpx;" disabled>
               <u-radio :customStyle="{marginRight: '16px'}"
                 v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"
@@ -39,14 +39,13 @@
             </view>
           </view>
           <view class="bottom">
-            负责区域:<text>{{(userInfo.street_name||'')+(userInfo.village_name||'')}}</text>
-            <text v-for="(item, index) in userInfo.brigade_name">{{item.brigade_name}}</text>
+            负责区域：<text>{{(userInfo.street_name||'')+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}</text>
           </view>
           <u-popup :show="show.is_captain" :round="10" mode="center">
             <view class="popup">
               <view class="p_title">修改信息</view>
               <view class="p_body">
-                是否为小队长:
+                是否为小队长：
                 <u-radio-group v-model="updateForm.is_captain" style="margin: 16rpx;">
                   <u-radio :customStyle="{marginRight: '16px'}"
                     v-for="(item, index) in [{value:1,label:'是'},{value:0,label:'否'}]" :key="index" :label="item.label"