解决冲突
This commit is contained in:
parent
708122d222
commit
9788a50bfb
@ -34,234 +34,290 @@
|
|||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
-->
|
-->
|
||||||
<view class="personnel_list" v-if="!skeleton">
|
<view class="personnel_list" v-if="!skeleton">
|
||||||
<view class="cards">
|
<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> {{ company.company_name }}</text>
|
|
||||||
</view>
|
|
||||||
<view
|
|
||||||
class=""
|
|
||||||
@click="copyPhone(company.master_email, '社会代码')"
|
|
||||||
>
|
|
||||||
<text>社会代码 :</text>
|
|
||||||
<text>{{ company.organization_code }}</text>
|
|
||||||
</view>
|
|
||||||
<view class="">
|
|
||||||
<text>公司类型 :</text>
|
|
||||||
<text>{{
|
|
||||||
company.company_type_name || company.company_type
|
|
||||||
}}</text>
|
|
||||||
</view>
|
|
||||||
<view class="">
|
|
||||||
<text>负责区域 :</text>
|
|
||||||
<text> {{ c_address }} </text>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view class="item" v-show="skeleton || contract.status">
|
<view class="cards_head">
|
||||||
<u-skeleton
|
<text style="font-size: 32rpx">公司基本信息</text>
|
||||||
:loading="skeleton"
|
</view>
|
||||||
:animate="true"
|
<view class="cards_content">
|
||||||
title
|
<view class="right">
|
||||||
rows="2"
|
<view class="">
|
||||||
rows-width="100%"
|
<text>公司名称 :</text>
|
||||||
rowsHeight="56"
|
<text> {{company.company_name}}</text>
|
||||||
></u-skeleton>
|
</view>
|
||||||
<block v-if="!skeleton">
|
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||||
<view class="title">电子合同</view>
|
<text>社会代码 :</text>
|
||||||
<view class="card">
|
<text>{{company.organization_code}}</text>
|
||||||
<view class="one">
|
</view>
|
||||||
<view class="info">
|
<view class="">
|
||||||
<view class="info_item">甲方:{{ contract.party_a_name }}</view>
|
<text>公司类型 :</text>
|
||||||
<view class="info_item">乙方:{{ contract.party_b_name }}</view>
|
<text>{{company.company_type_name||company.company_type}}</text>
|
||||||
<view class="info_item"
|
</view>
|
||||||
>合同类型:{{ contract.contract_type_name }}</view
|
<view class="">
|
||||||
>
|
<text>负责区域 :</text>
|
||||||
<view class="info_item"
|
<text> {{c_address}} </text>
|
||||||
>合同编号:{{ contract.contract_no }}</view
|
</view>
|
||||||
>
|
</view>
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<u-line
|
|
||||||
v-if="contract.contract_no"
|
</view>
|
||||||
color="#999999FF"
|
|
||||||
style="margin: 31rpx 0"
|
<view class="cards_head">
|
||||||
></u-line>
|
<text style="font-size: 32rpx">公司联系人</text>
|
||||||
<view class="contract" v-if="contract.contract_no">
|
</view>
|
||||||
<view class="left">
|
<view class="cards_content">
|
||||||
<image
|
<view class="right">
|
||||||
class="contract_img"
|
<view class="">
|
||||||
src="../../static/img/contract/pdf.png"
|
<text>法人姓名 :</text>
|
||||||
></image>
|
<text> {{company.master_name}}</text>
|
||||||
<view class="text">
|
</view>
|
||||||
<view class="name">合同</view>
|
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||||
<view>
|
<text>担任职务 :</text>
|
||||||
<!-- <text class="nickname">张郭郭</text> -->
|
<text>{{company.organization_code}}</text>
|
||||||
<text>{{ contract.create_time }}</text>
|
</view>
|
||||||
</view>
|
<view class="" @click="copyPhone(company.master_email, '电话')">
|
||||||
</view>
|
<text>联系电话 :</text>
|
||||||
</view>
|
<text>{{company.master_phone}}</text>
|
||||||
<view class="right" @click="navTo(contract.contract_no)">
|
</view>
|
||||||
<!-- <image class="icon"></image> -->
|
<view class="" @click="copyPhone(company.master_email, '邮箱')">
|
||||||
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
|
<text>电子邮箱 :</text>
|
||||||
<view>查看</view>
|
<text> {{company.master_email}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
|
||||||
</block>
|
|
||||||
</view>
|
|
||||||
<view class="item">
|
</view>
|
||||||
<u-skeleton
|
|
||||||
:loading="skeleton"
|
|
||||||
:animate="true"
|
|
||||||
title
|
</view>
|
||||||
rows="2"
|
</view>
|
||||||
rows-width="100%"
|
</view>
|
||||||
rowsHeight="56"
|
<!-- 合同 -->
|
||||||
></u-skeleton>
|
<view class="item" v-show="skeleton||contract.status">
|
||||||
<block v-if="!skeleton">
|
|
||||||
<view class="title">
|
<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
|
||||||
<text>联系人管理</text>
|
rowsHeight="56"></u-skeleton>
|
||||||
<!-- <view>新增</view> -->
|
|
||||||
</view>
|
<!--
|
||||||
<view class="card">
|
<block v-if="!skeleton">
|
||||||
<view class="one">
|
<view class="title">电子合同</view>
|
||||||
<view class="linkman">
|
<view class="card">
|
||||||
<view
|
<view class="one">
|
||||||
style="
|
<view class="info">
|
||||||
height: 30rpx;
|
<view class="info_item">甲方:{{contract.party_a_name}}</view>
|
||||||
width: 6rpx;
|
<view class="info_item">乙方:{{contract.party_b_name}}</view>
|
||||||
background-color: #3175f9;
|
<view class="info_item">合同类型:{{contract.contract_type_name}}</view>
|
||||||
border-radius: 8rpx;
|
<view class="info_item">合同编号:{{contract.contract_no}}</view>
|
||||||
margin-right: 8rpx;
|
</view>
|
||||||
"
|
</view>
|
||||||
>
|
|
||||||
</view>
|
<u-line v-if="contract.contract_no" color="#999999FF" style="margin: 31rpx 0;"></u-line>
|
||||||
主要联系人
|
|
||||||
</view>
|
<view class="contract" v-if="contract.contract_no">
|
||||||
<view class="info">
|
<view class="left">
|
||||||
<view class="info_item">姓名:{{ company.master_name }}</view>
|
<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
|
||||||
<view class="info_item">职位:{{ company.master_position }}</view>
|
<view class="text">
|
||||||
<view class="info_item" @click="copyPhone(company.master_phone)">
|
<view class="name">合同</view>
|
||||||
联系电话:{{ company.master_phone }}</view
|
<view>
|
||||||
>
|
|
||||||
<view
|
<text>{{contract.create_time}}</text>
|
||||||
class="info_item"
|
</view>
|
||||||
@click="copyPhone(company.master_email, '邮箱')"
|
</view>
|
||||||
>
|
</view>
|
||||||
邮箱:{{ company.master_email }}</view
|
<view class="right" @click="navTo(contract.contract_no)">
|
||||||
>
|
|
||||||
</view>
|
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
|
||||||
</view>
|
<view>查看</view>
|
||||||
<view
|
</view>
|
||||||
class="one"
|
</view>
|
||||||
v-for="(other, index) in company.other_contacts"
|
|
||||||
v-if="other.name != ''"
|
|
||||||
:key="index"
|
</view>
|
||||||
>
|
</block>
|
||||||
<view class="linkman">
|
-->
|
||||||
<view
|
|
||||||
style="
|
|
||||||
height: 30rpx;
|
<view class="personnel_list" v-if="!skeleton">
|
||||||
width: 6rpx;
|
<view class="cards">
|
||||||
background-color: #3175f9;
|
|
||||||
border-radius: 8rpx;
|
<view class="cards_head">
|
||||||
margin-right: 8rpx;
|
<text style="font-size: 32rpx">电子合同</text>
|
||||||
"
|
</view>
|
||||||
>
|
<view class="cards_content">
|
||||||
</view>
|
<view class="right">
|
||||||
其他联系人
|
<view class="">
|
||||||
</view>
|
<text>甲方 :</text>
|
||||||
<view class="info">
|
<text> {{contract.party_a_name}}</text>
|
||||||
<view class="info_item">姓名:{{ other.name }}</view>
|
</view>
|
||||||
<view class="info_item">职位:{{ other.position }}</view>
|
<view class="" @click="copyPhone(company.master_email, '社会代码')">
|
||||||
<view class="info_item" @click="copyPhone(other.phone)"
|
<text>乙方 :</text>
|
||||||
>联系电话:{{ other.phone }}</view
|
<text>{{contract.party_b_name}}</text>
|
||||||
>
|
</view>
|
||||||
<view class="info_item" @click="copyPhone(other.email, '邮箱')"
|
<view class="">
|
||||||
>邮箱:{{ other.email }}</view
|
<text>合同类型 :</text>
|
||||||
>
|
<text>{{contract.contract_type_name}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
<view class="">
|
||||||
</view>
|
<text>合同编号 :</text>
|
||||||
</block>
|
<text> {{contract.contract_no}} </text>
|
||||||
</view>
|
</view>
|
||||||
<view class="item">
|
</view>
|
||||||
<u-skeleton
|
</view>
|
||||||
:loading="skeleton"
|
|
||||||
:animate="true"
|
|
||||||
title
|
<view style="border-top:1px dashed #0022C7;margin:20rpx 0">
|
||||||
rows="2"
|
</view>
|
||||||
rows-width="100%"
|
|
||||||
rowsHeight="56"
|
<view class="contract" v-if="contract.contract_no">
|
||||||
></u-skeleton>
|
<view class="left">
|
||||||
<block v-if="!skeleton">
|
<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
|
||||||
<view class="title">资质信息</view>
|
<view class="text">
|
||||||
<view
|
<view class="name">合同</view>
|
||||||
class="image_box"
|
<view>
|
||||||
style="background-color: #fff; border-radius: 7px 7px 7px 7px"
|
|
||||||
>
|
<text>{{contract.create_time}}</text>
|
||||||
<u--image
|
</view>
|
||||||
class="image"
|
</view>
|
||||||
@click="priview(company.qualification.business_license)"
|
</view>
|
||||||
:src="company.qualification.business_license"
|
<view class="right" @click="navTo(contract.contract_no)">
|
||||||
v-if="company.qualification.business_license"
|
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
|
||||||
:lazy-load="true"
|
<view>查看</view>
|
||||||
>
|
</view>
|
||||||
<template v-slot:loading>
|
</view>
|
||||||
<u-loading-icon color="#333"></u-loading-icon>
|
|
||||||
</template>
|
</view>
|
||||||
</u--image>
|
</view>
|
||||||
<u--image
|
|
||||||
class="image"
|
|
||||||
@click="priview(company.qualification.business_licenseB)"
|
</view>
|
||||||
:src="company.qualification.business_licenseB"
|
<!--
|
||||||
v-if="company.qualification.business_licenseB"
|
<view class="item">
|
||||||
:lazy-load="true"
|
<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
|
||||||
>
|
rowsHeight="56"></u-skeleton>
|
||||||
<template v-slot:loading>
|
<block v-if="!skeleton">
|
||||||
<u-loading-icon color="#333"></u-loading-icon>
|
<view class="title">
|
||||||
</template>
|
<text>联系人管理</text>
|
||||||
</u--image>
|
|
||||||
<u--image
|
</view>
|
||||||
class="image"
|
<view class="card">
|
||||||
v-for="item in company.qualification.other_qualifications"
|
<view class="one">
|
||||||
:key="item"
|
<view class="linkman">
|
||||||
@click="priview(item)"
|
<view
|
||||||
:src="item"
|
style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
|
||||||
v-if="company.qualification.other_qualifications"
|
</view>
|
||||||
:lazy-load="true"
|
主要联系人
|
||||||
>
|
</view>
|
||||||
<template v-slot:loading>
|
<view class="info">
|
||||||
<u-loading-icon color="#333"></u-loading-icon>
|
<view class="info_item">姓名:{{company.master_name}}</view>
|
||||||
</template>
|
<view class="info_item">职位:{{company.master_position}}</view>
|
||||||
</u--image>
|
<view class="info_item" @click="copyPhone(company.master_phone)">
|
||||||
<!-- <u--image class="image" v-for="item in company.qualification.bank_account" :key="item" @click="priview(item)"
|
联系电话:{{company.master_phone}}</view>
|
||||||
:src="item" v-if="company.qualification.bank_account" :lazy-load="true">
|
<view class="info_item" @click="copyPhone(company.master_email, '邮箱')">
|
||||||
<template v-slot:loading>
|
邮箱:{{company.master_email}}</view>
|
||||||
<u-loading-icon color="#333"></u-loading-icon>
|
</view>
|
||||||
</template>
|
</view>
|
||||||
</u--image>
|
<view class="one" v-for="(other, index) in company.other_contacts" v-if="other.name!=''"
|
||||||
<u--image class="image" v-for="item in company.qualification.bank_accountB" :key="item" @click="priview(item)"
|
:key="index">
|
||||||
:src="item" v-if="company.qualification.bank_accountB" :lazy-load="true">
|
<view class="linkman">
|
||||||
<template v-slot:loading>
|
<view
|
||||||
<u-loading-icon color="#333"></u-loading-icon>
|
style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 8rpx;margin-right: 8rpx;">
|
||||||
</template>
|
</view>
|
||||||
</u--image> -->
|
其他联系人
|
||||||
</view>
|
</view>
|
||||||
</block>
|
<view class="info">
|
||||||
</view>
|
<view class="info_item">姓名:{{other.name}}</view>
|
||||||
</view>
|
<view class="info_item">职位:{{other.position}}</view>
|
||||||
|
<view class="info_item" @click="copyPhone(other.phone)">联系电话:{{other.phone}}</view>
|
||||||
|
<view class="info_item" @click="copyPhone(other.email, '邮箱')">邮箱:{{other.email}}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</block>
|
||||||
|
|
||||||
|
</view>
|
||||||
|
-->
|
||||||
|
<view class="item">
|
||||||
|
<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%"
|
||||||
|
rowsHeight="56"></u-skeleton>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
<block v-if="!skeleton">
|
||||||
|
<view class="title">资质信息</view>
|
||||||
|
<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>
|
||||||
|
</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>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -401,9 +457,8 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.personnel_list {
|
.personnel_list {
|
||||||
padding: 28rpx 0;
|
padding: 28rpx 0;
|
||||||
margin-bottom: 130rpx;
|
|
||||||
|
|
||||||
.cards {
|
.cards {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
@ -454,27 +509,95 @@ export default {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
view {
|
view {
|
||||||
text:nth-child(2) {
|
margin-bottom: 10rpx;
|
||||||
margin-left: 20rpx;
|
|
||||||
}
|
text:nth-child(2) {
|
||||||
}
|
margin-left: 20rpx;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.u_avatar {
|
.u_avatar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
|
|
||||||
transform: translate(-50%, -50%);
|
transform: translate(-50%, -50%);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.item {
|
.contract {
|
||||||
padding: 32rpx 28rpx;
|
display: flex;
|
||||||
padding-top: 0;
|
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-top: 0;
|
||||||
|
|
||||||
&:nth-child(1) {
|
&:nth-child(1) {
|
||||||
padding-top: 32rpx;
|
padding-top: 32rpx;
|
||||||
@ -590,6 +713,19 @@ export default {
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.image_box {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
padding: 28rpx;
|
||||||
.left {
|
.left {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user