From 708b2452b414befb50911960ea54e519cf1d495c Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 31 Jul 2023 14:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug,=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/newPersonnel/newPersonnel.vue | 44 ++++++++++------------------
 subpkg/personnel/personnel.vue       | 10 ++++---
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 29414da..d295faf 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -32,8 +32,8 @@
         <u-form-item labelWidth="auto" label="确认密码" prop="formData.name" borderBottom>
           <u--input v-model="formData.password_confirm" placeholder="不输入密码则默认为手机号" password></u--input>
         </u-form-item> -->
-        <view class="title">地区信息</view>
-        <districtSelector ref="districtSelectorRef"></districtSelector>
+        <!-- <view class="title">地区信息</view> -->
+        <districtSelector style="margin-top: 30rpx;" ref="districtSelectorRef"></districtSelector>
         <view class="title">资质信息</view>
         <u-form-item label="身份证正面" required labelPosition="top" labelWidth="200rpx" prop="qualification.id_card"
           borderBottom>
@@ -49,20 +49,6 @@
             width="638rpx" height="300rpx" style="margin-top: 10rpx;">
           </u-upload>
         </u-form-item>
-        <u-form-item label="驾驶证正面" required labelPosition="top" labelWidth="200rpx" prop="qualification.car_card"
-          borderBottom>
-          <u-upload :fileList="formData.qualification.car_card?[{url:formData.qualification.car_card}]:[]"
-            @afterRead="afterRead" @delete="formData.qualification.car_card=''" name="car_card" :maxCount="1"
-            width="638rpx" height="300rpx" style="margin-top: 10rpx;">
-          </u-upload>
-        </u-form-item>
-        <u-form-item label="驾驶证反面" required labelPosition="top" labelWidth="200rpx" prop="qualification.car_card_b"
-          borderBottom>
-          <u-upload :fileList="formData.qualification.car_card_b?[{url:formData.qualification.car_card_b}]:[]"
-            @afterRead="afterRead" @delete="formData.qualification.car_card_b=''" name="car_card_b" :maxCount="1"
-            width="638rpx" height="300rpx" style="margin-top: 10rpx;">
-          </u-upload>
-        </u-form-item>
         <u-form-item label="银行卡正面" required labelPosition="top" labelWidth="200rpx" prop="qualification.bank_account"
           borderBottom>
           <u-upload :fileList="formData.qualification.bank_account?[{url:formData.qualification.bank_account}]:[]"
@@ -77,6 +63,20 @@
             :maxCount="1" width="638rpx" height="300rpx" style="margin-top: 10rpx;">
           </u-upload>
         </u-form-item>
+        <u-form-item label="驾驶证正面" labelPosition="top" labelWidth="200rpx"
+          borderBottom>
+          <u-upload :fileList="formData.qualification.car_card?[{url:formData.qualification.car_card}]:[]"
+            @afterRead="afterRead" @delete="formData.qualification.car_card=''" name="car_card" :maxCount="1"
+            width="638rpx" height="300rpx" style="margin-top: 10rpx;">
+          </u-upload>
+        </u-form-item>
+        <u-form-item label="驾驶证反面" labelPosition="top" labelWidth="200rpx"
+          borderBottom>
+          <u-upload :fileList="formData.qualification.car_card_b?[{url:formData.qualification.car_card_b}]:[]"
+            @afterRead="afterRead" @delete="formData.qualification.car_card_b=''" name="car_card_b" :maxCount="1"
+            width="638rpx" height="300rpx" style="margin-top: 10rpx;">
+          </u-upload>
+        </u-form-item>
       </u--form>
       <button @click="addAcountNum" type="primary" class="btn">创建</button>
     </view>
@@ -154,18 +154,6 @@
             message: '不能为空',
             trigger: ['change', 'blur']
           },
-          'qualification.car_card': {
-            type: 'string',
-            required: true,
-            message: '不能为空',
-            trigger: ['change', 'blur']
-          },
-          'qualification.car_card_b': {
-            type: 'string',
-            required: true,
-            message: '不能为空',
-            trigger: ['change', 'blur']
-          },
           'qualification.bank_account': {
             type: 'string',
             required: true,
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 2ce0730..b73c5c5 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -15,17 +15,17 @@
             </view>
             <view class="right">
               <view class="info_top">
-                <view class="info_name">{{item.name}}</view>
-                <view>{{item.company.company_name}}</view>
+                <view class="info_name">{{item.nickname}}</view>
+                <view v-if="item.company">{{item.company.company_name}}</view>
               </view>
               <view class="info_bottom">
                 <view class="item phone">
                   <uni-icons type="phone" color="#999999FF"></uni-icons>
-                  {{item.phone}}
+                  {{item.phone||item.account}}
                 </view>
                 <view class="item">
                   <uni-icons type="location" color="#999999FF"></uni-icons>
-                  <view class="location">{{item.city_name+item.area_name+item.street_name}}</view>
+                  <view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
                 </view>
               </view>
             </view>
@@ -111,6 +111,8 @@ export default {
   flex-direction: column;
   align-items: center;
   .new_btn{
+    position: fixed;
+    bottom: 30rpx;
     margin-top: 32rpx;
     // margin-bottom: 40rpx;
     width: 694rpx;