Browse Source

Merge branch 'need_pool291' into debug

shanbinzhang 1 week ago
parent
commit
019896da74

+ 1 - 1
pages-approve/seal/addSeal.vue

@@ -555,7 +555,7 @@
 		}
 		.van-checkbox{
 			margin-bottom: 30rpx;
-			width: 200rpx;
+			width: 300rpx;
 			margin-left: auto;
 			margin-right: auto;
 		}

+ 2 - 2
pages-approve/seal/detail.vue

@@ -286,7 +286,7 @@
 				purposeArr: ["销售合同", "代付合同", "总对总协议", "渠道合同", "付款通知函", "招投标", "战略合作协议"],
 
 				showType:false,//显示用印用途选项
-				typeArr:['合同章','公章','法人章'],
+				typeArr:['合同章','公章','法人章',"电子合同章"],
 				temType: [], //临时存放选择的用印用途
 
 				showCustome:false,//显示搜索客户名称
@@ -1044,7 +1044,7 @@
 		}
 		.van-checkbox{
 			margin-bottom: 30rpx;
-			width: 200rpx;
+			width: 300rpx;
 			margin-left: auto;
 			margin-right: auto;
 		}

+ 1 - 1
pages-approve/seal/edit.vue

@@ -586,7 +586,7 @@
 		}
 		.van-checkbox{
 			margin-bottom: 30rpx;
-			width: 200rpx;
+			width: 300rpx;
 			margin-left: auto;
 			margin-right: auto;
 		}

+ 1 - 0
pages-approve/seal/list.vue

@@ -175,6 +175,7 @@
 								ContractApprovalId:item.ContractApprovalId||0,
 								ContractApprovalRecordId:item.ContractApprovalRecordId||0,
 								SealId:item.SealId||0,
+								AffiliatedCompany:item.AffiliatedCompany,
 								type:'seal'
 							}
 						})