zhongtianhaoyuan 3 lat temu
rodzic
commit
1bcd160b07

+ 1 - 1
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.1.119:9100/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 78 - 77
pages/task/audit/acquisition_settlement_approval.vue

@@ -8,9 +8,9 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-							<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
-						<image src="../../../static/img/daishenhe.png" mode=""
-							 style="height: 40rpx;"></image><!-- 待审核 -->
+						<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
+						<image src="../../../static/img/daishenhe.png" mode="" style="height: 40rpx;"></image>
+						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
 					<view class="infoText">待决策人审核</view>
@@ -38,7 +38,7 @@
 			</view>
 		</view> -->
 		<view class="content1">
-		<!-- 	<view class="title">
+			<!-- 	<view class="title">
 				销售外勤 张三
 			</view> -->
 			<view class="row">
@@ -61,7 +61,7 @@
 				<view class="left">平均单价(元吨)</view>
 				<view class="right">{{auditInfo.averageUnitPrice}}</view>
 			</view>
-			
+
 
 			<!-- <view class="row row-bottom">
 				<view class="left">水分(%)</view>
@@ -102,17 +102,17 @@
 				<view class="left">容重(%)</view>
 				<view class="right">{{auditInfo.bulkDensityTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">水分(%)</view>
 				<view class="right">{{auditInfo.waterContentTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">杂质(%)</view>
 				<view class="right">{{auditInfo.impurityTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">热损伤(%)</view>
 				<view class="right">{{auditInfo.jiaorenliTotal}}</view>
@@ -137,7 +137,7 @@
 		</view>
 		<view class="content2">
 			<view class="title row">
-			    流程
+				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
 				<view class="row">
@@ -211,8 +211,8 @@
 				everyCheck: '',
 				auditInfo: {},
 				id: "",
-				auditList:[],
-				url:"11",
+				auditList: [],
+				url: "11",
 			}
 		},
 		onBackPress(e) {
@@ -236,45 +236,56 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			openXls(){
-				if(this.url && this.url != "ng"){
+			openXls() {
+				if (this.url && this.url != "ng") {
 					uni.downloadFile({
-					url: this.url,
-					success: function(res) {
-						var filePath = res.tempFilePath;
-						uni.openDocument({
-							filePath: filePath,
-							showMenu: true,
-							success: function(res) {
-								console.log('打开文档成功');
-							}
-						});
-					}
-				});
-			}	
+						url: this.url,
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
+					});
+				}
 			},
 			getList() {
-				// /workflow/query/workflowDefinitions
-				// /workflow/query/workflowInfo  exportPhoneData
+				uni.showLoading({
+							title: "加载中...",
+							mask: true
+						})
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+					currentPage: 1,
+					pageSize: 10,
+					searchType: '1',//searchType:1待审核
+					warehouseName: this.vesselId,
+					managementType: 1
+				}).then(res1 => {
+					uni.hideLoading()
+					if (res1.data.code == 200) {
+						this.List = res1.data.data.records
+					}
+				})
+				// this.$api.doRequest('get', '/paymentManagement/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		uni.showLoading({
+				// 			title: "加载中...",
+				// 			mask: true
+				// 		})
+						
+				// 	}
+				// })
 				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
 					warehouseName: this.vesselId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.url = res1.data.data
-						// uni.downloadFile({
-						// 	url: res1.data.data,
-						// 	success: function(res1) {
-						// 		var filePath = res1.tempFilePath;
-						// 		uni.openDocument({
-						// 			filePath: filePath,
-						// 			showMenu: true,
-						// 			success: function(res1) {
-						// 				console.log('打开文档成功');
-						// 			}
-						// 		});
-						// 	}
-						// });
-						
 					}
 				})
 				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
@@ -282,45 +293,24 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
-						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo.amountIngPayableTotal)
+						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
+							.amountIngPayableTotal)
 					}
 				})
 				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 					businessCode: 'PAYMENT-MANAGEMENT-APPROVE',
 					tmpCompId: uni.getStorageSync('pcUserInfo').compId
 				}).then(res1 => {
-					this.updateDate = res1.data.data[0].updateDate 
-					// this.$api.doRequest('get', '/workflow/query/workflowInfo', {
-					// 	workflowId: res1.data.data[0].id
-					// }).then(response => {
-					// 	this.auditList = response.data.data.steps
-					// })
-					uni.showLoading({
-						title:"加载中...",
-						mask:true
-					})
+					this.updateDate = res1.data.data[0].updateDate
 					this.$api.doRequest('get', '/commonUser/getHis', {
 						workflowId: res1.data.data[0].id,
-						 businessKey:this.id
+						businessKey: this.id
 					}).then(response => {
-						uni.hideLoading()
-						debugger
+						// uni.hideLoading()
 						this.auditList = response.data.data
-						
-						// for(var i = 0 ; i < response.data.data.length ; i++){
-						// 	if(response.data.data[i].approved){
-						// 		this.auditList.push(response.data.data[i])
-						// 	}
-						// }
-						// this.auditList = response.data.data
-						// this.auditList = response.data.data.steps
+
 					})
 				})
-				// this.$api.doRequest('get', '/workflow/query/workflowInfo',
-				// {workflowId:this.id}).then(res1 => {
-
-				// })
-
 			},
 			close() {
 				this.show = false
@@ -379,10 +369,10 @@
 					title: "审核中"
 				})
 				if (this.List.length > 0) {
-					if (status == true && item.status == "已驳回") {
+					if (status == true && list.status == "已驳回") {
 						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
-							id: item.id
+							id: list.id
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.audit(this.List[index + 1], index + 1, status, status2, reason)
@@ -396,9 +386,14 @@
 								auditMind: this.auditMind ? this.auditMind : "",
 								needReapply: status2 ? true : false
 							}).then(res => {
+								debugger
 								if (res.data.code == 200) {
+									uni.hideLoading()
 									// this.audit(this.List[index + 1], index + 1, status, status2, reason)
 									this.$api.msg('通过成功')
+								}else{
+									uni.hideLoading()
+									this.$api.msg('审核失败')
 								}
 							})
 						}
@@ -476,28 +471,33 @@
 				// color: #333333;
 			}
 		}
-		.img_css{
+
+		.img_css {
 			width: 50rpx;
 			height: 50rpx;
 		}
-		.file{
+
+		.file {
 			display: flex;
 			align-items: center;
 			margin: 30rpx 0 0 20rpx;
-			.text_css{
+
+			.text_css {
 				font-size: 30rpx;
 				margin-left: 20rpx;
 			}
 		}
 	}
-	.title{
+
+	.title {
 		font-size: 34rpx;
 		font-weight: 700;
 		// margin-bottom: 20rpx;
 		height: 70rpx;
 		border-bottom: 2rpx solid #EEEEEE;
 	}
-	.titlerow{
+
+	.titlerow {
 		font-size: 34rpx;
 		font-weight: 700;
 		// margin-bottom: 20rpx;
@@ -546,7 +546,8 @@
 			margin: 10rpx 50rpx;
 
 		}
-		.audit{
+
+		.audit {
 			margin-top: 20rpx;
 		}
 	}

+ 0 - 1
pages/task/my_task.vue

@@ -338,7 +338,6 @@
 				})
 			},
 			getIndexBuyData(status) {
-				debugger
 				const that = this
 				var pages = that.pages
 				var limit = that.limit