解决冲突

components/company/company.vue

@@ -36,6 +36,7 @@
 	 -->
 			<view class="personnel_list" v-if="!skeleton">
 				<view class="cards">
+
 					<view class="cards_head">
 						<text style="font-size: 32rpx">公司基本信息</text>
 					</view>
@@ -45,38 +46,63 @@
 								<text>公司名称 :</text>
 								<text> {{company.company_name}}</text>
 							</view>
-              <view
+							<view class="" @click="copyPhone(company.master_email, '社会代码')">
-                class=""
-                @click="copyPhone(company.master_email, '社会代码')"
-              >
 								<text>社会代码 :</text>
 								<text>{{company.organization_code}}</text>
 							</view>
 							<view class="">
 								<text>公司类型 :</text>
-                <text>{{
+								<text>{{company.company_type_name||company.company_type}}</text>
-                  company.company_type_name || company.company_type
-                }}</text>
 							</view>
 							<view class="">
 								<text>负责区域 :</text>
 								<text> {{c_address}} </text>
 							</view>
 						</view>
+
+
+
 					</view>
+
+					<view class="cards_head">
+						<text style="font-size: 32rpx">公司联系人</text>
 					</view>
+					<view class="cards_content">
+						<view class="right">
+							<view class="">
+								<text>法人姓名 :</text>
+								<text> {{company.master_name}}</text>
+							</view>
+							<view class="" @click="copyPhone(company.master_email, '社会代码')">
+								<text>担任职务 :</text>
+								<text>{{company.organization_code}}</text>
+							</view>
+							<view class="" @click="copyPhone(company.master_email, '电话')">
+								<text>联系电话 :</text>
+								<text>{{company.master_phone}}</text>
+							</view>
+							<view class="" @click="copyPhone(company.master_email, '邮箱')">
+								<text>电子邮箱 :</text>
+								<text> {{company.master_email}}</text>
 							</view>
 						</view>
 
+
+
+					</view>
+
+
+
+				</view>
+			</view>
+		</view>
+		<!-- 合同 -->
 		<view class="item" v-show="skeleton||contract.status">
-      <u-skeleton
+
-        :loading="skeleton"
+			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
-        :animate="true"
+				rowsHeight="56"></u-skeleton>
-        title
+
-        rows="2"
+			<!-- 
-        rows-width="100%"
-        rowsHeight="56"
-      ></u-skeleton>
 			<block v-if="!skeleton">
 				<view class="title">电子合同</view>
 				<view class="card">
@@ -84,68 +110,104 @@
 						<view class="info">
 							<view class="info_item">甲方：{{contract.party_a_name}}</view>
 							<view class="info_item">乙方：{{contract.party_b_name}}</view>
-              <view class="info_item"
+							<view class="info_item">合同类型：{{contract.contract_type_name}}</view>
-                >合同类型：{{ contract.contract_type_name }}</view
+							<view class="info_item">合同编号：{{contract.contract_no}}</view>
-              >
-              <view class="info_item"
-                >合同编号：{{ contract.contract_no }}</view
-              >
 						</view>
 					</view>
-          <u-line
+
-            v-if="contract.contract_no"
+					<u-line v-if="contract.contract_no" color="#999999FF" style="margin: 31rpx 0;"></u-line>
-            color="#999999FF"
+
-            style="margin: 31rpx 0"
-          ></u-line>
 					<view class="contract" v-if="contract.contract_no">
 						<view class="left">
-              <image
+							<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
-                class="contract_img"
-                src="../../static/img/contract/pdf.png"
-              ></image>
 							<view class="text">
 								<view class="name">合同</view>
 								<view>
-                  <!-- <text class="nickname">张郭郭</text> -->
+
 									<text>{{contract.create_time}}</text>
 								</view>
 							</view>
 						</view>
 						<view class="right" @click="navTo(contract.contract_no)">
-              <!-- <image class="icon"></image> -->
+
 							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
 							<view>查看</view>
 						</view>
 					</view>
+
+
 				</view>
 			</block>
+ -->
+
+
+			<view class="personnel_list" v-if="!skeleton">
+				<view class="cards">
+
+					<view class="cards_head">
+						<text style="font-size: 32rpx">电子合同</text>
 					</view>
+					<view class="cards_content">
+						<view class="right">
+							<view class="">
+								<text>甲方 :</text>
+								<text> {{contract.party_a_name}}</text>
+							</view>
+							<view class="" @click="copyPhone(company.master_email, '社会代码')">
+								<text>乙方 :</text>
+								<text>{{contract.party_b_name}}</text>
+							</view>
+							<view class="">
+								<text>合同类型 :</text>
+								<text>{{contract.contract_type_name}}</text>
+							</view>
+							<view class="">
+								<text>合同编号 :</text>
+								<text> {{contract.contract_no}} </text>
+							</view>
+						</view>
+					</view>
+
+
+					<view style="border-top:1px dashed #0022C7;margin:20rpx 0">
+					</view>
+
+					<view class="contract" v-if="contract.contract_no">
+						<view class="left">
+							<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
+							<view class="text">
+								<view class="name">合同</view>
+								<view>
+
+									<text>{{contract.create_time}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="right" @click="navTo(contract.contract_no)">
+							<uni-icons type="paperclip" color="#3274F9"></uni-icons>
+							<view>查看</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+
+		</view>
+		<!-- 
 		<view class="item">
-      <u-skeleton
+			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
-        :loading="skeleton"
+				rowsHeight="56"></u-skeleton>
-        :animate="true"
-        title
-        rows="2"
-        rows-width="100%"
-        rowsHeight="56"
-      ></u-skeleton>
 			<block v-if="!skeleton">
 				<view class="title">
 					<text>联系人管理</text>
-          <!-- <view>新增</view> -->
+
 				</view>
 				<view class="card">
 					<view class="one">
 						<view class="linkman">
 							<view
-                style="
+								style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
-                  height: 30rpx;
-                  width: 6rpx;
-                  background-color: #3175f9;
-                  border-radius: 8rpx;
-                  margin-right: 8rpx;
-                "
-              >
 							</view>
 							主要联系人
 						</view>
@@ -153,114 +215,108 @@
 							<view class="info_item">姓名：{{company.master_name}}</view>
 							<view class="info_item">职位：{{company.master_position}}</view>
 							<view class="info_item" @click="copyPhone(company.master_phone)">
-                联系电话：{{ company.master_phone }}</view
+								联系电话：{{company.master_phone}}</view>
-              >
+							<view class="info_item" @click="copyPhone(company.master_email, '邮箱')">
-              <view
+								邮箱：{{company.master_email}}</view>
-                class="info_item"
-                @click="copyPhone(company.master_email, '邮箱')"
-              >
-                邮箱：{{ company.master_email }}</view
-              >
 						</view>
 					</view>
-          <view
+					<view class="one" v-for="(other, index) in company.other_contacts" v-if="other.name!=''"
-            class="one"
+						:key="index">
-            v-for="(other, index) in company.other_contacts"
-            v-if="other.name != ''"
-            :key="index"
-          >
 						<view class="linkman">
 							<view
-                style="
+								style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
-                  height: 30rpx;
-                  width: 6rpx;
-                  background-color: #3175f9;
-                  border-radius: 8rpx;
-                  margin-right: 8rpx;
-                "
-              >
 							</view>
 							其他联系人
 						</view>
 						<view class="info">
 							<view class="info_item">姓名：{{other.name}}</view>
 							<view class="info_item">职位：{{other.position}}</view>
-              <view class="info_item" @click="copyPhone(other.phone)"
+							<view class="info_item" @click="copyPhone(other.phone)">联系电话：{{other.phone}}</view>
-                >联系电话：{{ other.phone }}</view
+							<view class="info_item" @click="copyPhone(other.email, '邮箱')">邮箱：{{other.email}}</view>
-              >
-              <view class="info_item" @click="copyPhone(other.email, '邮箱')"
-                >邮箱：{{ other.email }}</view
-              >
 						</view>
 					</view>
 				</view>
 			</block>
+
 		</view>
+ -->
 		<view class="item">
-      <u-skeleton
+			<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
-        :loading="skeleton"
+				rowsHeight="56"></u-skeleton>
-        :animate="true"
+
-        title
+			<!-- 
-        rows="2"
-        rows-width="100%"
-        rowsHeight="56"
-      ></u-skeleton>
 			<block v-if="!skeleton">
 				<view class="title">资质信息</view>
-        <view
+				<view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
-          class="image_box"
+					<u--image class="image" @click="priview(company.qualification.business_license)"
-          style="background-color: #fff; border-radius: 7px 7px 7px 7px"
+						:src="company.qualification.business_license" v-if="company.qualification.business_license"
-        >
+						:lazy-load="true">
-          <u--image
-            class="image"
-            @click="priview(company.qualification.business_license)"
-            :src="company.qualification.business_license"
-            v-if="company.qualification.business_license"
-            :lazy-load="true"
-          >
 						<template v-slot:loading>
 							<u-loading-icon color="#333"></u-loading-icon>
 						</template>
 					</u--image>
-          <u--image
+					<u--image class="image" @click="priview(company.qualification.business_licenseB)"
-            class="image"
+						:src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"
-            @click="priview(company.qualification.business_licenseB)"
+						:lazy-load="true">
-            :src="company.qualification.business_licenseB"
-            v-if="company.qualification.business_licenseB"
-            :lazy-load="true"
-          >
 						<template v-slot:loading>
 							<u-loading-icon color="#333"></u-loading-icon>
 						</template>
 					</u--image>
-          <u--image
+					<u--image class="image" v-for="item in company.qualification.other_qualifications" :key="item"
-            class="image"
+						@click="priview(item)" :src="item" v-if="company.qualification.other_qualifications"
-            v-for="item in company.qualification.other_qualifications"
+						:lazy-load="true">
-            :key="item"
-            @click="priview(item)"
-            :src="item"
-            v-if="company.qualification.other_qualifications"
-            :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.bank_account" :key="item" @click="priview(item)"
-            :src="item" v-if="company.qualification.bank_account" :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.bank_accountB" :key="item" @click="priview(item)"
-            :src="item" v-if="company.qualification.bank_accountB" :lazy-load="true">
-            <template v-slot:loading>
-              <u-loading-icon color="#333"></u-loading-icon>
-            </template>
-          </u--image> -->
 				</view>
 			</block>
+ -->
+			<view class="personnel_list" v-if="!skeleton">
+				<view class="cards">
+
+					<view class="cards_head">
+						<text style="font-size: 32rpx">公司资质信息</text>
 					</view>
+					<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"
+								v-if="company.qualification.business_license" :lazy-load="true">
+								<template v-slot:loading>
+									<u-loading-icon color="#333"></u-loading-icon>
+								</template>
+							</u--image>
+							<u--image class="image" @click="priview(company.qualification.business_licenseB)"
+								:src="company.qualification.business_licenseB"
+								v-if="company.qualification.business_licenseB" :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"
+								:key="item" @click="priview(item)" :src="item"
+								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>
+
+	</view>
+
+
+
 	</view>
 </template>
 
@@ -403,7 +459,6 @@ export default {
 <style lang="scss" scoped>
 	.personnel_list {
 		padding: 28rpx 0;
-  margin-bottom: 130rpx;
 
   .cards {
     margin: 0 auto;
@@ -455,8 +510,11 @@ export default {
         justify-content: space-between;
 
 					view {
+						margin-bottom: 10rpx;
+
 						text:nth-child(2) {
 							margin-left: 20rpx;
+
 						}
 					}
 				}
@@ -470,10 +528,75 @@ export default {
 				transform: translate(-50%, -50%);
 			}
 		}
+
+		.contract {
+			display: flex;
+			justify-content: space-between;
+			padding: 0 30rpx 20rpx 30rpx;
+
+			.left {
+				display: flex;
+
+				.contract_img {
+					width: 102rpx;
+					height: 102rpx;
+					background: #F5F5F5;
+					border-radius: 14rpx 14rpx 14rpx 14rpx;
+					margin-right: 21rpx;
+				}
+
+				.text {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.name {
+						font-size: 32rpx;
+						;
+						font-weight: 500;
+						color: rgba(0, 0, 0, 0.8);
+						line-height: 35rpx;
+					}
+
+					.nickname {
+						margin-right: 35rpx;
+					}
+
+					text {
+						height: 39rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #666666;
+						line-height: 35rpx;
+					}
+				}
+			}
+
+			.right {
+				font-size: 28rpx;
+				font-weight: 500;
+				color: $theme-oa-color;
+				line-height: 35rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.icon {
+					width: 35rpx;
+					height: 39rpx;
+					background-color: $theme-oa-color;
+					opacity: 1;
+					margin-right: 10rpx
+				}
+			}
+		}
+
+
+
 	}
 
 	.item {
-  padding: 32rpx 28rpx;
+
 		padding-top: 0;
 
   &:nth-child(1) {
@@ -590,6 +713,19 @@ export default {
       display: flex;
       justify-content: space-between;
 
+
+
+		}
+
+
+
+
+		.image_box {
+			display: flex;
+			justify-content: space-between;
+			flex-direction: column;
+			align-items: center;
+			padding: 28rpx;
       .left {
         display: flex;