取消客户审批详情页中审批时间，增加合同有效期

pages-approve/custome/detail.vue

@@ -10,15 +10,14 @@
 				</view>
 				<view class="base-info-list">
 					<block v-for="item in baseInfo">
-						<view :key="item.key" v-if="!item.hidden">
+						<view :key="item.key">
 							<text class="lable">{{ item.key }}：</text>
-							<text :style="{ color: item.color }">
-								{{ item.val }}
-							</text>
+							<text :style="{ color: item.color }">{{ item.val }}</text>
 							<van-tag v-if="item.tag" color="#ECF5FF" text-color="#4A83F1" style="margin-left:5px">
 								{{ item.tag }}
 							</van-tag>
 						</view>
+						<view style="padding-left:140rpx" v-if="item.key==='合同期限'">({{item.val|formateYear}})</view>
 					</block>
 					
 					<view v-if="info && info.CompanyApprovalDetail.ApproveStatus === '驳回'">
@@ -120,10 +119,18 @@
 	import {apiCustomeDetail,apiCustomeContractDetail,apiCustomeApprove} from '@/api/approve/custome.js'
 	import {preViewFile} from '../utils/util.js'
 	import steps from '../components/steps.vue'
+	import {CalculationDate} from '@/utils/calculationDate.js'
 	export default {
 		components:{
 			steps
 		},
+		filters:{
+			formateYear(time){
+				let s=time.replace(/\./g, '-').split('~')[0]
+				let e=time.replace(/\./g, '-').split('~')[1]
+				return `有效期为 ${CalculationDate(s,e)} `;
+			}
+		},
 		computed: {
 			//是否显示客户信息模块
 			showCustomerInfo() {
@@ -297,11 +304,6 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key:"审批时间",
-							val:info.CompanyApprovalDetail.ApproveTime.replace(/-/g, '.'),
-							hidden:info.CompanyApprovalDetail.ApproveStatus==='待审批'
-						},
 						{
 							key: "申请理由",
 							val: info.CompanyApprovalDetail.ApplyReasons || "无",
@@ -335,11 +337,6 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key:"审批时间",
-							val:info.CompanyApprovalDetail.ApproveTime.replace(/-/g, '.'),
-							hidden:info.CompanyApprovalDetail.ApproveStatus==='待审批'
-						},
 						{
 							key: "解冻理由",
 							val: info.CompanyApprovalDetail.ApplyReasons,
@@ -360,11 +357,6 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key:"审批时间",
-							val:info.CompanyApprovalDetail.ApproveTime.replace(/-/g, '.'),
-							hidden:info.CompanyApprovalDetail.ApproveStatus==='待审批'
-						},
 						{
 							key: "申请理由",
 							val: info.CompanyApprovalDetail.ApplyReasons,
@@ -393,11 +385,6 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key:"审批时间",
-							val:info.CompanyApprovalDetail.ApproveTime.replace(/-/g, '.'),
-							hidden:info.CompanyApprovalDetail.ApproveStatus==='待审批'
-						},
 						{
 							key: "申请理由",
 							val: info.CompanyApprovalDetail.ApplyReasons,
@@ -436,11 +423,6 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key:"审批时间",
-							val:info.CompanyApprovalDetail.ApproveTime.replace(/-/g, '.'),
-							hidden:info.CompanyApprovalDetail.ApproveStatus==='待审批'
-						},
 						{
 							key: "申请理由",
 							val: info.CompanyApprovalDetail.ApplyReasons || "无",