From c37777901b8afcb50784a96469d1d1e5f601f5d5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 24 Jul 2023 16:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81\=E9=A9=BE=E9=A9=B6=E8=AF=81\?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E4=B8=BA=E7=A9=BA=E6=97=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/personnel/personnel.vue               | 45 ++------------------
 subpkg/personnelDetails/personnelDetails.vue | 36 ++++++++--------
 2 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 3a96ada..b49cca1 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -36,9 +36,9 @@
               <!-- <text class="green">管理人</text> -->
             </view>
             <view class="bottom">
-              <view><image :src="item.qualification.id_card?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>身份证</view>
-              <view><image :src="item.qualification.car_card?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>驾驶证</view>
-              <view><image :src="item.qualification.bank_account?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>银行卡</view>
+              <view><image :src="item.qualification&&item.qualification.id_card?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>身份证</view>
+              <view><image :src="item.qualification&&item.qualification.car_card?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>驾驶证</view>
+              <view><image :src="item.qualification&&item.qualification.bank_account?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>银行卡</view>
             </view>
           </view>
           <u-line color="#999999FF"></u-line>
@@ -48,45 +48,6 @@
         </view>
       </block>
       <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-      <!-- <view class="personnel_item">
-        <view class="type type_blue">
-          <image src="../../static/icons/ok_w.png"></image>
-          <text>已签约</text>
-        </view>
-        <view class="top">
-          <view class="left">
-            <u--image class="u_avatar" :showLoading="true" src="../../static/img/public/man.png" width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
-          </view>
-          <view class="right">
-            <view class="info_top">
-              <view class="info_name">人员名称</view>
-              <view>隶属乡镇公司名称</view>
-            </view>
-            <view class="info_bottom">
-              <view class="item phone">
-                <uni-icons type="phone" color="#999999FF"></uni-icons>
-                13546841564
-              </view>
-              <view class="item">
-                <uni-icons type="location" color="#999999FF"></uni-icons>
-                通滩镇
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="center">
-          <view class="top">小组服务团队：<text class="green">管理人</text></view>
-          <view class="bottom">
-            <view><image src="../../static/icons/ok.png"></image>身份证</view>
-            <view><image src="../../static/icons/ok.png"></image>驾驶证</view>
-            <view><image src="../../static/icons/err.png"></image>银行卡</view>
-          </view>
-        </view>
-        <u-line color="#999999FF"></u-line>
-        <view class="bottom" style="margin-top: 28rpx;">
-          <button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails')">查看</button>
-        </view>
-      </view> -->
     </view>
   </view>
 </template>
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 1b0e632..33975f3 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -34,29 +34,29 @@
         <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.id_card" 
-              @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 0)">
+            <image :src="userInfo.qualification&&userInfo.qualification.id_card" 
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 0)">
             </image>
-            <image :src="userInfo.qualification.id_card_b"
-              @click="previewImg([userInfo.qualification.id_card,userInfo.qualification.id_card_b], 1)"></image>
+            <image :src="userInfo.qualification&&userInfo.qualification.id_card_b"
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.id_card,userInfo.qualification&&userInfo.qualification.id_card_b], 1)"></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.car_card"
-              @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 0)"></image>
-            <image :src="userInfo.qualification.car_card_b"
-              @click="previewImg([userInfo.qualification.car_card,userInfo.qualification.car_card_b], 1)"></image>
+            <image :src="userInfo.qualification&&userInfo.qualification.car_card"
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)"></image>
+            <image :src="userInfo.qualification&&userInfo.qualification.car_card_b"
+              @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 1)"></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.bank_account"
-              @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 0)"></image>
-            <image :src="userInfo.qualification.bank_account_b"
-              @click="previewImg([userInfo.qualification.bank_account,userInfo.qualification.bank_account_b], 1)"></image>
+            <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>
@@ -70,21 +70,21 @@
           <view class="c_text">性别：{{userInfo.sex==1?'男':'女'}}</view>
           <view class="c_text">身份证号码：{{userInfo.id_card}}</view>
           <view class="c_text">联系电话：{{userInfo.phone}}</view>
-          <view class="c_text">合同类型：{{userInfo.contract.contract_type_name}}</view>
-          <view class="c_text">合同编号：{{userInfo.contract.contract_no}}</view>
-          <u-line v-if="userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;"></u-line>
-          <view v-if="userInfo.contract.file" class="contract_box">
+          <view class="c_text">合同类型：{{userInfo.contract&&userInfo.contract.contract_type_name}}</view>
+          <view class="c_text">合同编号：{{userInfo.contract&&userInfo.contract.contract_no}}</view>
+          <u-line v-if="userInfo.contract&&userInfo.contract.file" color="#999999FF" style="margin: 31rpx 0;"></u-line>
+          <view v-if="userInfo.contract&&userInfo.contract.file" class="contract_box">
             <view class="left">
               <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
               <view class="text">
                 <view class="name">合同</view>
                 <view>
-                  <text>{{userInfo.contract.create_time}}</text>
+                  <text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
                 </view>
               </view>
             </view>
             <view class="right"
-              @click="naviTo('/subpkg/pdfView/pdfView?url=' + userInfo.contract.file)">
+              @click="naviTo('/subpkg/pdfView/pdfView?url=' + userInfo.contract&&userInfo.contract.file)">
               <!-- <image class="icon"></image> -->
               <uni-icons type="paperclip" color="#3274F9"></uni-icons>
               <view>查看</view>