前端审核流程修改

config/index.js

@@ -6,9 +6,9 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
-	 // baseUrlNew: 'http://192.168.110.82:8090/',
+	 baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
 	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages.json

@@ -199,7 +199,7 @@
 		{
 			"path": "pages/task/audit/acquisitioncontract",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "收购合同审核"
 			}
 		},

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -396,6 +396,7 @@
 				item.showflow=!item.showflow
 			},
 			getList() {
+				var that =this
 				uni.showLoading({
 					title:'加载中',
 					mask:true,
@@ -455,7 +456,8 @@
 							}).then(res1 => {
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
-									businessKey: this.id
+									businessKey: this.id,
+									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/Issueandreceipt_task_details.vue

@@ -355,6 +355,7 @@
 				item.showflow=!item.showflow
 			},
 			getList() {
+				var that = this
 				uni.showLoading({
 					title:'加载中',
 					mask:true
@@ -363,6 +364,7 @@
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
+						this.list=res.data.data
 						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
 							relevanceId: res.data.data.relevanceId
 						}).then(res => {
@@ -393,7 +395,8 @@
 							}).then(res1 => {
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
-									businessKey: this.id
+									businessKey: this.id,
+									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/acquisitioncontract.vue

@@ -229,7 +229,7 @@
 			<view class="form_top">流程</view>
 			<view class="content2">
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
-					<view class="row">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view>
@@ -287,7 +287,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>
@@ -433,7 +433,8 @@
 							}).then(res1 => {
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
-									businessKey: this.id
+									businessKey: this.id,
+									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/charge_against_revenue.vue

@@ -433,6 +433,7 @@
 				}
 			},
 			getList() {
+				var that =this
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
@@ -489,7 +490,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/charge_against_revenue_detail.vue

@@ -404,6 +404,7 @@
 				}
 			},
 			getList() {
+				var that =this
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
@@ -459,7 +460,8 @@
 					}).then(res1 => {
 						this.$api.doRequest('get', '/commonUser/getHis', {
 							workflowId: res1.data.data[0].id,
-							businessKey: this.id
+							businessKey: this.id,
+							branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 						}).then(response => {
 							uni.hideLoading()
 							for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/freight_settlement_approval.vue

@@ -66,29 +66,29 @@
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">算</view>
+						<view class="center">算</view>
 						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view v-if='item.deductionAmount>=0' class="center">扣</view>
-						<view v-if='item.deductionAmount<0' class="center">加</view>
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
 						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
 						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">服</view>
+						<view class="left">服</view>
 						<view class="textInfo">{{item.serviceCharge}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">税</view>
+						<view class="center">税</view>
 						<view class="textInfo">{{item.taxPoint}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="center">实</view>
+						<view class="right">实</view>
 						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">合</view>
+						<view class="left">合</view>
 						<view class="textInfo">{{item.totalPayable}}元</view>
 					</view>
 				</view>
@@ -99,7 +99,7 @@
 			<view class="form_top">流程</view>
 			<view class="content2">
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
-					<view class="row">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="row-left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view>
@@ -157,7 +157,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1 &&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>
@@ -228,6 +228,7 @@
 		},
 		methods: {
 			getList() {
+				var that =this
 				this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
 					batchId: this.id
 				}).then(res => {
@@ -241,7 +242,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/freight_settlement_details.vue

@@ -59,29 +59,29 @@
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">算</view>
+						<view class="center">算</view>
 						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view v-if='item.deductionAmount>=0' class="center">扣</view>
-						<view v-if='item.deductionAmount<0' class="center">加</view>
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
 						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
 						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">服</view>
+						<view class="left">服</view>
 						<view class="textInfo">{{item.serviceCharge}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">税</view>
+						<view class="center">税</view>
 						<view class="textInfo">{{item.taxPoint}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="center">实</view>
+						<view class="right">实</view>
 						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">合</view>
+						<view class="left">合</view>
 						<view class="textInfo">{{item.totalPayable}}元</view>
 					</view>
 				</view>
@@ -91,7 +91,7 @@
 			<view class="form_top">流程</view>
 			<view class="content2">
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
-					<view class="row">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="row-left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view>
@@ -149,7 +149,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1 &&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>

pages/task/audit/purchasecontract.vue

@@ -259,7 +259,7 @@
 			<view class="form_top">流程</view>
 			<view class="content2">
 				<view v-for="(item,index) in auditList" :key='index' class="audit">
-					<view class="row">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view> 
@@ -309,7 +309,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>
@@ -451,7 +451,8 @@
 							}).then(res1 => {
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
-									businessKey: this.id
+									businessKey: this.id,
+									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/salecontract.vue

@@ -265,7 +265,7 @@
 			<view class="form_top">流程</view>
 			<view class="content2">
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view>
@@ -326,7 +326,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 			</view>
 		</u-form>
@@ -471,7 +471,7 @@
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
 									businessKey: this.id,
-									// branch:this.list.jointVentureParties
+									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/warehouse_approval.vue

@@ -89,7 +89,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -139,7 +139,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<view v-if='show1' class="shade">
@@ -255,6 +255,7 @@
 					mask:true
 				})
 				var data = []
+				var that =this
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
@@ -266,7 +267,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/warehouse_details.vue

@@ -74,7 +74,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -124,7 +124,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -179,6 +179,7 @@
 					mask:true
 				})
 				var data = []
+				var that = this
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
@@ -190,7 +191,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/warehouse_warrant.vue

@@ -296,6 +296,7 @@
 					title: "加载中...",
 					mask: true
 				})
+				var that =this
 				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
@@ -356,7 +357,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/warehouse_warrant_detail.vue

@@ -295,6 +295,7 @@
 					title: "加载中...",
 					mask: true
 				})
+				var that =this
 				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
@@ -354,7 +355,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {