Kaynağa Gözat

bug修改,上传回签附件增加word文件类型

jwyu 3 yıl önce
ebeveyn
işleme
e4a70966d3

+ 3 - 2
pages-approve/components/steps.vue

@@ -27,7 +27,7 @@
 			</view>
 		</view>
 	</view>
-	<van-popup :show="show" @close="show=false" position="bottom" round>
+	<van-popup :show="show" @close="show=false" position="bottom" round custom-style="height: 50%;">
 			<div class="alluser-wrap flex">
 				<view class="avatar" v-for="item in temUser" :key="item.ApproveUserName">
 					{{item.ApproveUserName.slice(-2)}}
@@ -116,7 +116,7 @@
 	.alluser-wrap{
 		flex-wrap: wrap;
 		padding: 20px;
-		min-height: 50vh;
+		// min-height: 50vh;
 		.avatar{
 			padding: 0 16rpx;
 			color: #fff;
@@ -126,6 +126,7 @@
 			line-height: 74rpx;
 			position: relative;
 			margin-right: 20rpx;
+			margin-bottom: 50rpx;
 			.whole-name{
 				position: absolute;
 				top: 105%;

+ 4 - 5
pages-approve/contract/detail.vue

@@ -144,7 +144,6 @@
 </template>
 
 <script>
-	
 	import {apiContractDetail,apiContractApproved,apiContractApprovalDetail,apiContractSignBackFiles} from '@/api/approve/contract.js'
 	import steps from '../components/steps.vue'
 	import {preViewFile} from '../utils/util.js'
@@ -172,7 +171,7 @@
 			},
 			//回签附件
 			checkBackFiles(){
-				const reg = /\.(pdf)$/;
+				const reg = /\.(pdf)|$/;
 				return this.detail.CheckBackFileUrl&&this.detail.CheckBackFileUrl.split("#").map((item) => {
 					if (reg.test(item)) {
 						return {
@@ -191,7 +190,7 @@
 			},
 			// 合同附件
 			constractFiles(){
-				const reg = /\.(pdf)$/;
+				const reg = /\.(pdf)|\.doc|\.docx$/;
 				return this.detail.FileUrl&&this.detail.FileUrl.split("#").map((item) => {
 					if (reg.test(item)) {
 						return {
@@ -289,10 +288,10 @@
 				}else if(type==='file'){
 					res=await uploadFiles({type:'file'})
 				}
-				const reg = /\.(pdf)$/;
+				const reg = /\.(pdf)|\.doc|\.docx$/;
 				if(!reg.test(res[0])){
 					uni.showToast({
-						title:'请上传pdf格式文件',
+						title:'请上传pdf/word格式文件',
 						icon:"none"
 					})
 					return