前端

config/index.js

@@ -5,7 +5,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.1.114:8090/',
 	// baseUrlNew: 'http://192.168.1.122:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages.json

@@ -1158,12 +1158,25 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/task/audit/warehouse_warrant_detail",
+			"style": {
+				"navigationBarTitleText": "入库单结算详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/task/audit/charge_against_revenue",
 			"style": {
 				"navigationBarTitleText": "费用支出审核",
 				"enablePullDownRefresh": false
 			}
+		},{
+			"path": "pages/task/audit/charge_against_revenue_detail",
+			"style": {
+				"navigationBarTitleText": "费用支出详情",
+				"enablePullDownRefresh": false
+			}
 		},
 		{
 			"path": "pages/task/audit/expense_allocation",

pages/erp/index.vue

@@ -139,80 +139,79 @@
 									// }
 								],
 				gridList: [
-					{
+					// {
 
+					// 	num: 0,
+					// 	name: '入库',
+					// 	// icon: 'cuIcon-apps',
+					// 	src: '../../static/img/erp/yaoqingyonghu@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erp/warehousing/warehousing',
+					// 	show: true
+					// },
+					// {
+					// 	num: 1,
+					// 	name: '待完善入库',
+					// 	// icon: 'cuIcon-calendar',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erp/improvedWrehousing/improvedWrehousing',
+					// 	show: true
+					// },
+					// {
+					// 	num: 2,
+					// 	name: '出库',
+					// 	// icon: 'cuIcon-copy',
+					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erp/exWarehousing/exWarehousing',
+					// 	show: true
+					// },
+					// {
+					// 	num: 3,
+					// 	name: '待完善出库',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
+					// 	tips: 0,
+					// 	url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+					// 	show: true
+					// }
+					{
 						num: 0,
-						name: '入库',
+						name: '入库质检',
 						// icon: 'cuIcon-apps',
 						src: '../../static/img/erp/yaoqingyonghu@3x.png',
 						tips: 0,
-						url: '/pages/erp/warehousing/warehousing',
+						url: '/pages/erpbusiness/quality_testing?managementType=1',
 						show: true
 					},
 					{
 						num: 1,
-						name: '待完善入库',
+						name: '入库检斤',
 						// icon: 'cuIcon-calendar',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: '/pages/erp/improvedWrehousing/improvedWrehousing',
+						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
 						show: true
 					},
 					{
 						num: 2,
-						name: '出库',
+						name: '出库检斤',
 						// icon: 'cuIcon-copy',
 						src: '../../static/img/erp/shougoujianjin@3x.png',
 						tips: 0,
-						url: '/pages/erp/exWarehousing/exWarehousing',
+						url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
 						show: true
 					},
 					{
 						num: 3,
-						name: '待完善出库',
+						name: '出库质检',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
-						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
+						url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
 						show: true
 					}
-					// {
-					// 		num: 0,
-					// 		name: '入库质检',
-					// 		// icon: 'cuIcon-apps',
-					// 		src: '../../static/img/erp/yaoqingyonghu@3x.png',
-					// 		tips: 0,
-					// 		url: '/pages/erpbusiness/quality_testing?managementType=1',
-					// 		show: true
-					// 	},
-					// 	{
-					// 		num: 1,
-					// 		name: '入库检斤',
-					// 		// icon: 'cuIcon-calendar',
-					// 		src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 		tips: 0,
-					// 		url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-					// 		show: true
-					// 	},
-					// 	{
-					// 		num: 2,
-					// 		name: '出库检斤',
-					// 		// icon: 'cuIcon-copy',
-					// 		src: '../../static/img/erp/shougoujianjin@3x.png',
-					// 		tips: 0,
-					// 		url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
-					// 		show: true
-					// 	},
-					// 	{
-					// 		num: 3,
-					// 		name: '出库质检',
-					// 		// icon: 'cuIcon-edit',
-					// 		src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 		tips: 0,
-					// 		url: `/pages/erpbusiness/outbound_quality_testing?managementType=3`,
-					// 		show: true
-					// 	}
-
 					// {
 					// 	num: 4,
 					// 	name: '开通业务',

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -212,7 +212,8 @@
 			},
 			//获取列表
 			getList(flag) {
-				console.log(11111)
+				console.log(11111
+				)
 				uni.showLoading({
 					title: "正在加载"
 				})

pages/erpbusiness/acquisitionInspection/add_check_the_weight.vue

@@ -109,7 +109,7 @@
 				</view>
 			</view>
 			<view v-if='detailData.outType=="散船"' class="row" style="text-align: right;">
-				<view class="left">箱号-2</view>
+				<view class="left">航次</view>
 				<view class="right">
 					<input v-model='detailData.shipNumber' placeholder="请输入航次" name="input" type="digit"></input>
 				</view>

pages/erpbusiness/examine_quality_testing.vue

@@ -11,13 +11,21 @@
 					收购入库
 				</view>
 			</view>
-			<view v-if='gridList.managementType==3' class="c-row ">
-				<view class="title">出库类型</view>
+			<view class="c-row ">
+				<view v-if='gridList.managementType==3' class="title">出库类型</view>
+				<view v-if='gridList.managementType==1' class="title">入库类型</view>
 				<view class="con-list">
 				{{gridList.inOutType}}
 				</view>
 			</view>
 			<view class="c-row ">
+				<view v-if='gridList.managementType==3' class="title">出库日期</view>
+				<view v-if='gridList.managementType==1' class="title">入库日期</view>
+				<view class="con-list">
+				{{gridList.inOutDate}}
+				</view>
+			</view>
+			<view class="c-row">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}

pages/public/login_account_number.vue

@@ -29,7 +29,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	import {
 		mapMutations

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="warp">
-		<view class="topInfo">
+		<view class="topInfo" v-if='retreatList.inOutType!="退库"'>
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">

pages/task/audit/Issueandreceipt_task_details.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="warp">
-		<view class="topInfo">
+		<view class="topInfo" v-if='retreatList.inOutType!="退库"'>
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">

pages/task/audit/charge_against_revenue.vue

@@ -122,7 +122,7 @@
 				暂无附件
 			</view>
 		</view>
-		<view class="content1" v-if="url && url != 'ng'">
+		<view class="content1" v-if="url && url != 'ng'&&auditInfo.expenseAllocationInfoList">
 			<view class="title ">
 				费用分配附件
 			</view>
@@ -131,6 +131,30 @@
 				<text class="text_css">明细.xls</text>
 			</view>
 		</view>
+		<view class="content2">
+			<view class="title row">
+				流程
+			</view>
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
+						</view>
+						<view class="item2">
+							<view class="name">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							</view>
+							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
+						</view>
+					</view>
+					<view class="right">
+						{{item.updateDate}}
+					</view>
+				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+			</view>
+		
+		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
 				<view class="alert-top">
@@ -298,16 +322,15 @@
 
 				// 	}
 				// })
-				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
-					warehouseName: this.vesselId,
+				this.$api.doRequest('post', '/expenseInfo/exportPhone', {
+					id:this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.url = res1.data.data
 					}
 				})
-				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
-					warehouseName: this.vesselId,
-					searchType: 1
+				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
+					id:this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
@@ -321,7 +344,7 @@
 					}
 				})
 				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'PAYMENT-MANAGEMENT-APPROVE',
+					businessCode: 'FEIYONGGUANLI-APPROVE',
 					tmpCompId: uni.getStorageSync('pcUserInfo').compId
 				}).then(res1 => {
 					this.updateDate = res1.data.data[0].updateDate

pages/task/audit/warehouse_warrant.vue

@@ -27,11 +27,22 @@
 				<view class="left">合计重量（吨）</view>
 				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
 			</view>
-			<view class="row" style="border-bottom:0">
+			<view class="row">
 				<view class="left">合计金额（元）</view>
 				<view class="right">{{auditInfo.requestFundsTotal}}</view>
 			</view>
-
+			<view class="row">
+				<view class="left">仓库名称</view>
+				<view class="right">{{auditInfo.warehouseName}}</view>
+			</view>
+			<view class="row">
+				<view class="left">入库日期</view>
+				<view class="right">{{auditInfo.issuingTime}}</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">车数</view>
+				<view class="right">{{auditInfo.count}}</view>
+			</view>
 		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
@@ -42,6 +53,30 @@
 				<text class="text_css">明细.xls</text>
 			</view>
 		</view>
+		<view class="content2">
+			<view class="title row">
+				流程
+			</view>
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
+						</view>
+						<view class="item2">
+							<view class="name">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							</view>
+							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
+						</view>
+					</view>
+					<view class="right">
+						{{item.updateDate}}
+					</view>
+				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+			</view>
+		
+		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
 				<view class="alert-top">
@@ -142,11 +177,11 @@
 					title: "加载中...",
 					mask: true
 				})
-				// this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
-				// 	searchType: '1', //searchType:1待审核
-				// 	warehouseName: this.vesselId,
+				// 	searchType: '2', //searchType:1待审核
+				// 	// warehouseName: this.vesselId,
 				// 	managementType: 1
 				// }).then(res1 => {
 				// 	uni.hideLoading()
@@ -180,20 +215,20 @@
 							uni.hideLoading()
 					}
 				})
-				// 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', '/commonUser/getHis', {
-				// 		workflowId: res1.data.data[0].id,
-				// 		businessKey: this.id
-				// 	}).then(response => {
-				// 		// uni.hideLoading()
-				// 		this.auditList = response.data.data
-
-				// 	})
-				// })
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'WAREHOUSING-ORDER-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.updateDate = res1.data.data[0].updateDate
+					this.$api.doRequest('get', '/commonUser/getHis', {
+						workflowId: res1.data.data[0].id,
+						businessKey: this.id
+					}).then(response => {
+						// uni.hideLoading()
+						this.auditList = response.data.data
+
+					})
+				})
 			},
 			close() {
 				this.show = false
@@ -247,23 +282,23 @@
 										mask: true
 									})
 									var count = 0
-									for (let num = 0; num < that.List.length; num++) {
+									// for (let num = 0; num < that.List.length; num++) {
 										that.$api.doRequest('post', '/workflow/api/handle', {
-											taskId: that.List[num].taskId,
+											taskId: that.auditInfo.taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
 											needReapply: true
 										}).then(res => {
-											count++
-											if (count == that.List.length) {
+											// count++
+											// if (count == that.List.length) {
 												uni.hideLoading()
 												that.$api.msg('审核成功！')
 												setTimeout(function() {
 													uni.navigateBack();
 												}, 2000);
-											}
+											// }
 										})
-									}
+									// }
 								}
 							}
 						})
@@ -281,24 +316,24 @@
 									title: "审核中...",
 									mask: true
 								})
-								for (let num = 0; num < that.List.length; num++) {
-									var tmp = 0
+								// for (let num = 0; num < that.List.length; num++) {
+								// 	var tmp = 0
 									that.$api.doRequest('post', '/workflow/api/handle', {
-										taskId: that.List[num].taskId,
+										taskId: that.auditInfo.taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
 										needReapply: false
 									}).then(res => {
-										tmp++
-										if (tmp == that.List.length) {
+										// tmp++
+										// if (tmp == that.List.length) {
 											uni.hideLoading()
 											that.$api.msg('审核成功！')
 											setTimeout(function() {
 												uni.navigateBack();
 											}, 2000);
-										}
+										// }
 									})
-								}
+								// }
 							}
 						}
 					})

pages/task/my_task.vue

@@ -626,9 +626,25 @@
 						})
 					}
 				} else if (item.businessCode == 'WAREHOUSING-ORDER-APPROVE') {
-					uni.navigateTo({
-						url: `/pages/task/audit/warehouse_warrant?id=` + item.businessId
-					})
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/warehouse_warrant?id=` + item.businessId
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/task/audit/warehouse_warrant_detail?id=` + item.businessId
+						})
+					}
+				}  else if (item.businessCode == 'FEIYONGGUANLI-APPROVE') {
+					if (this.statusFlag == 1) {
+						uni.navigateTo({
+							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pages/task/audit/charge_against_revenue_detail?id=` + item.businessId
+						})
+					}
 				} else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({