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

common/directive.js

@@ -0,0 +1,43 @@
+import Vue from 'vue';
+const rolesList = []
+const permission = (el, binding) => {
+	const roles = getRoles();
+	if (!roles) {
+		return;
+	}
+	  let userPermissionList = Array.isArray(binding.value) ? binding.value : [binding.value];
+	  // 当前用户的权限列表
+	  if (!userPermissionList.some(e => roles.includes(e))) {
+	    el.parentNode && el.parentNode.removeChild(el);
+	  }
+}
+const getRoles = ()=>{
+	let _roles = uni.getStorageSync('jurisdiction');
+	let list = uni.getStorageSync('rolesList');
+	if(list&&list.length > 0){
+		return list
+	}
+	else{
+		list = getUserAllRoles(_roles);
+		uni.setStorageSync("rolesList", list)
+		return list
+	}
+	
+}
+
+const getUserAllRoles = (item) => {
+	console.log(item)
+	for(let i = 0;i<item.length;i++){
+		rolesList.push(item[i].name)
+		console.log('用户权限',rolesList)
+		if(item[i].children&&item[i].children.length>0){
+			getUserAllRoles(item[i].children)
+		}
+	}
+	return rolesList;
+}
+Vue.directive('hasPermission', {
+		inserted: permission,
+		componentUpdated: permission
+	})
+

common/helper.js

@@ -1,3 +1,4 @@
+import * as config from '../config'
 const selectContractNo = {}
 const detailData = {}
 const erpWarehouse={}
@@ -7,11 +8,24 @@ const now = Date.now || function () {
 const isArray = Array.isArray || function (obj) {  
     return obj instanceof Array;  
 };  
+const getListByUserId = function(){
+	let baseUrlNew = config.def().baseUrlNew
+	uni.request({
+	    url: baseUrlNew + '/roleMenu/query/getListByUserId',
+	    method: 'GET',
+	    success: (res) => {			
+	    	if (res.statusCode === 200) {
+				uni.setStorageSync("jurisdiction", res.data.data)
+	    	}
+	    }
+	})
+}
 
 export default {  
 	detailData,
 	selectContractNo,
     now,  
     isArray,
-	erpWarehouse
+	erpWarehouse,
+	getListByUserId
 }

main.js

@@ -31,6 +31,7 @@ App.mpType = 'app'
 import * as filters from './filters' 
 import * as config from './config'
 import utils from '@/util/util.js'
+import '@/common/directive.js'
 
 let urlAddress = 'liangxin.zthymaoyi.com'
 

manifest.json

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

pages.json

@@ -311,6 +311,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/user/report",
+			"style": {
+				"navigationBarTitleText": "数据报表"
+			}
+		},
 		{
 			"path": "pages/buy/transaction",
 			"style": {

pages/erp/exWarehousing/selectCarNo.vue

@@ -48,7 +48,7 @@
 			}
 		},
 		methods: {
-			confirm(item){debugger
+			confirm(item){
 				uni.setStorageSync('erpcarNoListCK', item);
 				uni.setStorageSync('ContractNoCarCK',item.carNo);
 				uni.navigateBack({})

pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -51,10 +51,10 @@
 					</view>
 				</view>
 				<view class="row4">
-					<view v-if="item.status!='已称皮重'" class="right" @click="grossWeightClick(item)">毛重</view>
+					<view v-if="item.status!='已称皮重'" class="right" v-hasPermission="'acquisitionWeight.mao'" @click="grossWeightClick(item)">毛重</view>
 					<view v-if="(!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')) && item.status!='已质检'"
-					 class="right" @click="tareClick(item)">皮重</view>
+					 class="right" v-hasPermission="'acquisitionWeight.weight'" @click="tareClick(item)">皮重</view>
 				</view>
 			</view>
 		</view>

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -50,11 +50,11 @@
 					</view>
 				</view>
 				<view class="row4">
-					<view v-if="item.status!='已称毛重'" class="right" @click.stop="tareClick(item)">皮重</view>
+					<view v-if="item.status!='已称毛重'" class="right" v-hasPermission="'acquisitionWeightOut.weight'" @click.stop="tareClick(item)">皮重</view>
 					<view v-if="!(item.paymentManagement&&item.paymentManagement.status=='已收款')||
 					!(item.paymentManagement&&item.paymentManagement.status=='部分收款')
-					" class="right" :class="item.status=='已质检'?'gray':''" @click.stop="grossWeightClick(item)">毛重</view>
-					<view class="right" @click.stop="delClick(item)">删除</view>
+					" class="right" :class="item.status=='已质检'?'gray':''" v-hasPermission="'acquisitionWeightOut.mao'" @click.stop="grossWeightClick(item)">毛重</view>
+					<view class="right" v-hasPermission="'acquisitionWeightOut.view'" @click.stop="delClick(item)">删除</view>
 				</view>
 			</view>
 		</view>
@@ -63,7 +63,7 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view class="footer">
-			<view @click='add' class="button">新增</view>
+			<view @click='add' class="button" v-hasPermission="'acquisitionWeightOut.new'">新增</view>
 		</view>
 	</view>
 </template>

pages/erpbusiness/customer.vue

@@ -85,26 +85,6 @@
 				
 			}
 		},
-		// #ifndef MP
-		onNavigationBarButtonTap(e) {
-			const index = e.index;
-			if (index === 0) {
-				this.navTo('/pages/set/set');
-			} else if (index === 1) {
-				// #ifdef APP-PLUS
-				const pages = getCurrentPages();
-				const page = pages[pages.length - 1];
-				const currentWebview = page.$getAppWebview();
-				currentWebview.hideTitleNViewButtonRedDot({
-					index
-				});
-				// #endif
-				uni.navigateTo({
-					url: '/pages/notice/notice'
-				})
-			}
-		},
-		// #endif
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
@@ -168,6 +148,8 @@
 						searchContent:item.customerName+'('+item.customerPhone+')',
 						functionType:3
 					}).then(res => {
+						
+						uni.setStorageSync('checkcustomer',item)
 						that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
 							compId:'',
 							customerName: item.customerName,
@@ -180,7 +162,6 @@
 									customerName: item.customerName,
 									goodsName: uni.getStorageSync('goodsName'),
 								}).then(res => {
-									uni.hideLoading()
 									for (let i = 0; i < that.purchasePriceList.length; i++) {
 										var data = res.data.data/1000
 										if(that.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
@@ -189,12 +170,12 @@
 											}
 										}
 									}
+									that.show=false
+									uni.hideLoading()
+									uni.navigateBack()
 								})
 							}
 						})
-						uni.setStorageSync('checkcustomer',item)
-						that.show=false
-						uni.navigateBack()
 					})
 					.catch(res => {
 						uni.showToast({
@@ -216,17 +197,19 @@
 				var count=''
 				var that = this
 				var name=item.searchContent.split('(')[0]
+				var phone=item.searchContent.split('(')[1]
+				phone = phone.substring(0,phone.length-1)
 				for(var i=0;i<this.customerList.length;i++){
 					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
-					if(this.customerList[i].customerName==name){
+					if(this.customerList[i].customerPhone==phone){
 						var tmpName = this.customerList[i].customerName
+						uni.setStorageSync('checkcustomer',this.customerList[i])
 						uni.showLoading({title: '加载中'})
 						that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo',{
 							commonId:that.userInfo.id,
 							searchContent:this.customerList[i].customerName+'('+this.customerList[i].customerPhone+')',
 							functionType:3
 						}).then(res => {
-							uni.setStorageSync('checkcustomer',tmpName)
 							that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount',{
 								compId:'',
 								customerName: tmpName,
@@ -238,7 +221,7 @@
 										compId:'',
 										customerName: tmpName,
 										goodsName: uni.getStorageSync('goodsName'),
-									}).then(res => {
+									}).then(res => {	
 										for (let i = 0; i < that.purchasePriceList.length; i++) {
 											if(that.purchasePriceList[i].goodsName== uni.getStorageSync('goodsName')){
 												var data = res.data.data/1000
@@ -247,12 +230,12 @@
 												}
 											}
 										}
+										that.show=false				
+										uni.hideLoading()
+										uni.navigateBack()
 									})
 								}
 							})
-							that.show=false					
-							uni.hideLoading()								
-							uni.navigateBack()
 						})
 						.catch(res => {
 							uni.showToast({

pages/erpbusiness/quality_testing.vue

@@ -52,11 +52,11 @@
 					<view>{{item.goodsName}}({{item.waterContent}}水)</view>
 				</view>
 				<view class="row3">
-					<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
-						<view v-if='item.status=="已初检"&&managementType==1' @click.stop='edit(item,0)' class='button'>初检</view>
-						<view v-if='item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' class='button'>确认</view>
-						<view v-if='item.confirm!="1"&&managementType==1' @click.stop='edit(item,1)' class='button'>复检</view>
-						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+					<view v-if='item.weighingManagement&&item.weighingManagement.status=="已质检"&&managementType==1' @click.stop='del(item)' v-hasPermission="'acquisitionQuality.delete'" class='button'>删除</view>
+						<view v-if='item.status=="已初检"&&managementType==1' v-hasPermission="'acquisitionQuality.initial'" @click.stop='edit(item,0)' class='button'>初检</view>
+						<view v-if='item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' v-hasPermission="'acquisitionQuality.con'" class='button'>确认</view>
+						<view v-if='item.confirm!="1"&&managementType==1'  @click.stop='edit(item,1)' v-hasPermission="'acquisitionQuality.again'" class='button'>复检</view>
+						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' v-hasPermission="'acquisitionQualityOut.edit'" class='button'>质检</view>
 				</view>
 			</view>
 			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
@@ -89,13 +89,18 @@
 				<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 			</view>
 		</view> -->
+		<!-- <view class='flex buttons'>
+			<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
+			<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
+			<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+		</view> -->
 		</view>
 		
 		<view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
 		</view>
 		<view v-if='managementType==1' class="footer">
-			<view @click='add' class="button">新增</view>
+			<view @click='add' v-hasPermission="'acquisitionQuality.add'" class="button">新增</view>
 		</view>
 	</view>
 </template>

pages/public/code.vue

@@ -41,6 +41,7 @@
 </template>
 
 <script>
+	import helper from '@/common/helper.js'; 
 	export default {
 		data() {
 			return {
@@ -175,15 +176,18 @@
 							veriCode: "123456",}).then(res1 => {
 								if(res1.data.code==200){
 									uni.setStorageSync('pcUserInfo', res1.data.data)
+									helper.getListByUserId()
 								}
 								else{
 									that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
 									veriCode: "123456",}).then(res2 => {
 										uni.setStorageSync('pcUserInfo', res2.data.data)
+										helper.getListByUserId()
 									})
 								}
 							})
 							uni.setStorageSync('userInfo', res.data.data)
+							helper.getListByUserId()
 					        that.$store.commit('login', res.data.data)
 					        // that.liangxinLogin()
 					        uni.switchTab({

pages/public/login_account_number.vue

@@ -35,6 +35,7 @@
 		mapMutations
 	} from 'vuex';
 	import { openFSqlite, createFSQL, selectFSQL, addFSQL } from '../../util/f.js'
+	import helper from '@/common/helper.js'; 
 	import { queryData, upData, initData } from '../../util/dbUtil.js'
 	import {
 		mapState
@@ -116,11 +117,14 @@
 							console.log("loginQuickly",res)
 							if(res1.data.code==200){
 								uni.setStorageSync('pcUserInfo', res1.data.data)
+								// debugger
+								helper.getListByUserId()
 							}
 							else{
 								that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
 								veriCode: "123456",}).then(res2 => {
 									uni.setStorageSync('pcUserInfo', res2.data.data)
+									helper.getListByUserId()
 								})
 							}
 							

pages/public/register.vue

@@ -38,6 +38,7 @@
 		mapMutations
 	} from 'vuex';
 	import { openFSqlite, createFSQL, selectFSQL, addFSQL } from '../../util/f.js'
+    import helper from '@/common/helper.js'; 
 	import { queryData, upData, initData } from '../../util/dbUtil.js'
 	export default {
 		data() {
@@ -227,11 +228,13 @@
 							veriCode: "123456",}).then(res1 => {
 									if(res1.data.code==200){
 										uni.setStorageSync('pcUserInfo', res1.data.data)
+										helper.getListByUserId()
 									}
 									else{
 										that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
 										veriCode: "123456",}).then(res2 => {
 											uni.setStorageSync('pcUserInfo', res2.data.data)
+											helper.getListByUserId()
 										})
 									}
 								})

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1,253 +1,234 @@
 <template>
 	<view class="warp">
 		<view class="content1">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
-					<u-input v-model="OutList.inOutType" input-align="right" placeholder="" disabled />
+			<u-form :model="OutList" ref="uForm">
+				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
+					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
+					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
-				<!-- <view v-if="type=='移库'" class="title part2">移库出库</view>
-				<view v-if="type=='退库'" class="title part2">退库</view> -->
-				<view v-if="OutList.judge == 1">
-					<!-- 出库 -->
-					<view class="title part2">{{OutList.inOutType}}</view>
-					<view class='row'>
-						<view class="left">编号</view>
-						<view class="right">{{OutList.inOutType}} {{OutList.inOutTaskNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">仓库</view>
-						<view class="right">{{OutList.sendWarehouse}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库类型</view>
-						<view class="right">{{OutList.inOutType}}</view>
-					</view>
-				<!-- <view class='row'>
-						<view class="left">出库类型</view>
-						<view class="right">{{OutList.inOutType}}</view>
-					</view> -->
-					<view class='row' v-if="OutList.inOutType == '移库出库'">
-						<view class="left">移库任务编号</view>
-						<view class="right">{{OutList.moveTaskNo}}</view>
+				<view v-if="retreatList.judge == 3">
+					<!-- 退库 -->
+					<view class="uForm_item">
+						<view class="title part2">{{retreatList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{retreatList.sendWarehouse}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库类型</view>
+							<view class="right">{{retreatList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType == '移库出库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{retreatList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType != '移库出库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{retreatList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{retreatList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{retreatList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计出库日期</view>
+							<view class="right">{{retreatList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{retreatList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row' v-if="OutList.inOutType != '移库出库'">
-						<view class="left">合同编号</view>
-						<view class="right">{{OutList.contractNo}}</view>
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150">
+							<u-input v-model="retreatList.grade" input-align="right" placeholder="" @click='show=true'
+								disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
+								mode="selector">
+							</u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+							<u-input v-model="retreatList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
 					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{OutList.goodsName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">重量(吨)</view>
-						<view class="right">{{OutList.weight}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">预计出库日期</view>
-						<view class="right">{{OutList.predictDate}}</view>
+				</view>
+				<view v-if="OutList.judge == 1">
+					<view class="uForm_item">
+						<!-- 出库 -->
+						<view class="title part2">{{OutList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">出库（{{OutList.inOutTaskNo}})</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{OutList.sendWarehouse}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库类型</view>
+							<view class="right">{{OutList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="OutList.inOutType == '移库出库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{OutList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="OutList.inOutType != '移库出库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{OutList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{OutList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{OutList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计出库日期</view>
+							<view class="right">{{OutList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{OutList.publisher}}</view>
+						</view>
 					</view>
-					<!-- 	<view class='row'>
-					<view class="left">预计入库日期</view>
-					<view class="right">{{OutList.inOutDate}}</view>
-				</view> -->
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{OutList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
+								disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
+								mode="selector"></u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
+							v-if="OutList.inOutType != '移库出库'">
+							<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" />
+						</u-form-item>
+						<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber"
+							label-width="170">
+							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
+
 					</view>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150">
-						<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
-							disabled />
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
-							mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
-						<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
-						<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
-						<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
-						label-position="top">
-						<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="" type="textarea"
-							class="textarea" />
-					</u-form-item>
-					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
-						<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
-					</u-form-item>
+
 				</view>
 				<view v-if="EnterList.judge == 2">
-					<!-- 入库 -->
-					<view class="title part2">{{EnterList.inOutType}}</view>
-					<view class='row'>
-						<view class="left">编号</view>
-						<view class="right">{{EnterList.inOutType}} {{EnterList.inOutTaskNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">仓库</view>
-						<view class="right">{{EnterList.warehouseName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">入库类型</view>
-						<view class="right">{{EnterList.inOutType}}</view>
+					<view class="uForm_item">
+						<!-- 入库 -->
+						<view class="title part2">{{EnterList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">入库（{{EnterList.inOutTaskNo}})</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{EnterList.warehouseName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">入库类型</view>
+							<view class="right">{{EnterList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="EnterList.inOutType == '移库入库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{EnterList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="EnterList.inOutType != '移库入库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{EnterList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{EnterList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{EnterList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计入库日期</view>
+							<view class="right">{{EnterList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{EnterList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row' v-if="EnterList.inOutType == '移库入库'">
-						<view class="left">移库任务编号</view>
-						<view class="right">{{EnterList.moveTaskNo}}</view>
-					</view>
-					<view class='row' v-if="EnterList.inOutType != '移库入库'">
-						<view class="left">合同编号</view>
-						<view class="right">{{EnterList.contractNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{EnterList.goodsName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">重量(吨)</view>
-						<view class="right">{{EnterList.weight}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">预计入库日期</view>
-						<view class="right">{{EnterList.predictDate}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{EnterList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
+							<u-input v-model="EnterList.grade" input-align="right" placeholder="请选择品级"
+								@click='show=true' disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
+								mode="selector">
+							</u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
+							<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" />
+						</u-form-item>
+						<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+							<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
 					</view>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150">
-						<u-input v-model="EnterList.grade" input-align="right" placeholder="" @click='show=true'
-							disabled />
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
-							mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
-						<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
-						<u-input v-model="EnterList.waterContent" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
-						<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
-						label-position="top">
-						<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="" type="textarea"
-							class="textarea" />
-					</u-form-item>
-					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
-						<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
-					</u-form-item>
-				</view>
-				<!-- <view v-if="type=='移库'">
-					<view class="title part2">移库入库</view>
-					<u-form-item label="编号" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="入库类型" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="移库任务编号" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="货名" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="预计入库时间" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="入库经办人" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="品级" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
-					</u-form-item>
-					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
-					</u-form-item>
+
 				</view>
-				<view v-if="type=='退库'">
-					<view class="title part2">出</view>
-					<u-form-item label="编号" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="出库类型" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="合同编号" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="货名" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="预计出库时间" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="出库经办人" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="品级" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
-					</u-form-item>
-					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
-					</u-form-item>
-				</view> -->
 			</u-form>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">驳回原因</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入驳回原因" />
+				<view class="flex">
+					<u-button @click="show1 = false" class="submit">取消</u-button>
+					<u-button @click="rejectSubmit()" class="submit">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
-		<!-- <u-modal v-model="show" content="确定通过出入库任务？" showCancelButton></u-modal> -->
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='show1 = true' type="error" class="btn1">驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 
@@ -261,16 +242,14 @@
 		data() {
 			return {
 				id: "",
-				OutList: {},
-				EnterList: {},
+				OutList: {}, //出
+				EnterList: {}, //入
+				retreatList: {}, //退
 				type: '移库',
 				show: false,
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress: '出库',
-					grade: "1"
-				},
-
+				show1: false,
+				border: false,
+				rejectInfo: "", //驳回原因
 				pjList: [{
 						type: '一等品'
 					},
@@ -284,23 +263,6 @@
 						type: '等外'
 					}
 				],
-				rules: {
-					freightUnitPrice: [{
-							validator: (rule, value, callback) => {
-								return !this.$u.test.isEmpty(value)
-							},
-							message: '运费不能为空',
-							trigger: ['change', 'blur']
-						},
-						{
-							validator: (rule, value, callback) => {
-								return this.$u.test.amount(value)
-							},
-							message: '数值类型，最多保留两位小数',
-							trigger: ['change', 'blur'],
-						}
-					]
-				}
 			}
 		},
 		onReady() {
@@ -329,13 +291,15 @@
 										res.data.data[i].inOutType == "暂存出库") {
 										this.OutList = res.data.data[i]
 										this.OutList.judge = 1
-									}
-									if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
-										.inOutType == "暂存入库" || res.data.data[i].inOutType == "退库" || res
+									} else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
+										.inOutType == "暂存入库" || res
 										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
 										"贸易服务入库") {
 										this.EnterList = res.data.data[i]
 										this.EnterList.judge = 2
+									} else if (res.data.data[i].inOutType == "退库") {
+										this.retreatList = res.data.data[i]
+										this.retreatList.judge = 3
 									}
 								}
 							}
@@ -369,17 +333,21 @@
 				}
 			},
 			rejectSubmit() {
-				if (this.EnterList.taskTypeKey == 1) {
-					this.requestaudit(this.EnterList)
-				} else if (this.EnterList.taskTypeKey == 2) {
-					this.requestaudit(this.EnterList)
-				} else if (
-					this.EnterList.taskTypeKey == 3 ||
-					this.EnterList.taskTypeKey == 4
-				) {
-					this.requestaudit(this.EnterList, 'repetition')
-					if (!this.deletetask) {
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				} else {
+					if (this.EnterList.taskTypeKey == 1) {
+						this.requestaudit(this.EnterList)
+					} else if (this.EnterList.taskTypeKey == 2) {
+						this.requestaudit(this.EnterList)
+					} else if (
+						this.EnterList.taskTypeKey == 3 ||
+						this.EnterList.taskTypeKey == 4
+					) {
 						this.requestaudit(this.EnterList, 'repetition')
+						if (!this.deletetask) {
+							this.requestaudit(this.EnterList, 'repetition')
+						}
 					}
 				}
 			},
@@ -409,7 +377,7 @@
 						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
 							taskId: list.taskId,
 							approved: false,
-							auditMind: "驳回原因",
+							auditMind: this.rejectInfo,
 							needReapply: true
 						}).then(res => {
 							if (res.data.code == 200) {
@@ -424,18 +392,17 @@
 </script>
 
 <style scoped lang="scss">
-	.content1,
-	.content2 {
-		background-color: #FFFFFF;
+	.content1 {
 		margin: 10rpx;
-		padding-bottom: 10rpx;
-		border-radius: 20rpx;
+		padding-bottom: 224rpx;
 
 		.title {
-			font-size: 28rpx;
+			height: 70rpx;
+			line-height: 60rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 	}
 
@@ -450,9 +417,24 @@
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -467,12 +449,15 @@
 
 	.textarea {
 		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		height: 100px;
 	}
 
 	.row {
 		display: flex;
 		justify-content: space-between;
-		border-bottom: 1px solid #EEEEEE;
+		// border-bottom: 1px solid #EEEEEE;
 		padding: 21rpx 0;
 
 		.right,
@@ -481,4 +466,28 @@
 			color: #333333;
 		}
 	}
+
+	//弹出框
+	// .popup {
+	// 	padding: 30rpx;
+	// 	border-radius: 20rpx;
+	// }
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		height: 100px;
+		margin: 30rpx;
+	}
+
+	.uForm_item {
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		margin: 20rpx;
+		border-radius: 20rpx;
+	}
+
+	.rejectText {
+		text-align: center;
+	}
 </style>

pages/task/audit/Issueandreceipt_task_details.vue

@@ -1,22 +1,486 @@
 <template>
-	<view>
-		出入库任务详情
+	<view class="warp">
+		<view class="content1">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="OutList.inOutType" input-align="right" placeholder="" disabled />
+				</u-form-item>
+				<!-- <view v-if="type=='移库'" class="title part2">移库出库</view>
+				<view v-if="type=='退库'" class="title part2">退库</view> -->
+				<view v-if="OutList.judge == 1">
+					<!-- 出库 -->
+					<view class="title part2">{{OutList.inOutType}}</view>
+					<view class='row'>
+						<view class="left">编号</view>
+						<view class="right">{{OutList.inOutType}} {{OutList.inOutTaskNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">仓库</view>
+						<view class="right">{{OutList.sendWarehouse}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">出库类型</view>
+						<view class="right">{{OutList.inOutType}}</view>
+					</view>
+				<!-- <view class='row'>
+						<view class="left">出库类型</view>
+						<view class="right">{{OutList.inOutType}}</view>
+					</view> -->
+					<view class='row' v-if="OutList.inOutType == '移库出库'">
+						<view class="left">移库任务编号</view>
+						<view class="right">{{OutList.moveTaskNo}}</view>
+					</view>
+					<view class='row' v-if="OutList.inOutType != '移库出库'">
+						<view class="left">合同编号</view>
+						<view class="right">{{OutList.contractNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">货名</view>
+						<view class="right">{{OutList.goodsName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">重量(吨)</view>
+						<view class="right">{{OutList.weight}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">预计出库日期</view>
+						<view class="right">{{OutList.predictDate}}</view>
+					</view>
+					<!-- 	<view class='row'>
+					<view class="left">预计入库日期</view>
+					<view class="right">{{OutList.inOutDate}}</view>
+				</view> -->
+					<view class='row'>
+						<view class="left">出库经办人</view>
+						<view class="right">{{OutList.publisher}}</view>
+					</view>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="品级" prop="grade" label-width="150">
+						<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
+							disabled />
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
+							mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+						<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+						<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
+						label-position="top">
+						<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="" type="textarea"
+							class="textarea" />
+					</u-form-item>
+					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+						<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+					</u-form-item>
+				</view>
+				<view v-if="EnterList.judge == 2">
+					<!-- 入库 -->
+					<view class="title part2">{{EnterList.inOutType}}</view>
+					<view class='row'>
+						<view class="left">编号</view>
+						<view class="right">{{EnterList.inOutType}} {{EnterList.inOutTaskNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">仓库</view>
+						<view class="right">{{EnterList.warehouseName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">入库类型</view>
+						<view class="right">{{EnterList.inOutType}}</view>
+					</view>
+					<view class='row' v-if="EnterList.inOutType == '移库入库'">
+						<view class="left">移库任务编号</view>
+						<view class="right">{{EnterList.moveTaskNo}}</view>
+					</view>
+					<view class='row' v-if="EnterList.inOutType != '移库入库'">
+						<view class="left">合同编号</view>
+						<view class="right">{{EnterList.contractNo}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">货名</view>
+						<view class="right">{{EnterList.goodsName}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">重量(吨)</view>
+						<view class="right">{{EnterList.weight}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">预计入库日期</view>
+						<view class="right">{{EnterList.predictDate}}</view>
+					</view>
+					<view class='row'>
+						<view class="left">出库经办人</view>
+						<view class="right">{{EnterList.publisher}}</view>
+					</view>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="品级" prop="grade" label-width="150">
+						<u-input v-model="EnterList.grade" input-align="right" placeholder="" @click='show=true'
+							disabled />
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
+							mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+						<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+						<u-input v-model="EnterList.waterContent" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="" />
+					</u-form-item>
+					<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="businessDescribe" label-width="160"
+						label-position="top">
+						<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="" type="textarea"
+							class="textarea" />
+					</u-form-item>
+					<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+						<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
+					</u-form-item>
+				</view>
+				<!-- <view v-if="type=='移库'">
+					<view class="title part2">移库入库</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="移库任务编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计入库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view>
+				<view v-if="type=='退库'">
+					<view class="title part2">出</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="合同编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计出库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
+						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
+						</u-picker>
+					</u-form-item>
+					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view> -->
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<!-- <u-modal v-model="show" content="确定通过出入库任务？" showCancelButton></u-modal> -->
+		<view class="bottom-btn">
+		<!-- 	<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button> -->
+				<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">{{OutList.taskStatus}}</u-button>
+			
+		</view>
 	</view>
+
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				
+				id: "",
+				OutList: {},
+				EnterList: {},
+				type: '移库',
+				show: false,
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress: '出库',
+					grade: "1"
+				},
+
+				pjList: [{
+						type: '一等品'
+					},
+					{
+						type: '二等品'
+					},
+					{
+						type: '三等品'
+					},
+					{
+						type: '等外'
+					}
+				],
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
 			}
 		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
-			
+			getList() {
+				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
+							relevanceId: res.data.data.relevanceId
+						}).then(res => {
+							if (res.data.code == 200) {
+								for (let i = 0; i < res.data.data.length; i++) {
+									if (res.data.data[i].inOutType == "移库出库" || res.data.data[i]
+										.inOutType == "贸易服务出库" || res.data.data[i].inOutType == "销售出库" ||
+										res.data.data[i].inOutType == "暂存出库") {
+										this.OutList = res.data.data[i]
+										this.OutList.judge = 1
+									}
+									if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
+										.inOutType == "暂存入库" || res.data.data[i].inOutType == "退库" || res
+										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
+										"贸易服务入库") {
+										this.EnterList = res.data.data[i]
+										this.EnterList.judge = 2
+									}
+								}
+							}
+						})
+					}
+				})
+			},
+			pjPicker(e) {
+				this.OutList.grade = this.pjList[e[0]].type
+				this.OutList.gradeKey = e[0] + 1
+			},
+			pjPicker1(e) {
+				this.EnterList.grade = this.pjList[e[0]].type
+				this.EnterList.gradeKey = e[0] + 1
+			},
+			passSubmit() {
+				this.OutList.inOutFlag = 1
+				this.EnterList.inOutFlag = 2
+				if (this.OutList.taskTypeKey == 1) {
+					this.requestadd(this.OutList)
+				} else if (this.EnterList.taskTypeKey == 2) {
+					this.requestadd(this.EnterList)
+				} else if (
+					this.OutList.taskTypeKey == 3 ||
+					this.OutList.taskTypeKey == 4
+				) {
+					this.requestadd(this.OutList, 'repetition')
+					if (!this.deletetask) {
+						this.requestadd(this.EnterList, 'repetition')
+					}
+				}
+			},
+			rejectSubmit() {
+				if (this.EnterList.taskTypeKey == 1) {
+					this.requestaudit(this.EnterList)
+				} else if (this.EnterList.taskTypeKey == 2) {
+					this.requestaudit(this.EnterList)
+				} else if (
+					this.EnterList.taskTypeKey == 3 ||
+					this.EnterList.taskTypeKey == 4
+				) {
+					this.requestaudit(this.EnterList, 'repetition')
+					if (!this.deletetask) {
+						this.requestaudit(this.EnterList, 'repetition')
+					}
+				}
+			},
+			requestadd(list, status) {
+				list.compId = sessionStorage.getItem('ws-pf_compId')
+				list.publisher = this.userInfo.userName
+				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+							taskId: list.taskId,
+							approved: true,
+							auditMind: '34',
+							needReapply: false
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.$api.msg('审核成功！')
+							}
+						})
+					}
+				})
+			},
+			requestaudit(list, status) {
+				list.compId = '2710b21efc1e4393930c5dc800010dc4'
+				list.publisher = this.userInfo.userName
+				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
+					if (res.data.code == 200) {
+						this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', {
+							taskId: list.taskId,
+							approved: false,
+							auditMind: "驳回原因",
+							needReapply: true
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.$api.msg('驳回成功！')
+							}
+						})
+					}
+				})
+			},
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.content1,
+	.content2 {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
 
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	}
+
+	.uForm {
+		padding: 0 40rpx;
+	}
+
+	.u-form-item {
+		padding: 0;
+	}
+
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+
+	.part2 {
+		margin-top: 20rpx;
+	}
+
+	.textarea {
+		border: 1px solid #ccc;
+	}
+
+	.row {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #EEEEEE;
+		padding: 21rpx 0;
+
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 </style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -1,26 +1,27 @@
 <template>
 	<view class="warp">
 		<view class='content1'>
-			<view class='row'>
-				<view class="left">仓库</view>
+			<view class='row content-item' >
+				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">鲅鱼圈一号库</view>
 			</view>
+			<view class="content-item">
 			<view v-for="(item,index) in List">
 				<view class='row row1'>
-					<view class="left">{{item.paymentNo}}</view>
-					<view class="right">{{item.carNo}}</view>
+					<view class="left title">{{item.paymentNo}}</view>
+					<view class="right title">{{item.carNo}}</view>
 				</view>
 				<view class='row'>
-					<view class="left">{{item.goodsName}}({{item.netWeight}} - {{item.tidalGrainPrice}})</view>
-					<view class="right">{{item.amountIngPayable}}</view>
+					<view class="left goodsInfoCss">{{item.goodsName}}({{item.netWeight}}kg - ￥{{item.tidalGrainPrice}})</view>
+					<view class="right priceCss">￥{{item.amountIngPayable}}</view>
 				</view>
 			</view>
-
+</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='rejectSubmit()' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -67,35 +68,35 @@
 					}
 				})
 			},
-			//駁回
+			//驳回
 			rejectSubmit() {
-				if(this.List.length > 0){
+				var that = this
+				if (this.List.length > 0) {
 					uni.showModal({
-						content: "确定驳回付款申请?",
-						success(res) {
-							// this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
-							// 	compId: "2710b21efc1e4393930c5dc800010dc4",
-							// 	id: item.id
-							// }).then(res => {
-							// 	if (res.data.code == 200) {
-							// 		this.List = res.data.data.records
-							// 	}
-							// })
-							 this.audit(this.List[0], 0, false, '', '')
+						content: "确定驳回付款申请？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.List[0], 0, false, '', '')
+							}
 						}
 					})
 				}
 			},
 			//通過
 			passSubmit() {
-				if(this.List.length > 0){
-					uni.showModal({
-					content: "确定通过付款申请?",
-					success(res) {
-						 this.audit(this.List[0], 0, true)
+				var that = this
+				uni.showModal({
+					content: "确定通过付款申请？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.audit(that.List[0], 0, true)
+						}
 					}
 				})
-				}
 			},
 			audit(item, index, status, status2, reason) {
 				if (this.List.length > 0) {
@@ -112,8 +113,8 @@
 						this.$api.doRequest('get', '/workflow/api/handle', {
 							taskId: item.taskId,
 							approved: status,
-							auditMind: reason != undefined ? '已驳回' : '34',
-							needReapply: status2 != undefined ? true : false
+							auditMind: reason  ? '已驳回' : '34',
+							needReapply: status2  ? true : false
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.audit(this.List[index + 1], index + 1, status, status2, reason)
@@ -122,10 +123,10 @@
 					}
 				} else {
 					if (status == true) {
-						this.$message.success('通过成功')
+						that.$api.msg('通过成功')
 						this.getList()
 					} else if (status == false) {
-						this.$message.success('驳回成功')
+						that.$api.msg('驳回成功')
 						this.getList()
 					}
 				}
@@ -137,54 +138,68 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 200rpx 20rpx;
 	}
 
-	.content1,
-	.content2 {
-		border-radius: 20rpx;
-		background: white;
-		padding: 20rpx;
+	.content1{
+		.content-item{
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
 
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			margin: 30rpx 0;
+		}
+		.goodsInfoCss{
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #878C9C;
+				margin: 26rpx 10rpx;
+		}
+		.priceCss{
+			font-size: 40rpx;
+			margin: 26rpx 10rpx;
+			color: #22C572;
+			font-weight: 600;
 		}
 
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-			padding: 21rpx 0;
 
 			.right,
 			input {
 				font-size: 28rpx;
-				color: #333333;
+				// color: #333333;
 			}
 		}
 	}
 
-	.content2 {
-		margin-top: 20rpx;
-	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
-
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
-	}
-
 	.row1 {
 		border-bottom: 0 !important;
 	}

pages/task/audit/acquisition_settlement_details.vue

@@ -5,74 +5,131 @@
 				<view class="left">仓库</view>
 				<view class="right">鲅鱼圈一号库</view>
 			</view>
-			<view v-for="(item,index) in 4">
+			<view v-for="(item,index) in List">
 				<view class='row row1'>
-					<view class="left">SG11111111111</view>
-					<view class="right">辽H12345</view>
+					<view class="left">{{item.paymentNo}}</view>
+					<view class="right">{{item.carNo}}</view>
 				</view>
 				<view class='row'>
-					<view class="left">玉米（150000kg-2.58）</view>
-					<view class="right">100000元</view>
+					<view class="left">{{item.goodsName}}({{item.netWeight}} - {{item.tidalGrainPrice}})</view>
+					<view class="right">{{item.amountIngPayable}}</view>
 				</view>
 			</view>
-			
+
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<!-- 	<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button> -->
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				
+				id: "",
+				currentPage: 1,
+				pageSize: 10,
+				List: [],
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow(options) {
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		methods: {
-			rejectSubmit(){
-				uni.showModal({
-					content: "确定驳回该设置?",
-					success(res) {
-						// if (res.confirm) {
-						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
-						// 		that.detailData).then(res => {
-						// 		if (res.data.code == 200) {
-						// 		that.$api.msg(title)
-						// 		setTimeout(() => {
-						// 			uni.navigateBack()
-						// 		}, 1000)
-						// 		}else{
-						// 			that.$api.msg(res.data.message)
-						// 		}
-						// 	})
-						// }
+			getList() {
+				// this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
+				// id:this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		console.log("hdshfuiehfiuo",res)
+				// 	}
+				// })
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					// warehouseName: this.warehouseName,
+					managementType: 1
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.List = res.data.data.records
 					}
 				})
 			},
-			passSubmit(){
+			//驳回
+			rejectSubmit() {
+				var that = this
+				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
 				uni.showModal({
-					content: "确定通过该设置?",
-					success(res) {
-						// if (res.confirm) {
-						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
-						// 		that.detailData).then(res => {
-						// 		if (res.data.code == 200) {
-						// 		that.$api.msg(title)
-						// 		setTimeout(() => {
-						// 			uni.navigateBack()
-						// 		}, 1000)
-						// 		}else{
-						// 			that.$api.msg(res.data.message)
-						// 		}
-						// 	})
-						// }
+					content: "确定通过付款申请？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.audit(that.List[0], 0, true)
+						}
 					}
 				})
 			},
+			audit(item, index, status, status2, reason) {
+				if (this.List.length > 0) {
+					if (status == true && item.status == "已驳回") {
+						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							id: item.id
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.audit(this.List[index + 1], index + 1, status, status2, reason)
+							}
+						})
+					} else {
+						this.$api.doRequest('get', '/workflow/api/handle', {
+							taskId: item.taskId,
+							approved: status,
+							auditMind: reason  ? '已驳回' : '34',
+							needReapply: status2  ? true : false
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.audit(this.List[index + 1], index + 1, status, status2, reason)
+							}
+						})
+					}
+				} else {
+					if (status == true) {
+						that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+						that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
@@ -82,25 +139,26 @@
 		margin: 10rpx;
 		padding: 20rpx 20rpx 140rpx 20rpx;
 	}
+
 	.content1,
 	.content2 {
 		border-radius: 20rpx;
 		background: white;
 		padding: 20rpx;
-	
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: center;
 		}
-	
+
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
 			padding: 21rpx 0;
-	
+
 			.right,
 			input {
 				font-size: 28rpx;
@@ -108,9 +166,11 @@
 			}
 		}
 	}
-	.content2{
+
+	.content2 {
 		margin-top: 20rpx;
 	}
+
 	.bottom-btn {
 		width: 92%;
 		position: fixed;
@@ -118,12 +178,14 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.row1{
-		border-bottom: 0!important;
+
+	.row1 {
+		border-bottom: 0 !important;
 	}
 </style>

pages/task/audit/freight_setting_approval.vue

@@ -1,107 +1,72 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+					<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'" style="height: 40rpx;"></image><!-- 驳回 -->
+					<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'" style="height: 40rpx;"></image><!-- 通过 -->
+					<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'" style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list.priceStatus}}</view>
+				</view>
+				<view class="infoData">2020年1月15日 08:45</view>
+			</view>
+		</view>
 		<view class="transaction">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="合同编号" prop="contractNo" label-width="140">
+					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="任务编号" prop="processNo" label-width="140">
+					<u-input v-model="list.processNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="货名" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="货名" prop="goodsName" label-width="140">
+					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
+					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled />
 				</u-form-item>
-				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
+					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
-				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
-					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
+					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
-		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view>
+		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button>
 	</view>
-
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress:'444'
-				},
-				rules: {
-					freightUnitPrice: [{
-							validator: (rule, value, callback) => {
-								return !this.$u.test.isEmpty(value)
-							},
-							message: '运费不能为空',
-							trigger: ['change', 'blur']
-						},
-						{
-							validator: (rule, value, callback) => {
-								return this.$u.test.amount(value)
-							},
-							message: '数值类型，最多保留两位小数',
-							trigger: ['change', 'blur'],
-						}
-					]
-				}
+				list: {},
+				id: "",
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.id = options.id
 			this.getList()
 		},
 		methods: {
-			getList(){
-				
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
+					id: this.id
+				}).then(res => {
+					this.list = res.data.data
+				})
 			},
-			passSubmit(){
-				this.$refs.uForm.validate(valid => {
-					if (valid) {
-						uni.showLoading({
-							title: '正在加载',
-							mask: true
-						})
-						console.log('验证通过');
-						this.$api.doRequest('post',
-							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
-							this
-							.purchaseOrder).then(res => {
-							if (res.data.code == 200) {
-								uni.showToast({
-									title: '提交成功',
-									icon: 'none',
-									duration: 2000,
-									success: function() {
-										uni.navigateTo({
-											url: `/pageA/freightTransport/index`
-										})
-									}
-								})
-				
-							}
-				
-						}).catch(res => {
-							// uni.showToast({
-							// 	title: res.data.message,
-							// 	icon: 'none',
-							// 	duration: 2000
-							// })
-						})
-					} else {
-						console.log('验证失败');
-					}
-				});
+			passSubmit() {
+				var tranProcessInfo = {}
+				tranProcessInfo.id = this.list.id
+				tranProcessInfo.flag = "1"
+				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
+				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
+					that.$api.msg('审核通过成功')
+				})
 			}
 		}
 	}
@@ -114,12 +79,15 @@
 		padding-bottom: 10rpx;
 		border-radius: 20rpx;
 	}
+
 	.uForm {
 		padding: 0 40rpx;
 	}
-	.u-form-item{
+
+	.u-form-item {
 		padding: 0;
 	}
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -127,9 +95,38 @@
 		display: flex;
 		z-index: 2;
 	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+		.topInfo-item {
+			height: 158rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+			.infoData{
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 	.submit {
-		width: 40%;
+		width: 98%;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 40rpx;
+		margin-top: 40rpx;
 	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -1,103 +1,72 @@
 <template>
 	<view class="warp">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+					<image src="../../../static/img/reject.png" mode="" v-if="list.priceStatus == '已驳回'" style="height: 40rpx;"></image><!-- 驳回 -->
+					<image src="../../../static/img/tongguo.png" mode="" v-if="list.priceStatus == '已通过'" style="height: 40rpx;"></image><!-- 通过 -->
+					<image src="../../../static/img/daishenhe.png" mode="" v-if="list.priceStatus == '审核中'" style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{list.priceStatus}}</view>
+				</view>
+				<view class="infoData">2020年1月15日 08:45</view>
+			</view>
+		</view>
 		<view class="transaction">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="合同编号" prop="contractNo" label-width="140">
+					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="任务编号" prop="processNo" label-width="140">
+					<u-input v-model="list.processNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="货名" prop="receivingAddress" label-width="140">
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				<u-form-item label="货名" prop="goodsName" label-width="140">
+					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
+					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled />
 				</u-form-item>
-				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
-					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
+					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
-				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
-					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
+					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</view>
-		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
-		</view>
+		
 	</view>
-
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress:'444'
-				},
-				rules: {
-					freightUnitPrice: [{
-							validator: (rule, value, callback) => {
-								return !this.$u.test.isEmpty(value)
-							},
-							message: '运费不能为空',
-							trigger: ['change', 'blur']
-						},
-						{
-							validator: (rule, value, callback) => {
-								return this.$u.test.amount(value)
-							},
-							message: '数值类型，最多保留两位小数',
-							trigger: ['change', 'blur'],
-						}
-					]
-				}
+				list: {},
+				id: "",
 			}
 		},
-		onReady() {
-			this.$refs.uForm.setRules(this.rules);
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
 		},
 		methods: {
-			passSubmit(){
-				this.$refs.uForm.validate(valid => {
-					if (valid) {
-						uni.showLoading({
-							title: '正在加载',
-							mask: true
-						})
-						console.log('验证通过');
-						this.$api.doRequest('post',
-							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
-							this
-							.purchaseOrder).then(res => {
-							if (res.data.code == 200) {
-								uni.showToast({
-									title: '提交成功',
-									icon: 'none',
-									duration: 2000,
-									success: function() {
-										uni.navigateTo({
-											url: `/pageA/freightTransport/index`
-										})
-									}
-								})
-				
-							}
-				
-						}).catch(res => {
-							// uni.showToast({
-							// 	title: res.data.message,
-							// 	icon: 'none',
-							// 	duration: 2000
-							// })
-						})
-					} else {
-						console.log('验证失败');
-					}
-				});
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
+					id: this.id
+				}).then(res => {
+					this.list = res.data.data
+				})
+			},
+			passSubmit() {
+				var tranProcessInfo = {}
+				tranProcessInfo.id = this.list.id
+				tranProcessInfo.flag = "1"
+				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
+				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
+					that.$api.msg('审核通过成功')
+				})
 			}
 		}
 	}
@@ -110,12 +79,15 @@
 		padding-bottom: 10rpx;
 		border-radius: 20rpx;
 	}
+
 	.uForm {
 		padding: 0 40rpx;
 	}
-	.u-form-item{
+
+	.u-form-item {
 		padding: 0;
 	}
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -123,9 +95,38 @@
 		display: flex;
 		z-index: 2;
 	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+		.topInfo-item {
+			height: 158rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
+			}
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+			.infoData{
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
+			}
+		}
+	}
 	.submit {
-		width: 40%;
+		width: 98%;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 40rpx;
+		margin-top: 40rpx;
 	}
 </style>

pages/task/audit/freight_settlement_approval.vue

@@ -5,38 +5,40 @@
 				<view>合同编号</view>
 				<view>123456796</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in list">
-				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
-				<view class="car-type-item">
-					<view class="left">装</view>
-					<view class="left">{{item.loadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">卸</view>
-					<view class="left">{{item.unloadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结</view>
-					<view class="left">{{item.settlementWeightchange}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">运</view>
-					<view class="left">{{item.transportPrice}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣</view>
-					<view class="left">{{item.deductionAmountchange}}元</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">付</view>
-					<view class="left">{{item.amountEdPayable}}元</view>
+			<view class="car-container">
+				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
+					<view class="car-num title">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-type-item">
+						<view class="left">装</view>
+						<view class="textInfo">{{item.loadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">卸</view>
+						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">结</view>
+						<view class="textInfo">{{item.settlementWeightchange}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">运</view>
+						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">扣</view>
+						<view class="textInfo">{{item.deductionAmountchange}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">付</view>
+						<view class="textInfo">{{item.amountEdPayable}}元</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click="rejectSubmit()" type="error" class="btn1">驳回</u-button>
+			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -48,7 +50,6 @@
 				currentPage: 1,
 				pageSize: 10,
 				list: [],
-
 			}
 		},
 		onLoad() {
@@ -69,8 +70,9 @@
 			},
 			// 驳回
 			rejectSubmit() {
+				var that = this
 				if (this.list.length == 0) {
-					this.$message.success('没有要审核的条目！')
+						this.$api.msg('没有要审核的条目！')
 				} else {
 					uni.showModal({
 						content: "是否确定驳回?",
@@ -78,7 +80,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.audit(this.list[0], 0, false, true, '已驳回')
+								that.audit(that.list[0], 0, false, true, '已驳回')
 							}
 						}
 					})
@@ -86,8 +88,9 @@
 			},
 			//通过
 			passSubmit() {
+				var that = this
 				if (this.list.length == 0) {
-					this.$message.success('没有要审核的条目！')
+					this.$api.msg('没有要审核的条目！')
 				} else {
 					uni.showModal({
 						content: "是否确定通过?",
@@ -95,16 +98,12 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								this.a(0)
-								// this.audit(this.list[0], 0, true, 2)
+								that.audit(that.list[0], 0, true, 2)
 							}
 						}
 					})
 				}
 			},
-			a(ing){
-				console.log(ing)
-			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
 				if (index < this.list.length) {
@@ -118,10 +117,10 @@
 					})
 				} else {
 					if (status == true) {
-						this.$message.success('通过成功')
+							that.$api.msg('通过成功')
 						this.getList()
 					} else if (status == false) {
-						this.$message.success('驳回成功')
+							that.$api.msg('驳回成功')
 						this.getList()
 					}
 				}
@@ -134,14 +133,18 @@
 	.container {
 		margin: 10rpx;
 		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		// border-radius: 20rpx;
+		// background: white;
 	}
 
 	.content {
 		.top {
 			display: flex;
 			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 30rpx 20rpx;
+			font-size: 36rpx;
 		}
 
 		.title {
@@ -149,21 +152,44 @@
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin-bottom: 30rpx;
+		}
+		.car-container{
+			padding: 10rpx 20rpx;
+			border-radius: 20rpx;
+			background: white;
+			margin:30rpx 0 ;
+			// border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
+			margin-bottom: 40rpx ;
+		}
+		.title{
+			font-size: 36rpx;
 		}
 	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -171,4 +197,26 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.left{
+		background: #FEECE6;
+		color: #FE6430;
+	}
+	.center{
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+	.right{
+		background: #E9F8F0 ;
+		color: #22C572 ;
+	}
+	.left,.center,.right{
+		width: 50rpx;
+		height: 50rpx;
+		text-align: center;
+		line-height: 50rpx;
+		border-radius: 10rpx;
+	}
+	.textInfo{
+		margin: 6rpx 0 0 10rpx;
+	}
 </style>

pages/task/audit/freight_settlement_details.vue

@@ -1,6 +1,43 @@
 <template>
-	<view>
-		运费结算详情
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in list">
+				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
+				<view class="car-type-item">
+					<view class="left">装</view>
+					<view class="left">{{item.loadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">卸</view>
+					<view class="left">{{item.unloadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结</view>
+					<view class="left">{{item.settlementWeightchange}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="left">{{item.transportPrice}}元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣</view>
+					<view class="left">{{item.deductionAmountchange}}元</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">付</view>
+					<view class="left">{{item.amountEdPayable}}元</view>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<!-- <u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button> -->
+		</view>
 	</view>
 </template>
 
@@ -8,15 +45,127 @@
 	export default {
 		data() {
 			return {
-				
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
 			}
 		},
+		onLoad() {
+			this.getList()
+		},
 		methods: {
-			
+			getList() {
+				this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+					compId: "2710b21efc1e4393930c5dc800010dc4",
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					contractNo: "全部合同"
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data.records
+					}
+				})
+			},
+			// 驳回
+			rejectSubmit() {
+				var that = this
+				if (this.list.length == 0) {
+						this.$api.msg('没有要审核的条目！')
+				} else {
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, false, true, '已驳回')
+							}
+						}
+					})
+				}
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				if (this.list.length == 0) {
+					this.$api.msg('没有要审核的条目！')
+				} else {
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2)
+							}
+						}
+					})
+				}
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+							that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+							that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+
+	.content {
+		.top {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+
+		.car-type-item {
+			display: inline-flex;
+			// justify-content: center;
+			width: 33.33%;
+		}
+	}
+
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
 
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
 </style>

pages/task/audit/purchase_settlement_approval.vue

@@ -1,34 +1,40 @@
 <template>
 	<view class="container">
 		<view class="content">
-			<view class="top">
-				<view>合同编号</view>
-				<view>{{contractNo}}</view>
+			<view class="top content-item">
+				<view>{{contractNo}}({{list[0].goodsName}})</view>
+				<view>元/吨</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in list">
-				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
-				<view class="car-type-item">
-					<view class="left">净重</view>
-					<view class="left">{{item.netWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结重</view>
-					<view class="left">120.4{{item.settlementWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣款</view>
-					<view class="left">{{item.deductionAmountchange}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">应付</view>
-					<view class="left">{{item.amountIngPayable}}元</view>
+			<view class="content-item">
+				<view class="car-container" v-for="(item,index) in list">
+					<view class="car-num title">{{item.carNo}}</view>
+					<view class="row">
+						<view class="left car-type-item">净重</view>
+						<view class="right weightInfoCss">{{item.netWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">结重</view>
+						<view class="right weightInfoCss">{{item.settlementWeight}} 吨</view>
+					</view>
+					<view class="row">
+						<view class="left car-type-item">扣款</view>
+						<view class="right weightInfoCss">￥{{item.deductionAmountchange?item.deductionAmountchange:"0"}}/吨</view>
+					</view>
+					<view class="row ">
+						<view class="left money">应付</view>
+						<view class="right moneyInfo">￥{{item.amountIngPayable}}元</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
+		<!-- <view class="bottom-btn">
 			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
 			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		</view> -->
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='rejectSubmit' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -38,10 +44,10 @@
 		data() {
 			return {
 				id: "",
-				currentPage:1,
-				pageSize:10,
-				list:[],
-				contractNo:"",
+				currentPage: 1,
+				pageSize: 10,
+				list: [],
+				contractNo: "",
 			}
 		},
 		onLoad(options) {
@@ -56,10 +62,10 @@
 					this.contractNo = res.data.data.contractNo
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
-						compId: "2710b21efc1e4393930c5dc800010dc4",
-						  currentPage: this.currentPage,
-						  pageSize: this.pageSize,
-						  contractNo: this.contractNo,
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							contractNo: this.contractNo,
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.list = res.data.data.records
@@ -69,29 +75,53 @@
 				})
 			},
 			//驳回
-			rejectSubmit(){
+			rejectSubmit() {
+				var that = this
 				if (this.list.length == 0) {
-					this.$message.success('没有要审核的条目！')
+					that.$api.msg('没有要审核的条目！')
 				} else {
+					// uni.showModal({
+					// 	content: "是否确定驳回?",
+					// 	success(res) {
+					// 		if(res)
+					// 		this.audit(this.list[0], 0, false, true, '已驳回')
+					// 	}
+					// })
+
+
 					uni.showModal({
-						content: "是否确定驳回?",
-						success(res) {
-							if(res)
-							this.audit(this.list[0], 0, false, true, '已驳回')
+						content: "是否确定驳回？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, false, true, '已驳回')
+							}
 						}
 					})
 				}
 			},
 			//通过
-			passSubmit(){
+			passSubmit() {
+				var that = this
 				if (this.list.length == 0) {
-					this.$message.success('没有要审核的条目！')
+					that.$api.msg('没有要审核的条目！')
 				} else {
+					// uni.showModal({
+					// 	content: "是否确定通过?",
+					// 	success(res) {
+					// 		if(res)
+					// 		this.audit(this.list[0], 0, true, 2)
+					// 	}
+					// })
 					uni.showModal({
-						content: "是否确定通过?",
-						success(res) {
-							if(res)
-							this.audit(this.list[0], 0, true, 2)
+						content: "是否确定通过？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2)
+							}
 						}
 					})
 				}
@@ -109,10 +139,10 @@
 					})
 				} else {
 					if (status == true) {
-						this.$message.success('通过成功')
+						that.$api.msg('通过成功')
 						this.getList()
 					} else if (status == false) {
-						this.$message.success('驳回成功')
+						that.$api.msg('驳回成功')
 						this.getList()
 					}
 				}
@@ -123,10 +153,7 @@
 
 <style scoped lang="scss">
 	.container {
-		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		padding: 20rpx 20rpx 250rpx 20rpx;
 	}
 
 	.content {
@@ -135,31 +162,74 @@
 			justify-content: space-between;
 		}
 
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+
 		.title {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin: 20rpx 0;
+		}
+		.car-container{
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
-			display: inline-flex;
-			// justify-content: center;
-			width: 50%;
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
 		}
-	}
 
-	.bottom-btn {
-		width: 92%;
+		.weightInfoCss {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// .right,
+			// input {
+			// 	font-size: 28rpx;
+			// 	// color: #333333;
+			// }
+		}
+
+		.money {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 30rpx ;
+		}
+
+		.moneyInfo {
+			color: #22C572;
+			font-size: 32rpx;
+		}
+	}
+.bottom-btn {
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
-	}
-
-	.submit {
-		width: 40%;
-		background: #22C572;
-		border-radius: 10rpx;
-	}
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
+		}
 </style>

pages/task/audit/purchase_settlement_details.vue

@@ -3,32 +3,33 @@
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>123456796</view>
+				<view>{{contractNo}}</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in 4">
-				<view class="car-num title">辽H123465（c001）</view>
+			<view class="car-container" v-for="(item,index) in list">
+				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
 				<view class="car-type-item">
 					<view class="left">净重</view>
-					<view class="left">150.11吨</view>
+					<view class="left">{{item.netWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">结重</view>
-					<view class="left">120.4吨</view>
+					<view class="left">120.4{{item.settlementWeight}}吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">扣款</view>
-					<view class="left">120元/吨</view>
+					<view class="left">{{item.deductionAmountchange}}元/吨</view>
 				</view>
 				<view class="car-type-item">
 					<view class="left">应付</view>
-					<view class="left">1000元</view>
+					<view class="left">{{item.amountIngPayable}}元</view>
 				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+			<!-- <u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button> -->
+			 <u-button type="primary" class="submit" hover-class="none" >???</u-button>
 		</view>
 	</view>
 </template>
@@ -37,11 +38,106 @@
 	export default {
 		data() {
 			return {
-
+				id: "",
+				currentPage:1,
+				pageSize:10,
+				list:[],
+				contractNo:"",
 			}
 		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
 		methods: {
-
+			getList(id) {
+				this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
+					id: this.id
+				}).then(res => {
+					this.contractNo = res.data.data.contractNo
+					if (res.data.code == 200) {
+						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
+						compId: "2710b21efc1e4393930c5dc800010dc4",
+						  currentPage: this.currentPage,
+						  pageSize: this.pageSize,
+						  contractNo: this.contractNo,
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.list = res.data.data.records
+							}
+						})
+					}
+				})
+			},
+			//驳回
+			rejectSubmit(){
+				var that = this
+				if (this.list.length == 0) {
+						that.$api.msg('没有要审核的条目！')
+				} else {
+					// uni.showModal({
+					// 	content: "是否确定驳回?",
+					// 	success(res) {
+					// 		if(res)
+					// 		this.audit(this.list[0], 0, false, true, '已驳回')
+					// 	}
+					// })
+					
+					
+					uni.showModal({
+						content: "是否确定驳回？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, false, true, '已驳回')
+							}}})
+				}
+			},
+			//通过
+			passSubmit(){
+				var that = this
+				if (this.list.length == 0) {
+						that.$api.msg('没有要审核的条目！')
+				} else {
+					// uni.showModal({
+					// 	content: "是否确定通过?",
+					// 	success(res) {
+					// 		if(res)
+					// 		this.audit(this.list[0], 0, true, 2)
+					// 	}
+					// })
+					uni.showModal({
+						content: "是否确定通过？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2)
+							}}})
+				}
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+							that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+							that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
 		}
 	}
 </script>
@@ -53,23 +149,27 @@
 		border-radius: 20rpx;
 		background: white;
 	}
+
 	.content {
-		.top{
+		.top {
 			display: flex;
 			justify-content: space-between;
 		}
+
 		.title {
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
 		}
-		.car-type-item{
+
+		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 50%;
 		}
 	}
+
 	.bottom-btn {
 		width: 92%;
 		position: fixed;
@@ -77,6 +177,7 @@
 		display: flex;
 		z-index: 2;
 	}
+
 	.submit {
 		width: 40%;
 		background: #22C572;

pages/task/audit/warehouse_approval.vue

@@ -30,7 +30,7 @@
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
-			<view class='row'>
+			<view class='row boder'>
 				<view class="left">销售上限</view>
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
@@ -46,7 +46,7 @@
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">{{item.basePrice}}</view>
 				</view>
-				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1" :class="index1==item.modelList.length-1?'boder':''">
 					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
 					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
@@ -54,9 +54,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view style='padding:10px;' class='flex'>
-			<u-button  @click='reject' type="error">驳回</u-button>
-			<u-button  @click='audit' type="success">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='reject' type="error" class="btn1">驳回</u-button>
+			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -114,19 +114,25 @@
 				uni.showModal({
 					content: "是否确定通过审核？",
 					showCancel: true,
-					confirmText: '提交',
+					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', {
-								taskId: that.list.taskId,
-								approved: true,
-								auditMind: '34',
-								needReapply: true,
-							}).then(res1 => {
-								if (res1.data.code == 200) {
-									that.$api.msg('审核成功');
-									that.$nextTick(function() {
-										uni.navigateBack()
+							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										approved: true,
+										auditMind: "",
+										needReapply: true,
+										taskId:  that.list.taskId,
+									}).then(res1 => {
+										if (res1.data.code == 200) {
+											that.$api.msg('审核成功');
+											that.setTimeout(function() {
+													uni.navigateBack()
+											}, 1000);
+										} else {
+											that.$api.msg(res1.data.message);
+										}
 									})
 								} else {
 									that.$api.msg('系统异常，请联系管理员');
@@ -141,7 +147,7 @@
 				uni.showModal({
 					content: "是否确定驳回？",
 					showCancel: true,
-					confirmText: '提交',
+					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
 							that.$api.doRequest('post', '/workflow/api/handle', {
@@ -161,7 +167,7 @@
 								} else {
 									that.$api.msg(res1.data.message);
 								}
-							}).catch()
+							})
 						}
 					}
 				})
@@ -173,7 +179,7 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 330rpx 20rpx;
 	}
 
 	.content1,
@@ -186,7 +192,7 @@
 			font-size: 28rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			text-align: left;
 		}
 
 		.row {
@@ -208,11 +214,23 @@
 	}
 
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -220,4 +238,8 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.boder{
+		border:0;
+		border-bottom: 0!important;
+	}
 </style>

pages/task/my_task.vue

@@ -1,27 +1,27 @@
 <template name="task">
 	<view class="content">
-		<view class="cu-bar search bg-white">
+		<view class="content1-top">
 			<view class="search-form round">
 				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
-		</view>
-		<view style='background:#fff;padding:0 15px;'>
-			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			<view>
+				<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
+				<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+			</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex align-item-center">
 					<view>
-						<view>{{item.department}}:</view>
+						<view class="title-row1">{{item.department}}:</view>
 						<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 					</view>
 					<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
 					<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 				</view>
 				<view class="flex title_b">
-					<view style='color:#878C9C;' class="title">
+					<view style='color:#878C9C;' class="title row2">
 						{{item.messageContent}}
 					</view>
 				</view>
@@ -47,7 +47,7 @@
 				PageCur: "task",
 				taskInfo: [],
 				pages: 1, //页数
-				limit: 10, //每次取条目数
+				limit: 50, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
 				isSole: false,
@@ -101,6 +101,7 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.pages+=1
 				if (this.statusFlag == 1) {
 					this.warehouseInOutInfo.currentPage += 1
 				} else {
@@ -397,8 +398,7 @@
 					} else {
 						uni.navigateTo({
 							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId + '&compId=' + this
-								.pcUserInfo.compId
+							url: `/pages/task/audit/freight_setting_details?id=` + item.businessId
 						})
 					}
 				}
@@ -439,7 +439,9 @@
 		border-radius: 3px;
 		margin: 3px;
 	}
-
+	.introduce-section{
+		// background: red;
+	}
 	.introduce-section .title_b .title-tip {
 		font-size: 13px;
 		height: 40px;
@@ -450,7 +452,6 @@
 	.introduce-section .title_b .title {
 		font-size: 13px;
 		height: 40px;
-		padding: 10px 0;
 		flex: 2.5;
 	}
 
@@ -464,22 +465,22 @@
 
 	.introduce-section .title {
 		justify-content: space-between;
+		align-items: flex-start;
 	}
 
 	.introduce-section .title text {
-		font-size: 14px;
-		height: 50px;
-		line-height: 50px;
+		font-size: 28rpx;
 	}
 
 	.introduce-section .title .title-tip {
 		flex: 1;
-		font-size: 15px;
+		font-size: 28rpx;
 		color: #FE6430;
 		font-weight: 500;
 		height: 50px;
 		line-height: 50px;
 		border-bottom: 1px solid #EEEEEE;
+		
 	}
 
 	.introduce-section .title .title-tip-a {
@@ -493,10 +494,10 @@
 	}
 
 	.introduce-section .guess-item {
-		border-radius: 10px;
+		border-radius: 10rpx;
 		background: #fff;
-		padding: 30upx 30upx 80upx;
-		margin: 10px;
+		padding: 32rpx;
+		margin: 20rpx;
 	}
 
 	.line {
@@ -519,10 +520,24 @@
 		left: 50%;
 		transform: translateX(-50%);
 		bottom: 0;
-		border-bottom: 1px solid #22C572;
+		border-bottom: 3px solid #22C572;
 	}
 
 	/deep/.u-action-active {
 		margin-right: 6px;
 	}
+	.content1-top{
+		background: white;
+		padding: 20rpx;
+		border-radius: 0 0 30rpx 30rpx;
+	}
+	.search-form{
+		margin-bottom: 20rpx;
+	}
+	.title-row1{
+		font-size: 34rpx;
+	}
+	.row2{
+		margin-top: 55rpx;
+	}
 </style>

pages/user/user.vue

@@ -41,6 +41,9 @@
 				</view>
 			</view>
 		</view>
+		<!-- <view style="margin-top: 10rpx;">
+			<web-view src="https://datav.aliyuncs.com/share/01de6913a5761ab4d3171b1f0b3e0704"></web-view>
+		</view> -->
 		<!-- <view style='text-align:center;'>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
@@ -49,7 +52,7 @@
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view> -->
-		<view class="guess-section-wrap">
+		<!-- <view class="guess-section-wrap">
 			<view class='flex justify-between'>
 				<view class='title Medium'>工厂价格</view>
 			</view>
@@ -69,7 +72,7 @@
 				</view>
 			</view>
 		</view>
-		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top>
+		<u-back-top :scroll-top="scrollTop" mode="circle" icon="arrow-upward"></u-back-top> -->
 	</view>
 </template>
 <script>
@@ -196,6 +199,15 @@
 						tips: 0,
 						url: `/pages/erp/contactCustomerService/contactCustomerService`,
 						show: true
+					},
+					{
+						num: 6,
+						name: '数据报表',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/myContract@2x.png',
+						tips: 0,
+						url: `/pages/user/report`,
+						show: true
 					}
 				],
 				showTran: true,

websocket_sdk.js

@@ -1,6 +1,7 @@
 import packetCode from './PacketCodeC.js'
 import store from './store/index.js'
 import * as config from './config'
+import helper from '@/common/helper.js'; 
 export default class Websocket {
     constructor({
         heartCheck,
@@ -276,6 +277,7 @@ export default class Websocket {
 					success: (res) => {						
 						if (res.statusCode === 200) {
 							uni.setStorageSync('pcUserInfo', res.data)
+							helper.getListByUserId()
 						}
 						else{
 							uni.request({
@@ -288,6 +290,7 @@ export default class Websocket {
 								success: (res) => {						
 									if (res.statusCode === 200) {
 										uni.setStorageSync('pcUserInfo', res.data)
+										helper.getListByUserId()
 									}
 								}
 							})