Merge branch 'CD_techPool_93'

pages-approve/components/approveListItem.vue

@@ -6,7 +6,11 @@
 		</view>
 		<view class="message-content">
 			<view class="info">申请销售：{{data.saller}}</view>
-			<view class="info">申请类型：{{data.applyType}}</view>
+			<view class="info">
+				<text>申请类型：{{data.applyType}}</text>
+				<van-tag type="warning" color="#f59a23" plain v-show="data.contractSourceTag"
+				style="margin-left:24rpx ;">{{data.contractSourceTag}}</van-tag>
+			</view>
 			<view class="info" v-if="data.status==='待审批'||data.status==='处理中'">提交时间：{{data.submitTime|formatTime}}</view>
 			<view class="info" v-if="data.status==='已审批'||data.status==='已驳回'">审批时间：{{data.approveTime|formatTime}}</view>
 			<view class="info" v-if="data.status==='已撤回'">撤回时间：{{data.backTime|formatTime}}</view>
@@ -34,6 +38,7 @@
 			 * {title:标题,
 			 * saller:申请销售,
 			 * applyType:申请类型,
+			 * contractSourceTag:合同类型,
 			 * submitTime:提交时间,
 			 * approveTime:审批时间,
 			 * backTime:撤回时间,

pages-approve/custome/detail.vue

@@ -13,6 +13,15 @@
 					>
 						第{{ info.CompanyApprovalDetail.ApprovalCount }}次申请
 					</van-tag>
+					<van-tag
+						type="warning" 
+						color="#f59a23" 
+						plain
+						style="margin-left: 24rpx;font-weight: normal;"
+						v-if="info.CompanyApprovalDetail.ContractSourceTag"
+					>
+						{{ info.CompanyApprovalDetail.ContractSourceTag }}
+					</van-tag>
 				</view>
 				<view class="base-info-list">
 					<block v-for="item in baseInfo">
@@ -319,10 +328,10 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key: "申请理由",
-							val: info.CompanyApprovalDetail.ApplyReasons || "无",
-						},
+						// {
+						// 	key: "申请理由",
+						// 	val: info.CompanyApprovalDetail.ApplyReasons || "无",
+						// },
 					];
 				}
 
@@ -438,10 +447,10 @@
 							key: "申请时间",
 							val: info.CompanyApprovalDetail.ApprovalTime.replace(/-/g, '.'),
 						},
-						{
-							key: "申请理由",
-							val: info.CompanyApprovalDetail.ApplyReasons || "无",
-						},
+						// {
+						// 	key: "申请理由",
+						// 	val: info.CompanyApprovalDetail.ApplyReasons || "无",
+						// },
 					];
 				}
 

pages-approve/custome/list.vue

@@ -131,6 +131,7 @@
 								cancelTime:'',
 								status:item.ApproveStatus==='驳回'?'已驳回':item.ApproveStatus,
 								applyType:applyType,
+								contractSourceTag:item.ContractSourceTag,
 								id:item.CompanyApprovalId,
 								type:'custome'
 							}