Browse Source

用印已撤回bug修复

jwyu 3 years ago
parent
commit
c457033a93

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

@@ -12,7 +12,10 @@
 					<view class="step-user">
 						<view @click="handleViewAllUser(item.allUser)" v-if="item.allUser.length>2" class="avatar" style="margin-right:10rpx;width:80rpx">全部</view> 
 						<view v-for="(user,index2) in item.user" :key="user.ApproveUserName" style="display: flex;">
-							<view class="avatar">{{user.ApproveUserName==='admin'?user.ApproveUserName:user.ApproveUserName.slice(-2)}}<text class="whole-name">{{user.ApproveUserName}}</text></view>
+							<view class="avatar">
+								{{user.ApproveUserName==='admin'?user.ApproveUserName:user.ApproveUserName.slice(-2)}}
+								<!-- <text class="whole-name">{{user.ApproveUserName}}</text> -->
+							</view>
 							<text class="symbol" v-if="index2!=item.user.length-1">{{item.auditType===1?'/':'+'}}</text>
 						</view>
 					</view>
@@ -30,8 +33,8 @@
 	<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)}}
-					<text class="whole-name">{{item.ApproveUserName}}</text>
+					{{item.ApproveUserName==='admin'?item.ApproveUserName:item.ApproveUserName.slice(-2)}}
+					<!-- <text class="whole-name">{{item.ApproveUserName}}</text> -->
 				</view>
 			</div>
 		</van-popup>

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

@@ -658,8 +658,8 @@
 		flex-wrap: wrap;
 
 		.contract-img {
-			width: 180rpx;
-			height: 180rpx;
+			width: 102rpx;
+			height: 120rpx;
 		}
 	}
 

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

@@ -284,7 +284,7 @@
 			//前去重审
 			handleEdit(){
 				uni.navigateTo({
-					url:`./edit?ContractApprovalId=${this.ContractApprovalId}&ContractApprovalRecordId=${this.ContractApprovalRecordId}`
+					url:`./edit?ContractApprovalId=${this.ContractApprovalId}&ContractApprovalRecordId=${this.ContractApprovalRecordId}&SealId=${this.SealId}`
 				})
 			},
 			

+ 5 - 3
pages-approve/seal/edit.vue

@@ -207,7 +207,8 @@
 		onLoad(options) {
 			let ContractApprovalId=options.ContractApprovalId
 			let ContractApprovalRecordId=options.ContractApprovalRecordId
-			this.getDetail({ContractApprovalId,ContractApprovalRecordId})
+			let SealId=options.SealId
+			this.getDetail({ContractApprovalId,ContractApprovalRecordId,SealId})
 		},
 		methods: {
 			//删除上传的附件
@@ -231,10 +232,11 @@
 			},
 
 			// 获取详情
-			async getDetail({ContractApprovalId,ContractApprovalRecordId}){
+			async getDetail({ContractApprovalId,ContractApprovalRecordId,SealId}){
 				const res=await apiSealDetail({
 					ContractApprovalId:Number(ContractApprovalId),
-					ContractApprovalRecordId:Number(ContractApprovalRecordId)
+					ContractApprovalRecordId:Number(ContractApprovalRecordId),
+					SealId:Number(SealId),
 				})
 				if(res.code===200){
 					if(res.data.SealDetail.ContractId>0){

+ 1 - 1
pages/mine/index.vue

@@ -107,7 +107,7 @@
 		text-align: center;
 		.btn{
 			width: 300rpx;
-			height: 56rpx;
+			height: 80rpx;
 		}
 	}
 </style>

+ 1 - 1
utils/config.js

@@ -3,4 +3,4 @@
 // 请求根路径
 // 线上:https://ficc.hzinsights.com/h5adminapi
 // 测试:http://8.136.199.33:8607/h5adminapi
-export const baseUrl='https://ficc.hzinsights.com/h5adminapi'
+export const baseUrl='http://8.136.199.33:8607/h5adminapi'