更新

components/company/company.vue

@@ -1,14 +1,7 @@
 <template>
   <view>
     <view class="item">
-      <u-skeleton
+      <u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56"></u-skeleton>
-        :loading="skeleton"
-        :animate="true"
-        title
-        rows="1"
-        rows-width="100%"
-        rowsHeight="56"
-      ></u-skeleton>
       <!-- <block v-if="!skeleton">
 				<view class="title">公司基本信息</view>
 				<view class="card">
@@ -36,7 +29,6 @@
 	 -->
       <view class="personnel_list" v-if="!skeleton">
         <view class="cards">
-
           <view class="cards_head">
             <text style="font-size: 32rpx">公司基本信息</text>
           </view>
@@ -59,11 +51,7 @@
                 <text>{{c_address}}</text>
               </view>
             </view>
-
-
-
           </view>
-
           <view class="cards_head">
             <text style="font-size: 32rpx">公司联系人</text>
           </view>
@@ -75,7 +63,7 @@
               </view>
               <view class="" @click="copyPhone(company.master_email, '社会代码')">
                 <text>担任职务 :</text>
-								<text>{{company.organization_code}}</text>
+                <text>{{company.master_position}}</text>
               </view>
               <view class="" @click="copyPhone(company.master_email, '电话')">
                 <text>联系电话 :</text>
@@ -86,21 +74,14 @@
                 <text> {{company.master_email}}</text>
               </view>
             </view>
-
-
-
           </view>
-
-
-
         </view>
       </view>
     </view>
     <!-- 合同 -->
     <view class="item" v-show="skeleton||contract.status">
 
-			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-				rowsHeight="56"></u-skeleton>
 
       <!-- 
 			<block v-if="!skeleton">
@@ -169,7 +150,7 @@
           </view>
 
 
-					<view style="border-top:1px dashed #0022C7;margin:20rpx 0">
+          <view style="border-top:1px dashed #0022C7;margin-bottom:20rpx">
           </view>
 
           <view class="contract" v-if="contract.contract_no">
@@ -241,8 +222,7 @@
 		</view>
  -->
     <view class="item">
-			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
+      <u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56"></u-skeleton>
-				rowsHeight="56"></u-skeleton>
 
       <!-- 
 			<block v-if="!skeleton">
@@ -281,35 +261,30 @@
           <view class="cards_content">
             <view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
               <u--image class="image" @click="priview(company.qualification.business_license)"
-								:src="company.qualification.business_license"
+                :src="company.qualification.business_license" v-if="company.qualification.business_license"
-								v-if="company.qualification.business_license" :lazy-load="true">
+                :lazy-load="true">
                 <template v-slot:loading>
                   <u-loading-icon color="#333"></u-loading-icon>
                 </template>
               </u--image>
+              <view style="border-top:1px dashed #0022C7;margin:20rpx 0">
+              </view>
               <u--image class="image" @click="priview(company.qualification.business_licenseB)"
-								:src="company.qualification.business_licenseB"
+                :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"
-								v-if="company.qualification.business_licenseB" :lazy-load="true">
+                :lazy-load="true">
                 <template v-slot:loading>
                   <u-loading-icon color="#333"></u-loading-icon>
                 </template>
               </u--image>
-							<u--image class="image" v-for="item in company.qualification.other_qualifications"
+              <u--image class="image" v-for="item in company.qualification.other_qualifications" :key="item"
-								:key="item" @click="priview(item)" :src="item"
+                @click="priview(item)" :src="item" v-if="company.qualification.other_qualifications" :lazy-load="true">
-								v-if="company.qualification.other_qualifications" :lazy-load="true">
                 <template v-slot:loading>
                   <u-loading-icon color="#333"></u-loading-icon>
                 </template>
               </u--image>
             </view>
           </view>
-
-
-
         </view>
-
-
-
       </view>
     </view>
 
@@ -334,6 +309,8 @@ import {
     Toast
   } from '@/libs/uniApi.js'
   
+  import {commonBrigade} from "@/api/oaPbulic.js"
+
   export default {
     name: "company",
     data() {
@@ -349,7 +326,9 @@ export default {
         },
         contract: {},
         users: [],
-      current: 1
+        current: 1,
+        brigadeList: [],
+        brigade: ''
       }
     },
     props: ['id', 'type'],
@@ -367,8 +346,8 @@ export default {
         } else {
           this.company?.street_name ? str += this.company?.street_name : null;
           this.company?.village_name ? str += this.company?.village_name : null;
-        this.company?.brigade_name ? str += this.company?.brigade_name : null;
+          // this.company?.brigade_name ? str += this.company?.brigade_name : null;
-
+          this.brigade ? str += this.brigade : null;
         }
         return str;
       }
@@ -391,6 +370,8 @@ export default {
       },
       async initContract(id, type = "contract") {
         let res;
+        res = await commonBrigade();
+        this.brigadeList = res.data;
         //判断是合同还是公司
         if (id && (type == "contract" || type == null)) {
           res = await contractView({
@@ -404,9 +385,18 @@ export default {
           } else {
             res = await companyView();
           }
-
         }
         this.company = res.data.company;
+        if(this.company?.qualification?.other_qualifications&& typeof this.company.qualification.other_qualifications == 'string'){
+          this.company.qualification.other_qualifications = JSON.parse(this.company.qualification.other_qualifications);
+        }
+        let arr = this.company.responsible_area.split(',');
+        let brigade = this.brigadeList.filter(item=>{
+          return arr.find(t=>t==item.id);
+        });
+        brigade.forEach((item)=>{
+          this.brigade+=item.brigade_name??''
+        })
         uni.$emit('companyInfo', this.company); //发送全局事件
         this.user = res.data.user;
         this.contract = res.data.contract;
@@ -726,6 +716,7 @@ export default {
         flex-direction: column;
         align-items: center;
         padding: 28rpx;
+
         .left {
           display: flex;
 
@@ -784,16 +775,17 @@ export default {
     }
 
     .image_box {
+      width: 100%;
       display: flex;
       justify-content: space-between;
       flex-direction: column;
       align-items: center;
-    padding: 28rpx;
 
       .image {
         border-radius: 20rpx;
         overflow: hidden;
         margin-bottom: 28rpx;
+        align-self: center;
 
         image {
           width: 650rpx;

pages/oaExamine/oaExamine.vue

@@ -68,12 +68,6 @@
 
       }
     },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
     onLoad() {
       this.myEventList = []
       // this.getApproveMyList(this.params)

pages/oaLogin/oaLogin.vue

@@ -15,7 +15,7 @@
             <u-tabs
               :list="tabList"
               @click="changeTabs"
-              lineColor="#3274F9"
+              lineColor="#0122c7"
               itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"
             ></u-tabs>
           </view>

pages/oaManager/oaManager.vue

@@ -84,12 +84,6 @@
         areaManagerList: []
       }
     },
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
     onLoad() {},
     onShow() {
       this.loadAreaManager();

subpkg/personnelDetails/personnelDetails.vue

@@ -234,12 +234,6 @@
     download_file
   } from "@/api/junziqian.js"
   export default {
-    onReady() {
-      uni.setNavigationBarColor({
-        frontColor: '#ffffff',
-        backgroundColor: '#3175f9'
-      })
-    },
     data() {
       return {
         id: '',