Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

common/appUpdate.js

@@ -4,9 +4,8 @@
 import * as config from '../config'
 export default function appUpdate() {
 		
-	let baseUrlNew = config.def().baseUrlNew
 	uni.request({
-	    url: baseUrlNew + '/appVersion/selectInfo',
+	    url: 'http://api1.eliangeyun.com/appVersion/selectInfo',
 	    data: {
 	    	appid: plus.runtime.appid,
 	    	version: plus.runtime.version,

config/index.js

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.59",
-    "versionCode" : 1159,
+    "versionName" : "1.1.67",
+    "versionCode" : 1167,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erp/exWarehousing/exWarehousing.vue

@@ -926,7 +926,7 @@
 					}
 				}
 				if(!this.showCar){//若自运的合同该字段置空
-				          this.deptBudgetList.selfLoading = ""
+				          this.detailData.selfLoading = ""
 				    }
 				if (this.detailData.boxNo) {
 					this.detailData.boxNo = this.detailData.boxNo.toUpperCase()

pages/erpbusiness/acquisitionInformation.vue

@@ -60,7 +60,6 @@
 				warehouseName: '暂无仓库',
 				warehouseList: [],
 				show1: false,
-				status: "",
 				isEdit: false,
 				sgId: '',
 				id: ''
@@ -68,8 +67,6 @@
 		},
 
 		onLoad(options) {
-			this.status = options.status
-			this.sgId = options.id
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -95,10 +92,7 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			uni.showLoading({
-				title: "加载中...",
-				mask: true
-			})
+			
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {

pages/erpbusiness/customer.vue

@@ -32,14 +32,15 @@
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 
 			<!-- <view v-for='item in registeredCustomer'> -->
-				<view class="dj-customer" v-for="(item,index) in registeredCustomer" @click="registeredCustomerClick(item,item1)">
-					<view class="left">{{item.carNo}}</view>
-					<view class="right">
-						<view class="span1">{{item.shipperName}}（货）</view>
-						<view class="">{{item.supplier}}（商）</view>
-					</view>
-
+			<view class="dj-customer" v-for="(item,index) in registeredCustomer"
+				@click="registeredCustomerClick(item,item1)">
+				<view class="left">{{item.carNo}}</view>
+				<view class="right">
+					<view class="span1">{{item.shipperName}}（货）</view>
+					<view class="">{{item.supplier}}（商）</view>
 				</view>
+
+			</view>
 			<!-- </view> -->
 		</view>
 
@@ -128,32 +129,32 @@
 		},
 		onShow() {
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
-				let _data = uni.getStorageSync('recentCustomers')
+			let _data = uni.getStorageSync('recentCustomers')
 			if (_data) {
-				this.recentCustomers =_data
-				for(let i=0;i<_data.length;i++){
-					if(_data[i].shipperName){
+				this.recentCustomers = _data
+				for (let i = 0; i < _data.length; i++) {
+					if (_data[i].shipperName) {
 						this.recentCustomers[i].customerName = _data[i].shipperName
 						this.recentCustomers[i].customerPhone = _data[i].shipperPhone
 					}
 				}
-				
+
 			} else {
 				this.recentCustomers = []
 			}
 
 			this.$api.doRequest('get', '/shippingInformation/selectShippingInformation', {
 				warehouseName: this.warehouseName,
-				compId:  uni.getStorageSync('pcUserInfo').compId,
+				compId: uni.getStorageSync('pcUserInfo').compId,
 			}).then(res => {
 				if (res.data.data) {
 					let _endTime = Date.parse(new Date());
 					let _startTime = ""
 					for (let i = 0; i < res.data.data.length; i++) {
-							_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
-								if (_endTime - _startTime <= 0) {
-										this.registeredCustomer.push(res.data.data[i])
-								}
+						_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+						if (_endTime - _startTime <= 0) {
+							this.registeredCustomer.push(res.data.data[i])
+						}
 						// let _carList = res.data.data[i].shippingInformationList
 						// for (let k = 0; k < _carList.length; k++) {
 						// 	//判断是记录是否失效
@@ -197,13 +198,14 @@
 				}
 
 			},
-			registeredCustomerClick(item,item1){
-			uni.setStorageSync('carNo', item1)
-			uni.setStorageSync('checkcustomer', item)
+			registeredCustomerClick(item, item1) {
+				uni.setStorageSync('isClick', true)
+				uni.setStorageSync('carNo', item1)
+				uni.setStorageSync('checkcustomer', item)
 				if (this.recentCustomers.length == 0) {
 					this.recentCustomers.push(item)
 					uni.setStorageSync('recentCustomers', this.recentCustomers)
-				}else{
+				} else {
 					let _copyList = this.$u.deepClone(this.recentCustomers);
 					for (let i = 0; i < this.recentCustomers.length; i++) {
 						if (this.recentCustomers[i].customerPhone != item.shipperPhone) {
@@ -212,29 +214,30 @@
 						}
 					}
 				}
-			
+
 				uni.navigateBack()
 			},
 			checkcustomer(item) {
+				uni.setStorageSync('isClick', true)
 				var that = this
 				var count = ''
 				if (item.authenticationStatus == '已认证') {
 					// uni.showLoading({
 					// 	title: '加载中'
 					// })
-					
+
 					uni.setStorageSync('checkcustomer', item)
 					if (this.recentCustomers.length == 0) {
 						this.recentCustomers.push(item)
 						uni.setStorageSync('recentCustomers', this.recentCustomers)
-					}else{
+					} else {
 						let _isDel = false
 						for (let i = 0; i < this.recentCustomers.length; i++) {
 							if (this.recentCustomers[i].customerPhone == item.customerPhone) {
-										_isDel = true
+								_isDel = true
 							}
 						}
-						if(!_isDel){
+						if (!_isDel) {
 							let _data = uni.getStorageSync('recentCustomers')
 							_data.push(item)
 							uni.setStorageSync('recentCustomers', _data)
@@ -294,6 +297,7 @@
 
 			},
 			recentcustomer(item) {
+				uni.setStorageSync('isClick', true)
 				uni.setStorageSync('checkcustomer', item)
 				uni.navigateBack()
 				// var count = ''
@@ -370,7 +374,7 @@
 				this.currentPage = 1
 				uni.showLoading({
 					title: '正在加载',
-					mask:true
+					mask: true
 				})
 				this.getList()
 			},
@@ -396,7 +400,7 @@
 				}
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.data) {
-							uni.hideLoading()
+						uni.hideLoading()
 						let data = res.data.data.records ? res.data.data.records : res.data.data
 						//采购信息
 						if (data.length > 0) {
@@ -1041,7 +1045,8 @@
 
 		.right {
 			display: flex;
-			.span1{
+
+			.span1 {
 				margin-right: 20rpx;
 			}
 		}

pages/erpbusiness/edit_quality_testing.vue

@@ -17,7 +17,7 @@
 			<view class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
-					<view  @click='gocustomer'>
+					<view @click='gocustomer'>
 						{{gridList.customerName}}({{gridList.customerPhone}})
 					</view>
 				</view>
@@ -187,7 +187,7 @@
 		</view>
 
 		<view class="footer">
-			<view v-if='!value&&flag==1' @click='confirmInfo' class="button">确认初检信息</view>
+			<view v-if='flag==1' @click='confirmInfo' class="button">确认初检信息</view>
 			<view @click='submit' class="button">提交</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -361,28 +361,30 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		onShow() {
-			if (uni.getStorageSync('checkcustomer')) {
-			
+			let _kh = uni.getStorageSync('isClick')
+			if (uni.getStorageSync('checkcustomer') && _kh) {
+
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id
 					//点击登记客户
 					this.gridList.customerName = _customerInfo.shipperName
 					this.gridList.customerPhone = _customerInfo.shipperPhone
-					this.gridList.carNumber=_customerInfo.carNo
+					this.gridList.carNumber = _customerInfo.carNo
 				} else {
 					//点击搜索客户
 					this.gridList.customerName = _customerInfo.customerName
 					this.gridList.customerPhone = _customerInfo.customerPhone
 				}
-			
+
 				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
 			}
 		},
 		methods: {
 			gocustomer() {
 				uni.navigateTo({
-					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList.warehouseName + '&goodsName=' + this.gridList.goodsName+'&status=edit'
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList
+						.warehouseName + '&goodsName=' + this.gridList.goodsName + '&status=edit'
 				})
 			},
 			print() {
@@ -444,28 +446,32 @@
 			},
 			alertBtn() {
 				var that = this
-				that.gridList.reWaterContent=that.gridList.waterContent
-				if(that.gridList.buckleMiscellaneous){
-					that.gridList.reBuckleMiscellaneous=that.gridList.buckleMiscellaneous
+				that.gridList.reWaterContent = that.gridList.waterContent
+				if (that.gridList.buckleMiscellaneous) {
+					that.gridList.reBuckleMiscellaneous = that.gridList.buckleMiscellaneous
 				}
 				that.gridList.flag = 1
-				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
-					if(res.data.code=="200"){
-						that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {id:that.gridList.id,flag:2}).then(res => {
-							if(res.data.code=="200"){
-								that.$api.msg('提交成功！')
-								setTimeout(function(){
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', that.gridList).then(
+					res => {
+						if (res.data.code == "200") {
+							that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {
+								id: that.gridList.id,
+								flag: 2
+							}).then(res => {
+								if (res.data.code == "200") {
+									that.$api.msg('提交成功！')
+									setTimeout(function() {
 										uni.navigateBack({})
-								},1000)
-							}else{
-								that.$api.msg('提交失败')
-							}
-						})			
-						
-					}else{
-						that.$api.msg('提交失败')
-					}
-				})
+									}, 1000)
+								} else {
+									that.$api.msg('提交失败')
+								}
+							})
+
+						} else {
+							that.$api.msg('提交失败')
+						}
+					})
 			},
 			waterContentChange() {
 				var that = this

pages/erpbusiness/exsendCommand.vue

@@ -258,12 +258,12 @@
 				}
 
 				//客户签名
-				command.rowSpace(100);
-				command.setSelectJustification(0); //居左
-				command.setLeftMargin(30)
-				command.setText("客户签名：");
-				command.setPrint();
-				command.rowSpace(100);
+				// command.rowSpace(100);
+				// command.setSelectJustification(0); //居左
+				// command.setLeftMargin(30)
+				// command.setText("客户签名：");
+				// command.setPrint();
+				// command.rowSpace(100);
 				//收货单位签名或盖章
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)

pages/erpbusiness/index.vue

@@ -15,11 +15,12 @@
 			<!-- isShowAcquisitionInfo -->
 			<!-- 获取当前用户负责的仓库，如果无仓库隐藏收购信息 -->
 			<!-- &&sgId -->
-			<view class="content2" v-if="isShowAcquisitionInfo">
+			<!-- <view class="content2" v-if="isShowAcquisitionInfo">
 				<view>收购信息</view>
-				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}>
+				<view @click="navTo('/pages/erpbusiness/acquisitionInformation')">
+					<u-button size="mini">查看</u-button>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<!-- <view class="wrap">
 			<view class='title'>出库管理</view>
@@ -110,7 +111,17 @@
 						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
 						show: true
 					}
+,
 
+					{
+						num: 3,
+						name: '收购信息',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/receiving@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/acquisitionInformation',
+						show: true
+					}
 					// {
 					// 	num: 5,
 					// 	name: '设置',
@@ -317,6 +328,9 @@
 					} else if (i == 2) {
 						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
 					}
+					else if (i == 3) {
+						this.gridList[i].show = this.utils.getRoles('acquisitionInfor.view')
+					}
 				}
 				for (let k = 0; k < this.gridList1.length; k++) {
 					if (k == 0) {

pages/erpbusiness/jjsendCommand.vue

@@ -204,6 +204,11 @@
 				command.setLeftMargin(30)
 				command.setText("客户姓名：" + that.gridList.customer);
 				command.setPrint();
+				//客户身份证
+				command.setSelectJustification(0); //居左
+				command.setLeftMargin(30)
+				command.setText("客户身份证：" + that.gridList.customerNumberCard);
+				command.setPrint();
 				//客户电话
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
@@ -214,6 +219,11 @@
 				command.setLeftMargin(30)
 				command.setText("车牌号：" + that.gridList.carNumber);
 				command.setPrint();
+				//仓位号
+				command.setSelectJustification(0); //居左
+				command.setLeftMargin(30)
+				command.setText("仓位号：" + that.gridList.binNumber);
+				command.setPrint();
 				//收货单位
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)

pages/erpbusiness/quality_testing.vue

@@ -228,6 +228,7 @@
 			this.managementType = options.managementType
 		},
 		onShow() {
+			uni.setStorageSync('isClick', false)
 			uni.showLoading({
 				title: "正在加载"
 			})

pages/erpbusiness/sendCommand.vue

@@ -203,6 +203,11 @@
 				command.setLeftMargin(30)
 				command.setText("客户姓名：" + that.gridList.customerName);
 				command.setPrint();
+				//客户身份证
+				command.setSelectJustification(0); //居左
+				command.setLeftMargin(30)
+				command.setText("客户身份证：" + that.gridList.customerNumberCard);
+				command.setPrint();
 				//客户电话
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
@@ -241,6 +246,11 @@
 					command.setText("封号-2：" + that.gridList.titleNoOther);
 					command.setPrint();
 				}
+				//仓位号
+				command.setSelectJustification(0); //居左
+				command.setLeftMargin(30)
+				command.setText("仓位号：" + that.gridList.binNumber);
+				command.setPrint();
 				//收货单位
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
@@ -331,12 +341,12 @@
 				command.setText("质检员：" + that.gridList.qualityInspector);
 				command.setPrint();
 				//客户签名
-				command.rowSpace(100);
-				command.setSelectJustification(0); //居左
-				command.setLeftMargin(30)
-				command.setText("客户签名：");
-				command.setPrint();
-				command.rowSpace(100);
+				// command.rowSpace(100);
+				// command.setSelectJustification(0); //居左
+				// command.setLeftMargin(30)
+				// command.setText("客户签名：");
+				// command.setPrint();
+				// command.rowSpace(100);
 				//收货单位签名或盖章
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)

pages/task/audit/acquisition_settlement_approval.vue

@@ -58,7 +58,7 @@
 				<view class="right">{{auditInfo.netWeightTotal}}</view>
 			</view>
 			<view class="row" style="border-bottom:0">
-				<view class="left">平均单价（元吨）</view>
+				<view class="left">平均单价（元/吨）</view>
 				<view class="right">{{auditInfo.averageUnitPrice}}</view>
 			</view>
 
@@ -146,7 +146,8 @@
 							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
 						</view>
 						<view class="item2">
-							<view class="name">{{item.operatorMajorRoleName}}</view>
+							<view class="name">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							</view>
 							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
 					</view>
@@ -255,13 +256,13 @@
 			},
 			getList() {
 				uni.showLoading({
-							title: "加载中...",
-							mask: true
-						})
+					title: "加载中...",
+					mask: true
+				})
 				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
 					currentPage: 1,
-					pageSize: 10,
-					searchType: '1',//searchType:1待审核
+					pageSize: 100,
+					searchType: '1', //searchType:1待审核
 					warehouseName: this.vesselId,
 					managementType: 1
 				}).then(res1 => {
@@ -278,7 +279,7 @@
 				// 			title: "加载中...",
 				// 			mask: true
 				// 		})
-						
+
 				// 	}
 				// })
 				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
@@ -289,7 +290,8 @@
 					}
 				})
 				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
-					warehouseName: this.vesselId
+					warehouseName: this.vesselId,
+					searchType: 1
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
@@ -324,31 +326,67 @@
 				this.title = '驳回原因（驳回）'
 			},
 			//驳回
-			rejectSubmit() {
-				if (!this.auditMind) {
-					this.$api.msg('驳回原因不能为空！')
-				} else {
-					var that = this
-					that.show = false
-					if (this.List.length > 0) {
+			// rejectSubmit() {
+			// 	if (!this.auditMind) {
+			// 		this.$api.msg('驳回原因不能为空！')
+			// 	} else {
+			// 		var that = this
+			// 		that.show = false
+			// 		if (this.List.length > 0) {
+			// 			uni.showModal({
+			// 				content: "确定驳回付款申请？",
+			// 				showCancel: true,
+			// 				confirmText: '确定',
+			// 				success: function(res) {
+			// 					if (res.confirm) {
+			// 						that.audit(that.List[0], 0, false, '', '')
+			// 					}
+			// 				}
+			// 			})
+			// 		}
+			// 	}
+			// },
+			//审核确定
+			passSubmit() {
+				var that = this
+				that.show = false
+				if (this.title == '驳回原因（驳回）') {
+					// this.rejectSubmit()
+					if (!that.auditMind) {
+						this.$api.msg('驳回原因不能为空！')
+					} else {
 						uni.showModal({
 							content: "确定驳回付款申请？",
 							showCancel: true,
 							confirmText: '确定',
 							success: function(res) {
 								if (res.confirm) {
-									that.audit(that.List[0], 0, false, '', '')
+									uni.showLoading({
+										title: "审核中...",
+										mask: true
+									})
+									var count = 0
+									for (let num = 0; num < that.List.length; num++) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId: that.List[num].taskId,
+											approved: false,
+											auditMind: that.auditMind ? that.auditMind : "",
+											needReapply: true
+										}).then(res => {
+											count++
+											if (count == that.List.length) {
+												uni.hideLoading()
+												that.$api.msg('审核成功！')
+												setTimeout(function() {
+													uni.navigateBack();
+												}, 2000);
+											}
+										})
+									}
 								}
 							}
 						})
 					}
-				}
-			},
-			//通過
-			passSubmit() {
-				var that = this
-				if (this.title == '驳回原因（驳回）') {
-					this.rejectSubmit()
 				} else {
 					var that = this
 					this.show = false
@@ -358,65 +396,85 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.List, 0, true)
+								uni.showLoading({
+									title: "审核中...",
+									mask: true
+								})
+								for (let num = 0; num < that.List.length; num++) {
+									var tmp = 0
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										taskId: that.List[num].taskId,
+										approved: true,
+										auditMind: that.auditMind ? that.auditMind : "",
+										needReapply: false
+									}).then(res => {
+										tmp++
+										if (tmp == that.List.length) {
+											uni.hideLoading()
+											that.$api.msg('审核成功！')
+											setTimeout(function() {
+												uni.navigateBack();
+											}, 2000);
+										}
+									})
+								}
 							}
 						}
 					})
 				}
 			},
-			audit(list, index, status, status2, reason) {
-				uni.showLoading({
-					title: "审核中"
-				})
-				if (this.List.length > 0) {
-					if (status == true && list.status == "已驳回") {
-						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
-							compId: "2710b21efc1e4393930c5dc800010dc4",
-							id: list.id
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.audit(this.List[index + 1], index + 1, status, status2, reason)
-							}
-						})
-					} else {
-						for (var i = 0; i < this.List.length; i++) {
-							this.$api.doRequest('post', '/workflow/api/handle', {
-								taskId: this.List[i].taskId,
-								approved: status,
-								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('审核失败')
-								}
-							})
-						}
-
-					}
-				} else {
-					if (status == true) {
-						this.$api.msg('通过成功')
-					} else if (status == false) {
-						this.$api.msg('驳回成功')
-					}
-					let that = this
-					setTimeout(function() {
-
-						if (that.everyCheck) {
-							helper.setAudit(that.list)
-						} else {
-							uni.navigateBack()
-						}
-						uni.hideLoading()
-					}, 1000);
-				}
-			},
+			// audit(list, index, status, status2, reason) {
+			// 	uni.showLoading({
+			// 		title: "审核中"
+			// 	})
+			// 	if (this.List.length > 0) {
+			// 		if (status == true && list.status == "已驳回") {
+			// 			this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+			// 				compId: "2710b21efc1e4393930c5dc800010dc4",
+			// 				id: list.id
+			// 			}).then(res => {
+			// 				if (res.data.code == 200) {
+			// 					this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 				}
+			// 			})
+			// 		} else {
+			// 			for (var i = 0; i < this.List.length; i++) {
+			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 					taskId: this.List[i].taskId,
+			// 					approved: status,
+			// 					auditMind: this.auditMind ? this.auditMind : "",
+			// 					needReapply: status2 ? true : false
+			// 				}).then(res => {
+			// 					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('审核失败')
+			// 					}
+			// 				})
+			// 			}
+
+			// 		}
+			// 	} else {
+			// 		if (status == true) {
+			// 			this.$api.msg('通过成功')
+			// 		} else if (status == false) {
+			// 			this.$api.msg('驳回成功')
+			// 		}
+			// 		let that = this
+			// 		setTimeout(function() {
+
+			// 			if (that.everyCheck) {
+			// 				helper.setAudit(that.list)
+			// 			} else {
+			// 				uni.navigateBack()
+			// 			}
+			// 			uni.hideLoading()
+			// 		}, 1000);
+			// 	}
+			// },
 		}
 	}
 </script>

pages/task/audit/salecontract.vue

@@ -307,7 +307,7 @@
 			},
 			reject() {
 				this.show = true
-				this.title = '驳回原因'
+				this.title = '驳回原因（驳回）'
 			},
 			//通过
 			passSubmit() {