jwyu 3 years ago
parent
commit
ff7b1daf92

+ 3 - 0
App.vue

@@ -68,4 +68,7 @@
 	.approve-list-status-cancel{
 		color: #999999;
 	}
+	.approve-list-status-doing{
+		color: #FFA244;
+	}
 </style>

+ 2 - 1
pages-approve/components/approveListItem.vue

@@ -7,13 +7,14 @@
 		<view class="message-content">
 			<view class="info">申请销售:{{data.saller}}</view>
 			<view class="info">申请类型:{{data.applyType}}</view>
-			<view class="info" v-if="data.status==='待审批'">提交时间:{{data.submitTime|formatTime}}</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>
 			<view class="info" v-if="data.status==='已作废'">作废时间:{{data.cancelTime|formatTime}}</view>
 			<view class="info" v-if="data.status==='已签回'">签回时间:{{data.checkBackTime|formatTime}}</view>
 		</view>
 		<view class="status approve-list-status-wait" v-if="data.status==='待审批'">待审批</view>
+		<view class="status approve-list-status-doing" v-if="data.status==='处理中'">处理中</view>
 		<view class="status approve-list-status-success" v-if="data.status==='已审批'">已审批</view>
 		<view class="status approve-list-status-fail" v-if="data.status==='已驳回'">已驳回</view>
 		<view class="status approve-list-status-cancel" v-if="data.status==='已作废'">已作废</view>

+ 1 - 1
pages-approve/contract/list.vue

@@ -73,7 +73,7 @@
 					this.status='待审批'
 				}
 				// ficc管理员 权益管理员  合规compliance
-				if(RoleTypeCode==='ficc_admin'||RoleTypeCode==='rai_admin'||RoleTypeCode==='compliance'){
+				if(RoleTypeCode==='ficc_admin'||RoleTypeCode==='rai_admin'||RoleTypeCode==='compliance'||RoleTypeCode==='admin'){
 					this.tabList=['待审批','处理中','已审批','已签回','已作废']
 					this.status='待审批'
 				}

+ 22 - 6
pages-approve/seal/addSeal.vue

@@ -92,7 +92,7 @@
 		</view>
 		<view class="section white-wrap" v-if="radioVal==='上传附件'">
 			<view class="section-title require">附件上传</view>
-			<image :src="img" mode="aspectFill" style="width: 102rpx;height: 120rpx;margin:0 10rpx 10rpx 0" v-for="img in fileUrlArr" :key="img"></image>
+			<image :src="img.img" mode="aspectFill" style="width: 102rpx;height: 120rpx;margin:0 10rpx 10rpx 0" v-for="img in fileUrlArr" :key="img"></image>
 			<image @click="handleUpload" src="../static/upload-icon.png" mode="aspectFill" style="width: 102rpx;height: 120rpx;margin:0 10rpx 10rpx 0"></image>
 		</view>
 		
@@ -178,7 +178,7 @@
 <script>
 	import steps from '../components/steps.vue'
 	import {apiFlowDetail,apiSealAdd,apiSearchCustome,apiSearchContract} from '@/api/approve/seal.js'
-	import {uploadImg} from '@/utils/uploadFile.js'
+	import {uploadImg,uploadFiles} from '@/utils/uploadFile.js'
 	export default{ 
 		components:{
 			steps
@@ -223,8 +223,24 @@
 		methods: {
 			//上传附件
 			async handleUpload(){
-				const res=await uploadImg()
-				this.fileUrlArr=res
+				const res=await uploadFiles({type:'all'})
+				const reg = /\.(pdf)$/;
+				let temarr=res.map((item) => {
+					if (reg.test(item)) {
+						return {
+							type: "pdf",
+							url: item,
+							img: require("@/pages-approve/static/pdf.png"),
+						};
+					} else {
+						return {
+							type: "img",
+							url: item,
+							img: item,
+						};
+					}
+				});
+				this.fileUrlArr=[...this.fileUrlArr,...temarr]
 			},
 			
 			// 客户搜索 
@@ -320,7 +336,7 @@
 				
 				let res=await apiFlowDetail({FlowId:id})
 				if(res.code===200){
-					this.processData=res.data||[]
+					this.processData=res.data||null
 				}
 			},
 			
@@ -330,7 +346,7 @@
 				if(this.radioVal==='系统合同'){
 					fileUrl=this.ContractfileUrl
 				}else{
-					fileUrl=this.fileUrlArr.join('#')
+					fileUrl=this.fileUrlArr.map(item=>item.url).join('#')
 				}
 				
 				let params={

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

@@ -86,7 +86,7 @@
 					this.status='待审批'
 				}
 				// ficc管理员 权益管理员  合规compliance
-				if(RoleTypeCode==='ficc_admin'||RoleTypeCode==='rai_admin'||RoleTypeCode==='compliance'){
+				if(RoleTypeCode==='ficc_admin'||RoleTypeCode==='rai_admin'||RoleTypeCode==='compliance'||RoleTypeCode==='admin'){
 					this.tabList=['待审批','处理中','已审批','已作废']
 					this.status='待审批'
 				}