前端

config/index.js

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

pages.json

@@ -426,6 +426,14 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/erpbusiness/outbound_quality_testing",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/erpbusiness/check_the_weight",
 			"style": {

pages/erp/index.vue

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

pages/erpbusiness/acquisitionInspection/add_check_the_weight.vue

@@ -9,19 +9,39 @@
 				<view class="right">{{detailData.warehouseName}}</view>
 			</view>
 			<view class="row">
+				<view class="left">任务编号</view>
+				<view class="right">
+					<view @click='show4=true'>{{detailData.inOutTaskNo?detailData.inOutTaskNo:'请选择任务编号'}}</view>
+					<u-picker :range="taskNolist" range-key="inOutTaskNo" @confirm='tasknopicker($event)' v-model="show4"
+						mode="selector">
+					</u-picker>
+				</view>
+			</view>
+			<view v-if="detailData.inOutType=='移库出库'" class="row">
+				<view class="left">移库编号</view>
+				<view>{{detailData.contractNo?detailData.contractNo:'请选择移库编号'}}</view>
+				<!-- <view @click='show=true'>{{detailData.contractNo?detailData.contractNo:'请选择合同编号'}}</view> -->
+				<u-picker :range="contractNoList" range-key="contractNo" @confirm='contractNopicker($event)' v-model="show" mode="selector" >
+				</u-picker>
+			</view>
+			<view v-else class="row">
 				<view class="left">合同编号</view>
-				<view @click='show=true'>{{detailData.contractNo?detailData.contractNo:'请选择合同编号'}}</view>
+				<view>{{detailData.contractNo?detailData.contractNo:'请选择合同编号'}}</view>
+				<!-- <view @click='show=true'>{{detailData.contractNo?detailData.contractNo:'请选择合同编号'}}</view> -->
 				<u-picker :range="contractNoList" range-key="contractNo" @confirm='contractNopicker($event)' v-model="show" mode="selector" >
 				</u-picker>
 			</view>
+			<view style=' align-items: flex-start;' class="row">
+				<view class="left">提示</view>
+				<view class="right">
+					{{detailData.tips?detailData.tips:'自动获取，不可编辑'}}
+				</view>
+			</view>
 			<view class="row">
 				<view class="left">货名</view>
 				<view class="right">{{detailData.goodsName}}</view>
 			</view>
-			<view class="row" style="text-align: right;">
-				<view class="left">车牌号</view>
-				<input v-model='detailData.carNumber' class="right-bottom" placeholder="输入车牌号"></input>
-			</view>
+			
 			<view class="row">
 				<view class="left">仓位号</view>
 				<view @click='show1=true'>{{detailData.binNumber?detailData.binNumber:'请选择仓位号'}}</view>
@@ -36,6 +56,76 @@
 				<view class="left">出库类型</view>
 				<view class="right">{{issueTypeVal}}></view>
 			</view>
+			<view class="row ">
+				<view class="left">出库日期</view>
+				<view class="right">
+					<view @click='show5=true'>{{detailData.inOutDate?detailData.inOutDate:'请选择出库日期'}}</view>
+					<u-picker  @confirm='inOutDatepicker($event)' :params="params" v-model="show5"
+						mode="time">
+					</u-picker>
+				</view>
+			</view>
+			<view class="row ">
+				<view class="left">运输方式</view>
+				<view class="right">
+					<view @click='show7=true'>{{detailData.outType?detailData.outType:'请选择运输方式'}}</view>
+					<u-picker :range="multiSelector" range-key="name" @confirm='outtypepicker($event)' v-model="show7"
+						mode="selector">
+					</u-picker>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row" style="text-align: right;">
+				<view class="left">车牌号</view>
+				<input v-model='detailData.carNumber' class="right-bottom" placeholder="输入车牌号"></input>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row" style="text-align: right;">
+				<view class="left">箱号-1</view>
+				<view class="right">
+					<input v-model='detailData.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row" style="text-align: right;">
+				<view class="left">封号-1</view>
+				<view class="right">
+					<input v-model='detailData.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row" style="text-align: right;">
+				<view class="left">箱号-2</view>
+				<view class="right">
+					<input v-model='detailData.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row" style="text-align: right;">
+				<view class="left">封号-2</view>
+				<view class="right">
+					<input v-model='detailData.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row" style="text-align: right;">
+				<view class="left">船名</view>
+				<view class="right">
+					<input v-model='detailData.shipName' placeholder="请输入船名" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row" style="text-align: right;">
+				<view class="left">箱号-2</view>
+				<view class="right">
+					<input v-model='detailData.shipNumber' placeholder="请输入航次" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row" style="text-align: right;">
+				<view class="left">车厢号-1</view>
+				<view class="right">
+					<input v-model='detailData.wingNumber' placeholder="请输入车厢号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row" style="text-align: right;">
+				<view class="left">车厢号-2</view>
+				<view class="right">
+					<input v-model='detailData.wingNumberOther' placeholder="请输入车厢号" name="input" type="digit"></input>
+				</view>
+			</view>
 		</view>
 		<div class="content1">
 			<view class="title">
@@ -71,9 +161,33 @@
 				cangId:'',
 				show1:false,
 				show:false,
+				show4:false,
+				show5:false,
+				show7:false,
 				contractNoList: [],
 				positionList:[],
 				binNoList: [],
+				taskNolist:[],
+				params:{year: true,
+					month: true,
+					day: true,},
+				multiSelector: [{
+				            name: '汽运',
+				            value: '0',
+				          },
+				          {
+				            name: '火运',
+				            value: '1',
+				          },
+				          {
+				            name: '集装箱船',
+				            value: '2',
+				          },
+				          {
+				            name: '散船',
+				            value: '3',
+				          },
+				],
 				issueTypeList: [{
 						value: '1',
 						label: '销售出库'
@@ -96,10 +210,93 @@
 		onShow() {},
 		onLoad(options) {
 			this.cangId = options.cangId
+			console.log(options)
 			this.detailData.warehouseName = options.warehouseName
 			this.getWeighingManagement()
 		},
 		methods: {
+			outtypepicker(e){
+				this.detailData.outType=this.multiSelector[e[0]].name
+			},
+			inOutDatepicker(e){
+				this.detailData.inOutDate=e.year+'-'+e.month+'-'+e.day
+				console.log(e)
+			},
+			tasknopicker(e){
+				console.log(e)
+				this.detailData.inOutTaskNo=this.taskNolist[e[0]].inOutTaskNo
+				var data = this.taskNolist[e[0]]
+				if (this.taskNolist[e[0]].contractNo) {
+					this.detailData.contractNo = this.taskNolist[e[0]].contractNo
+				}else {
+					this.detailData.contractNo = this.taskNolist[e[0]].moveTaskNo
+				}
+				for (let i = 0; i < this.contractNoList.length; i++) {
+					
+					if(this.detailData.contractNo==this.contractNoList[i].contractNo){
+						this.detailData.goodsName = this.contractNoList[i].goodsName
+						this.detailData.goodsNameKey = this.contractNoList[i].goodsNameKey
+						this.detailData.grade = this.contractNoList[i].grade
+						this.detailData.inOutType = this.contractNoList[i].inOutType
+						if(this.detailData.inOutType=='销售出库'){
+							this.warehouseTradeCount = '000' + this.warehouseTradeCount
+							this.detailData.qualityNo='XSCK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+							if (!this.contractNoList[i].unitContractPrice) {
+								this.detailData.tips = '买方' + this.contractNoList[i].seller
+							} else {
+								this.detailData.tips ='买方' +this.contractNoList[i].seller +'（ ' + this.contractNoList[i].unitContractPrice +'元/吨）'
+							}
+							
+							this.detailData.inOutTypeKey = 1
+						}else if(this.detailData.inOutType=='移库出库'){
+							this.warehouseTradeCount = '000' + this.warehouseTradeCount
+							this.detailData.qualityNo='YKCK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
+							if (this.contractNoList[i].unitContractPrice) {
+								this.detailData.tips ='入货库' +data.sendWarehouse +' （' +this.contractNoList[i].unitContractPrice +'元/吨）'
+							} else {
+								this.detailData.tips = '入货库' + data.sendWarehouse
+							}
+							this.detailData.inOutTypeKey = 3
+						}else if (this.contractNoList[i].inOutType == '暂存入库') {
+							this.detailData.inOutTypeKey = 4
+						} else if (this.contractNoList[i].inOutType == '贸易服务出库') {
+							this.detailData.inOutTypeKey = 5
+						} else if (this.contractNoList[i].inOutType == '采购出库') {
+							this.detailData.inOutTypeKey = 6
+						}
+						 this.cost = this.contractNoList[i].contractPrice
+						if (this.cost) {
+							this.isGetCost = true
+							this.detailData.cost =this.cost - this.detailData.deductionAmount
+						} else {
+							this.isGetCost = false
+							this.detailData.cost = this.detailData.cost
+						}
+						if (this.contractNoList[i].inOutType == '移库入库') {
+							this.isSelectType = false
+						} else {
+							this.isSelectType = true
+						}
+						if (this.contractNoList[i].priceType == '随行就市') {
+							this.disabled1 = !this.disabled1
+						}
+						if (this.contractNoList[i].deliverType == '1') {
+							this.carstatus = true
+						} else {
+							this.carstatus = false
+						}
+						if (this.contractNoList[i].tranCarInfoList) {
+							this.tranCarInfoList = this.contractNoList[i].tranCarInfoList
+						              // this.carstatus = true
+						}else{
+							this.options2 =[]
+						}
+						this.fleetNameList=this.contractNoList[i].tranCarInfoList1
+					}
+					
+				}
+				console.log(this.gridList)
+			},
 			contractNopicker(e){
 				this.detailData.goodsName=this.contractNoList[e[0]].goodsName
 				this.detailData.contractNo=this.contractNoList[e[0]].contractNo
@@ -108,12 +305,34 @@
 				this.detailData.binNumber=this.positionList[e[0]].binNumber
 			},
 			getWeighingManagement(){
+				console.log(this.cangId)
 					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse',
 					{id: this.cangId}).then(res => {
 						if(res.data.code==200){
 						this.positionList = res.data.data.warehousePositionInfoList
 						}
 					})
+					this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
+						flag: 1,
+						warehouseName:this.detailData.warehouseName
+					}).then(res => {
+						console.log(res)
+						this.taskNolist=res.data.data
+					})
+					this.multiSelector1=[]
+					this.$api.doRequest('get', '/inOutWarehouseTask/getContractNo', {
+						warehouseName:this.detailData.warehouseName
+					}).then(res => {
+						// console.log(res)
+						if(res.data.data.contractManagementInfoList){
+							for (let i = 0; i < res.data.data.contractManagementInfoList.length; i++) {
+								res.data.data.contractMangementInfoList[i].name='自运 （'+
+								res.data.data.contractMangementInfoList[i].contractNo+' '+res.data.data.contractMangementInfoList[i].seller+'）'
+								this.multiSelector1.push(res.data.data.contractManagementInfoList[i])
+							}
+						}
+						// this.taskNolist=res.data.data
+					})
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList',{
 						compId: '',
 						flag:5

pages/erpbusiness/acquisitionInspection/grossWeightDetail.vue

@@ -1,269 +1,272 @@
-<template>
-	<view class="warp">
-		<view class="title">
-			基本信息
-		</view>
-		<view class="content">
-			<view class="row">
-				<view class="left">入库类型</view>
-				<view class="right" v-if='detailData.serviceManagementType==3'>收购入库</view>
-				<view class="right" v-if='detailData.serviceManagementType==1'>贸易入库</view>
-			</view>
-			<view class="row">
-				<view class="left">仓库</view>
-				<view class="right">{{detailData.warehouseName}}</view>
-			</view>
-			<view class="row">
-				<view class="left">编号</view>
-				<view class="right">{{detailData.number}}</view>
-			</view>
-			<view class="row">
-				<view class="left">客户</view>
-				<view class="right">{{detailData.customer}}</view>
-			</view>
-			<view class="row">
-				<view class="left">车牌号</view>
-				<view class="right">{{detailData.carNumber}}</view>
-			</view>
-			<view class="row">
-				<view class="left">仓位号</view>
-				<view class="right">{{detailData.binNumber}}</view>
-			</view>
-			<view class="row">
-				<view class="left">囤位号</view>
-				<view class="right">{{detailData.storageNumber}}</view>
-			</view>
-			<view class="row">
-				<view class="left">货名</view>
-				<view class="right">{{detailData.goodsName}}</view>
-			</view>
-			<view class="row">
-				<view class="left">运输方式</view>
-				<view class="right">{{detailData.outType}}</view>
-			</view>
-			<view class="row">
-				<view class="left">箱号-1</view>
-				<view class="right">{{detailData.qualityInspectionManagement.boxNo}}</view>
-			</view>
-			<view class="row">
-				<view class="left">箱号-2</view>
-				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
-			</view>
-			<view class="row">
-				<view class="left">封号-1</view>
-				<view class="right">{{detailData.qualityInspectionManagement.titleNo}}</view>
-			</view>
-			<view class="row">
-				<view class="left">封号-2</view>
-				<view class="right">{{detailData.qualityInspectionManagement.titleNoOther}}</view>
-			</view>
-			<view class="row row-bottom">
-				<view class="left">毛重（公斤）</view>
-				<input class="right-bottom" placeholder="输入毛重" v-model="detailData.grossWeight"></input>
-			</view>
-		</view>
-		<u-button v-if='tabbar' type="primary" class="submit" @click="submit">提交</u-button>
-		<u-toast ref="uToast" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				tabbar: true,
-				windowHeight: '',
-				detailData: {
-					grossWeight: ''
-				},
-				purchasePriceList: []
-			}
-		},
-		onShow() {
-			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
-				warehouseId: this.detailData.warehouseId
-			}).then(res => {
-				if (res.data.code == 200) {
-					this.purchasePriceList = res.data.data
-				}
-			})
-		},
-		onLoad(options) {
-			uni.onWindowResize((res) => {
-				if (res.size.windowHeight < this.windowHeight) {
-					this.tabbar = false
-				} else {
-					this.tabbar = true
-				}
-			})
-			this.detailData = JSON.parse(options.detailData)
-			console.log(this.detailData)
-			uni.getSystemInfo({
-				success: (res) => {
-					this.windowHeight = res.windowHeight;
-					// console.log(res)
-					this.system = res.system // ios
-					this.platform = res.platform // 14.3
-				}
-			})
-			console.log(this.detailData)
-		},
-		methods: {
-			submit() {
-			
-				let that = this
-				uni.showModal({
-					content: "确定提交检斤信息?",
-					success: function(res) {
-						if (res.confirm) {
-		
-							if(that.detailData.serviceManagementType==1){
-								that.$api.doRequest('post',
-									'/weighingManagement/api/editGrossWeight', that
-									.detailData).then(res => {
-								that.detailData.inOutFlag = 2
-								that.detailData.statusFlag=1
-								that.detailData.grossWeight=that.detailData.grossWeight/1000
-								that.detailData.warehouseInOutDetail={
-									id:that.detailData.inOutDetailId,
-									grade:that.detailData.qualityInspectionManagement.grade,
-									reGrade:that.detailData.qualityInspectionManagement.reGrade,
-									imperfectGrain:that.detailData.qualityInspectionManagement.imperfectGrain,
-									reImperfectGrain:that.detailData.qualityInspectionManagement.reImperfectGrain,
-									impurity:that.detailData.qualityInspectionManagement.impurity,
-									reImpurity:that.detailData.qualityInspectionManagement.reImpurity,
-									jiaorenli:that.detailData.qualityInspectionManagement.jiaorenli,
-									reJiaorenli:that.detailData.qualityInspectionManagement.reJiaorenli,
-									bulkDensity:that.detailData.qualityInspectionManagement.bulkDensity,
-									reBulkDensity:that.detailData.qualityInspectionManagement.reBulkDensity,
-									mildewGrain:that.detailData.qualityInspectionManagement.mildewGrain,
-									reMildewGrain:that.detailData.qualityInspectionManagement.reMildewGrain,
-								},
-								that.$api.doRequest('post',
-									'/warehouseInOutInfo/InOutWarehouse', that
-									.detailData).then(res => {
-										if (res.data.code == 200) {
-											that.$refs.uToast.show({
-												title: '提交成功',
-												type: 'success'
-											})
-											uni.navigateBack({})
-										} else {
-											that.$refs.uToast.show({
-												title: '提交失败',
-												type: 'error',
-											})
-										}
-										})
-									})
-							}else{
-								that.$api.doRequest('get', '/paymentManagement/cumulant', {
-									// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
-									compId: uni.getStorageSync('pcUserInfo').compId,
-									customerNumberCard: that.detailData.customerNumberCard,
-									goodsName: that.detailData.goodsName,
-								}).then(res => {
-									if (res.data.code == 200) {
-										for (let i = 0; i < that.purchasePriceList.length; i++) {
-											if (
-												that.detailData.goodsName == that.purchasePriceList[i]
-												.goodsName
-											) {
-												
-												let count = (that.purchasePriceList[i].saleLimit -
-													res.data.data / 1000).toFixed(2)
-												if (Number(count) - that.detailData.grossWeight / 1000 <= 0) {
-													that.$api.msg('该客户累计销售' + that.detailData.goodsName + (
-															res.data.data / 1000).toFixed(2) +
-														'吨，还可售粮' +
-														count + '吨', )
-								
-												} else {
-													that.$api.doRequest('post',
-														'/weighingManagement/api/editGrossWeight', that
-														.detailData).then(res => {
-															if (res.data.code == 200) {
-																that.$refs.uToast.show({
-																	title: '提交成功',
-																	type: 'success'
-																})
-																uni.navigateBack({})
-															} else {
-																that.$refs.uToast.show({
-																	title: '提交失败',
-																	type: 'error',
-																})
-															}
-													})
-								
-												}
-											}
-										}
-									}
-								})
-							}
-							
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	uni-page-body {
-		overflow: hidden;
-	}
-
-	.warp {
-		background: white;
-		margin: 20rpx;
-		padding: 20rpx;
-		border-radius: 20rpx;
-
-		.title {
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-		}
-	}
-
-	.content {
-		margin-bottom:50px;
-		.row {
-			display: flex;
-			justify-content: space-between;
-			padding: 31rpx 0;
-
-			.right {
-				font-size: 28rpx;
-				font-weight: 600;
-				color: #333333;
-			}
-		}
-
-		.row-bottom {
-			border: 0;
-
-			.right-bottom {
-				width: 300rpx;
-				text-align: right;
-				font-size: 28rpx;
-				font-weight: 600;
-				color: #333333;
-			}
-		}
-	}
-
-	.submit {
-		position: fixed;
-		bottom: 40rpx;
-		width: 90%;
-		background: #22C572;
-		border-radius: 50rpx;
-
-	}
-</style>
+<template>
+	<view class="warp">
+		<view class="title">
+			基本信息
+		</view>
+		<view class="content">
+			<view class="row">
+				<view class="left">入库类型</view>
+				<view class="right" v-if='detailData.serviceManagementType==3'>收购入库</view>
+				<view class="right" v-if='detailData.serviceManagementType==1'>贸易入库</view>
+			</view>
+			<view class="row">
+				<view class="left">仓库</view>
+				<view class="right">{{detailData.warehouseName}}</view>
+			</view>
+			<view class="row">
+				<view class="left">编号</view>
+				<view class="right">{{detailData.number}}</view>
+			</view>
+			<view class="row">
+				<view class="left">客户</view>
+				<view class="right">{{detailData.customer}}</view>
+			</view>
+			<view class="row">
+				<view class="left">车牌号</view>
+				<view class="right">{{detailData.carNumber}}</view>
+			</view>
+			<view class="row">
+				<view class="left">仓位号</view>
+				<view class="right">{{detailData.binNumber}}</view>
+			</view>
+			<view class="row">
+				<view class="left">囤位号</view>
+				<view class="right">{{detailData.storageNumber}}</view>
+			</view>
+			<view class="row">
+				<view class="left">货名</view>
+				<view class="right">{{detailData.goodsName}}</view>
+			</view>
+			<view class="row">
+				<view class="left">运输方式</view>
+				<view class="right">{{detailData.outType}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">箱号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNo}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">箱号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
+			</view>
+			<view  v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"'class="row">
+				<view class="left">封号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNo}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">封号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNoOther}}</view>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">毛重（公斤）</view>
+				<input class="right-bottom" placeholder="输入毛重" v-model="detailData.grossWeight"></input>
+			</view>
+		</view>
+		<u-button v-if='tabbar' type="primary" class="submit" @click="submit">提交</u-button>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tabbar: true,
+				windowHeight: '',
+				detailData: {
+					grossWeight: ''
+				},
+				purchasePriceList: []
+			}
+		},
+		onShow() {
+			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+				warehouseId: this.detailData.warehouseId
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.purchasePriceList = res.data.data
+				}
+			})
+		},
+		onLoad(options) {
+			uni.onWindowResize((res) => {
+				if (res.size.windowHeight < this.windowHeight) {
+					this.tabbar = false
+				} else {
+					this.tabbar = true
+				}
+			})
+			this.detailData = JSON.parse(options.detailData)
+			console.log(this.detailData)
+			uni.getSystemInfo({
+				success: (res) => {
+					this.windowHeight = res.windowHeight;
+					// console.log(res)
+					this.system = res.system // ios
+					this.platform = res.platform // 14.3
+				}
+			})
+			console.log(this.detailData)
+		},
+		methods: {
+			submit() {
+			if(!this.detailData.grossWeight){
+				this.$refs.uToast.show({
					title: '请输入毛重',
					type: 'error'})
+					return
+			}
+				let that = this
+				uni.showModal({
+					content: "确定提交检斤信息?",
+					success: function(res) {
+						if (res.confirm) {
+		
+							if(that.detailData.serviceManagementType==1){
+								that.$api.doRequest('post',
+									'/weighingManagement/api/editGrossWeight', that
+									.detailData).then(res => {
+								that.detailData.inOutFlag = 2
+								that.detailData.statusFlag=1
+								that.detailData.grossWeight=that.detailData.grossWeight/1000
+								that.detailData.warehouseInOutDetail={
+									id:that.detailData.inOutDetailId,
+									grade:that.detailData.qualityInspectionManagement.grade,
+									reGrade:that.detailData.qualityInspectionManagement.reGrade,
+									imperfectGrain:that.detailData.qualityInspectionManagement.imperfectGrain,
+									reImperfectGrain:that.detailData.qualityInspectionManagement.reImperfectGrain,
+									impurity:that.detailData.qualityInspectionManagement.impurity,
+									reImpurity:that.detailData.qualityInspectionManagement.reImpurity,
+									jiaorenli:that.detailData.qualityInspectionManagement.jiaorenli,
+									reJiaorenli:that.detailData.qualityInspectionManagement.reJiaorenli,
+									bulkDensity:that.detailData.qualityInspectionManagement.bulkDensity,
+									reBulkDensity:that.detailData.qualityInspectionManagement.reBulkDensity,
+									mildewGrain:that.detailData.qualityInspectionManagement.mildewGrain,
+									reMildewGrain:that.detailData.qualityInspectionManagement.reMildewGrain,
+								},
+								that.$api.doRequest('post',
+									'/warehouseInOutInfo/InOutWarehouse', that
+									.detailData).then(res => {
+										if (res.data.code == 200) {
+											that.$refs.uToast.show({
+												title: '提交成功',
+												type: 'success'
+											})
+											uni.navigateBack({})
+										} else {
+											that.$refs.uToast.show({
+												title: '提交失败',
+												type: 'error',
+											})
+										}
+										})
+									})
+							}else{
+								that.$api.doRequest('get', '/paymentManagement/cumulant', {
+									// compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+									compId: uni.getStorageSync('pcUserInfo').compId,
+									customerNumberCard: that.detailData.customerNumberCard,
+									goodsName: that.detailData.goodsName,
+								}).then(res => {
+									if (res.data.code == 200) {
+										for (let i = 0; i < that.purchasePriceList.length; i++) {
+											if (
+												that.detailData.goodsName == that.purchasePriceList[i]
+												.goodsName
+											) {
+												
+												let count = (that.purchasePriceList[i].saleLimit -
+													res.data.data / 1000).toFixed(2)
+												if (Number(count) - that.detailData.grossWeight / 1000 <= 0) {
+													that.$api.msg('该客户累计销售' + that.detailData.goodsName + (
+															res.data.data / 1000).toFixed(2) +
+														'吨，还可售粮' +
+														count + '吨', )
+								
+												} else {
+													that.$api.doRequest('post',
+														'/weighingManagement/api/editGrossWeight', that
+														.detailData).then(res => {
+															if (res.data.code == 200) {
+																that.$refs.uToast.show({
+																	title: '提交成功',
+																	type: 'success'
+																})
+																uni.navigateBack({})
+															} else {
+																that.$refs.uToast.show({
+																	title: '提交失败',
+																	type: 'error',
+																})
+															}
+													})
+								
+												}
+											}
+										}
+									}
+								})
+							}
+							
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+
+	.warp {
+		background: white;
+		margin: 20rpx;
+		padding: 20rpx;
+		border-radius: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+
+	.content {
+		margin-bottom:50px;
+		.row {
+			display: flex;
+			justify-content: space-between;
+			padding: 31rpx 0;
+
+			.right {
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+		}
+
+		.row-bottom {
+			border: 0;
+
+			.right-bottom {
+				width: 300rpx;
+				text-align: right;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+		}
+	}
+
+	.submit {
+		position: fixed;
+		bottom: 40rpx;
+		width: 90%;
+		background: #22C572;
+		border-radius: 50rpx;
+
+	}
+</style>

pages/erpbusiness/acquisitionInspection/grossWeightDetail1.vue

@@ -36,6 +36,54 @@
 				<view class="left">货名</view>
 				<view class="right">{{detailData.goodsName}}</view>
 			</view>
+			<view class="row">
+				<view class="left">出库日期</view>
+				<view class="right">{{detailData.inOutDate}}</view>
+			</view>
+			<view class="row">
+				<view class="left">运输方式</view>
+				<view class="right">{{detailData.outType}}</view>
+			</view>
+			<view class="row">
+				<view class="left">出库日期</view>
+				<view class="right">{{detailData.inOutDate}}</view>
+			</view>
+			<view class="row">
+				<view class="left">运输方式</view>
+				<view class="right">{{detailData.outType}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">箱号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNo}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">封号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNo}}</view>
+			</view>
+			<view  v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"'class="row">
+				<view class="left">箱号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">封号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNoOther}}</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row">
+				<view class="left">船名</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipName}}</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row">
+				<view class="left">航次</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row">
+				<view class="left">车厢号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row">
+				<view class="left">车厢号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumberOther}}</view>
+			</view>
 		</view>
 		<view class="content1">
 			<view class="title">

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -36,22 +36,38 @@
 				<view class="left">运输方式</view>
 				<view class="right">{{detailData.outType}}</view>
 			</view>
-			<view class="row">
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
 				<view class="left">箱号-1</view>
 				<view class="right">{{detailData.qualityInspectionManagement.boxNo}}</view>
 			</view>
-			<view class="row">
-				<view class="left">箱号-2</view>
-				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
-			</view>
-			<view class="row">
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
 				<view class="left">封号-1</view>
 				<view class="right">{{detailData.qualityInspectionManagement.titleNo}}</view>
 			</view>
-			<view class="row">
+			<view  v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"'class="row">
+				<view class="left">箱号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row  row-bottom">
 				<view class="left">封号-2</view>
 				<view class="right">{{detailData.qualityInspectionManagement.titleNoOther}}</view>
 			</view>
+			<view v-if='detailData.outType=="散船"' class="row">
+				<view class="left">船名</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipName}}</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">航次</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row">
+				<view class="left">车厢号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumberOther}}</view>
+			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（公斤）</view>
 				<view class="right">{{detailData.grossWeight}}</view>

pages/erpbusiness/acquisitionInspection/tareDetail1.vue

@@ -30,10 +30,46 @@
 				<view class="left">囤位号</view>
 				<input class="right-bottom" v-model='detailData.storageNumber' placeholder="输入囤位号"></input>
 			</view>
-			<view class="row row-bottom" @click="issueTypeClick">
+			<view class="row" @click="issueTypeClick">
 				<view class="left">出库类型</view>
 				<view class="right">{{issueTypeVal}}></view>
 			</view>
+			<view class="row">
+				<view class="left">运输方式</view>
+				<view class="right">{{detailData.outType}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">箱号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNo}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row">
+				<view class="left">封号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNo}}</view>
+			</view>
+			<view  v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"'class="row">
+				<view class="left">箱号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.boxNoOther}}</view>
+			</view>
+			<view v-if='detailData.outType=="汽运"||detailData.outType=="集装箱船"' class="row  row-bottom">
+				<view class="left">封号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.titleNoOther}}</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row">
+				<view class="left">船名</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipName}}</view>
+			</view>
+			<view v-if='detailData.outType=="散船"' class="row row-bottom">
+				<view class="left">航次</view>
+				<view class="right">{{detailData.qualityInspectionManagement.shipNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row">
+				<view class="left">车厢号-1</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumber}}</view>
+			</view>
+			<view v-if='detailData.outType=="火运"' class="row row-bottom">
+				<view class="left">车厢号-2</view>
+				<view class="right">{{detailData.qualityInspectionManagement.wingNumberOther}}</view>
+			</view>
 		</view>
 		<div class="content1">
 			<view class="title">

pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -162,6 +162,7 @@
 				return false
 			},
 			add() {
+				console.log(this.warehouseName)
 				uni.navigateTo({
 					url: '/pages/erpbusiness/acquisitionInspection/add_check_the_weight?cangId=' + this.cangId +
 						'&warehouseName=' + this.warehouseName

pages/erpbusiness/examine_quality_testing.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class='wrap'>
 			<view class='title_b'>基本信息</view>
-			<view class="c-row ">
+			<view v-if='gridList.managementType==1' class="c-row ">
 				<view class="title">入库类型</view>
 				<view v-if='gridList.serviceManagementType==1' class="con-list">
 					贸易入库
@@ -11,13 +11,19 @@
 					收购入库
 				</view>
 			</view>
+			<view v-if='gridList.managementType==3' class="c-row ">
+				<view class="title">出库类型</view>
+				<view class="con-list">
+				{{gridList.inOutType}}
+				</view>
+			</view>
 			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view v-if='gridList.serviceManagementType==1' class="c-row ">
+			<view v-if='gridList.serviceManagementType==1' class="c-row">
 				<view class="title">任务编号</view>
 				<view class="con-list">
 					{{gridList.inOutTaskNo}}
@@ -36,7 +42,7 @@
 					{{gridList.contractNo}}
 				</view>
 			</view>
-			<view  v-if='gridList.serviceManagementType==3' class="c-row ">
+			<view  v-if='gridList.serviceManagementType==3' class="c-row">
 				<view class="title">客户</view>
 				<view v-if='gridList.customerName' class="con-list">
 					{{gridList.customerName}}({{gridList.customerPhone}})
@@ -104,6 +110,7 @@
 					{{gridList.type}}
 				</view>
 			</view>
+			
 			<view v-if="gridList.type == '潮粮'" class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
@@ -116,6 +123,43 @@
 					{{gridList.dryGrainPrice}}
 				</view>
 			</view>
+			<view class="c-row ">
+				<view class="title">运输方式</view>
+				<view class="con-list">
+					<view>{{gridList.outType}}</view>
+				</view>
+			</view>
+			
+			<view class="c-row ">
+				<view class="title">车队</view>
+				<view class="con-list">
+					<view>{{gridList.fleet}}</view>
+				</view>
+			</view>
+			<view v-if="gridList.outType=='汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">箱号-1</view>
+				<view class="con-list">
+					{{gridList.boxNo}}
+				</view>
+			</view>
+			<view v-if="gridList.outType== '汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">封号-1</view>
+				<view class="con-list">
+					{{gridList.titleNo}}
+				</view>
+			</view>
+			<view v-if="gridList.outType=='汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">箱号-2</view>
+				<view class="con-list">
+					{{gridList.boxNoOther}}
+				</view>
+			</view>
+			<view v-if="gridList.outType== '汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">封号-2</view>
+				<view class="con-list">
+					{{gridList.titleNoOther}}
+				</view>
+			</view>
 			<view class="c-row-fj" v-if="statusShow == '已复检'">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="暂无复检备注信息!" maxlength="300" disabled ></textarea>

pages/erpbusiness/out_quality_testing.vue

@@ -41,6 +41,55 @@
 					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号" name="input"></input>
 				</view>
 			</view>
+			<view class="c-row">
+				<view class="title">出库类型</view>
+				<view class="con-list">
+					{{gridList.inOutType}}
+				</view>
+			</view>
+			<view class="c-row ">
+				<view class="title">出库日期</view>
+				<view class="con-list">
+					<view>{{gridList.inOutDate}}</view>
+				</view>
+			</view>
+			<view class="c-row ">
+				<view class="title">运输方式</view>
+				<view class="con-list">
+					<view>{{gridList.outType}}</view>
+				</view>
+			</view>
+
+			<view class="c-row ">
+				<view class="title">车队</view>
+				<view class="con-list">
+					<view>{{gridList.fleet}}</view>
+				</view>
+			</view>
+			<view v-if="gridList.outType=='汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">箱号-1</view>
+				<view class="con-list">
+					{{gridList.boxNo}}
+				</view>
+			</view>
+			<view v-if="gridList.outType== '汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">封号-1</view>
+				<view class="con-list">
+					{{gridList.titleNo}}
+				</view>
+			</view>
+			<view v-if="gridList.outType=='汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">箱号-2</view>
+				<view class="con-list">
+					{{gridList.boxNoOther}}
+				</view>
+			</view>
+			<view v-if="gridList.outType== '汽运'||gridList.outType == '集装箱船'" class="c-row ">
+				<view class="title">封号-2</view>
+				<view class="con-list">
+					{{gridList.titleNoOther}}
+				</view>
+			</view>
 		</view>
 		<view style='margin-bottom:300rpx;'>
 			<view class='wrap'>

pages/task/audit/acquisition_settlement_details.vue

@@ -8,18 +8,19 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode=""
-							v-if="status == '审核中' || status == '待决策人审核'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
+						<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
+						<image src="../../../static/img/daishenhe.png" mode="" style="height: 40rpx;"></image>
+						<!-- 待审核 -->
 					</view>
-					<view class="infoText">{{status}}</view>
+					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
+					<view class="infoText">待决策人审核</view>
 				</view>
 				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
-		<view class='content1'>
+		<!-- 	<view class='content1'>
 			<view class='row content-item'>
-				<view class="left" style="color: #878C9C;">仓库</view>
+				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">{{warehouseName}}</view>
 			</view>
 			<view class="content-item">
@@ -35,32 +36,199 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class="content1">
+			<!-- 	<view class="title">
+				销售外勤 张三
+			</view> -->
+			<view class="row">
+				<view class="left">请款金额（元）</view>
+				<view class="right">{{auditInfo.amountIngPayableTotal}}</view>
+			</view>
+			<view class="row">
+				<view class="left">大写</view>
+				<view class="right">{{auditInfo.amountIngPayableTotal1}}</view>
+			</view>
+			<view class="row">
+				<view class="left">车数（辆）</view>
+				<view class="right">{{auditInfo.carTotal}}</view>
+			</view>
+			<view class="row">
+				<view class="left">合计重量（吨）</view>
+				<view class="right">{{auditInfo.netWeightTotal}}</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">平均单价（元/吨）</view>
+				<view class="right">{{auditInfo.averageUnitPrice}}</view>
+			</view>
+
+
+			<!-- <view class="row row-bottom">
+				<view class="left">水分（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+					placeholder="输入水分占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">容重（克/升）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
+					placeholder="输入容重"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">热损伤（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
+					placeholder="输入热损伤占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">杂质（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
+					placeholder="输入杂质占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">霉变粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+					placeholder="输入霉变粒占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">不完善粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
+					placeholder="输入不完善粒占比"></input>
+			</view> -->
 		</view>
-		<u-toast ref="uToast" />
-		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click='fanHui' type="success" class="btn2">返回</u-button>
+		<view class="content1">
+			<view class="row">
+				<view class="left titlerow">平均指标</view>
+			</view>
+			<view class="row">
+				<view class="left">容重（%）</view>
+				<view class="right">{{auditInfo.bulkDensityTotal}}</view>
+			</view>
+
+			<view class="row">
+				<view class="left">水分（%）</view>
+				<view class="right">{{auditInfo.waterContentTotal}}</view>
+			</view>
+
+			<view class="row">
+				<view class="left">杂质（%）</view>
+				<view class="right">{{auditInfo.impurityTotal}}</view>
+			</view>
+
+			<view class="row">
+				<view class="left">热损伤（%）</view>
+				<view class="right">{{auditInfo.jiaorenliTotal}}</view>
+			</view>
+			<view class="row">
+				<view class="left">霉变粒（%）</view>
+				<view class="right">{{auditInfo.mildewGrainTotal}}</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">不完善粒（%）</view>
+				<view class="right">{{auditInfo.imperfectGrainTotal}}</view>
+			</view>
+		</view>
+		<view class="content1" v-if="url && url != 'ng'">
+			<view class="title ">
+				附件
+			</view>
+			<view class="file" @click="openXls">
+				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
+				<text class="text_css">明细.xls</text>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title row">
+				流程
+			</view>
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
+						</view>
+						<view class="item2">
+							<view class="name">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							</view>
+							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
+						</view>
+					</view>
+					<view class="right">
+						{{item.updateDate}}
+					</view>
+				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+			</view>
+
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
+				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
+			</view>
 		</view>
+		<u-toast ref="uToast" />
+		<!-- <view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='pass' type="success" class="btn2">通过</u-button>
+		</view> -->
 	</view>
 </template>
 
 <script>
+	import helper from '@/common/helper.js';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				src: '../../../static/img/myimg/LiangShang@2x.png',
+				isSHowBtn: true,
+				height: 200,
+				autoHeight: true,
+				border: false,
+				title: '',
+				show: false,
+				auditMind: '',
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
 				List: [],
 				status: "",
-				updateDate:"",
-				warehouseName:"",
+				updateDate: "",
+				warehouseName: "",
+				everyCheck: '',
+				auditInfo: {},
+				id: "",
+				auditList: [],
+				url: "11",
+			}
+		},
+		onBackPress(e) {
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
+			this.vesselId = options.vesselId
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
 		},
 		onShow(options) {
 			this.getList()
@@ -69,32 +237,244 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			openXls() {
+				if (this.url && this.url != "ng") {
+					uni.downloadFile({
+						url: this.url,
+						success: function(res) {
+							var filePath = res.tempFilePath;
+							uni.openDocument({
+								filePath: filePath,
+								showMenu: true,
+								success: function(res) {
+									console.log('打开文档成功');
+								}
+							});
+						}
+					});
+				}
+			},
 			getList() {
-				//查仓库名
-				this.$api.doRequest('get', '/paymentManagement/getInfo', {
-					id: this.id
-				}).then(res => {
-					if (res.data.code == 200) {
-						this.status = res.data.data.approveStatus
-						this.updateDate = res.data.data.updateDate
-						this.warehouseName = res.data.data.warehouseName
-						this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
-							currentPage: this.currentPage,
-							pageSize: this.pageSize,
-							warehouseName: res.data.data.warehouseName,
-							managementType: 1
-						}).then(res1 => {
-							if (res1.data.code == 200) {
-								this.List = res1.data.data.records
-							}
-						})
+				uni.showLoading({
+					title: "加载中...",
+					mask: true
+				})
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+					currentPage: 1,
+					pageSize: 100,
+					searchType: '1', //searchType:1待审核
+					warehouseName: this.vesselId,
+					managementType: 1
+				}).then(res1 => {
+					uni.hideLoading()
+					if (res1.data.code == 200) {
+						this.List = res1.data.data.records
+					}
+				})
+				// this.$api.doRequest('get', '/paymentManagement/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		uni.showLoading({
+				// 			title: "加载中...",
+				// 			mask: true
+				// 		})
+
+				// 	}
+				// })
+				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
+					warehouseName: this.vesselId,
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.url = res1.data.data
 					}
 				})
+				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
+					warehouseName: this.vesselId,
+					searchType: 1
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.auditInfo = res1.data.data
+						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
+							.amountIngPayableTotal)
+					}
+				})
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'PAYMENT-MANAGEMENT-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.updateDate = res1.data.data[0].updateDate
+					this.$api.doRequest('get', '/commonUser/getHis', {
+						workflowId: res1.data.data[0].id,
+						businessKey: this.id
+					}).then(response => {
+						// uni.hideLoading()
+						this.auditList = response.data.data
 
+					})
+				})
 			},
-			fanHui(){
-				uni.navigateBack()
-			}
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			//驳回
+			// rejectSubmit() {
+			// 	if (!this.auditMind) {
+			// 		this.$api.msg('驳回原因不能为空！')
+			// 	} else {
+			// 		var that = this
+			// 		that.show = false
+			// 		if (this.List.length > 0) {
+			// 			uni.showModal({
+			// 				content: "确定驳回付款申请？",
+			// 				showCancel: true,
+			// 				confirmText: '确定',
+			// 				success: function(res) {
+			// 					if (res.confirm) {
+			// 						that.audit(that.List[0], 0, false, '', '')
+			// 					}
+			// 				}
+			// 			})
+			// 		}
+			// 	}
+			// },
+			//审核确定
+			passSubmit() {
+				var that = this
+				that.show = false
+				if (this.title == '驳回原因（驳回）') {
+					// this.rejectSubmit()
+					if (!that.auditMind) {
+						this.$api.msg('驳回原因不能为空！')
+					} else {
+						uni.showModal({
+							content: "确定驳回付款申请？",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									uni.showLoading({
+										title: "审核中...",
+										mask: true
+									})
+									var count = 0
+									for (let num = 0; num < that.List.length; num++) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											taskId: that.List[num].taskId,
+											approved: false,
+											auditMind: that.auditMind ? that.auditMind : "",
+											needReapply: true
+										}).then(res => {
+											count++
+											if (count == that.List.length) {
+												uni.hideLoading()
+												that.$api.msg('审核成功！')
+												setTimeout(function() {
+													uni.navigateBack();
+												}, 2000);
+											}
+										})
+									}
+								}
+							}
+						})
+					}
+				} else {
+					var that = this
+					this.show = false
+					uni.showModal({
+						content: "确定通过付款申请？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								uni.showLoading({
+									title: "审核中...",
+									mask: true
+								})
+								for (let num = 0; num < that.List.length; num++) {
+									var tmp = 0
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										taskId: that.List[num].taskId,
+										approved: true,
+										auditMind: that.auditMind ? that.auditMind : "",
+										needReapply: false
+									}).then(res => {
+										tmp++
+										if (tmp == that.List.length) {
+											uni.hideLoading()
+											that.$api.msg('审核成功！')
+											setTimeout(function() {
+												uni.navigateBack();
+											}, 2000);
+										}
+									})
+								}
+							}
+						}
+					})
+				}
+			},
+			// audit(list, index, status, status2, reason) {
+			// 	uni.showLoading({
+			// 		title: "审核中"
+			// 	})
+			// 	if (this.List.length > 0) {
+			// 		if (status == true && list.status == "已驳回") {
+			// 			this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+			// 				compId: "2710b21efc1e4393930c5dc800010dc4",
+			// 				id: list.id
+			// 			}).then(res => {
+			// 				if (res.data.code == 200) {
+			// 					this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 				}
+			// 			})
+			// 		} else {
+			// 			for (var i = 0; i < this.List.length; i++) {
+			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 					taskId: this.List[i].taskId,
+			// 					approved: status,
+			// 					auditMind: this.auditMind ? this.auditMind : "",
+			// 					needReapply: status2 ? true : false
+			// 				}).then(res => {
+			// 					if (res.data.code == 200) {
+			// 						uni.hideLoading()
+			// 						// this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 						this.$api.msg('通过成功')
+			// 					}else{
+			// 						uni.hideLoading()
+			// 						this.$api.msg('审核失败')
+			// 					}
+			// 				})
+			// 			}
+
+			// 		}
+			// 	} else {
+			// 		if (status == true) {
+			// 			this.$api.msg('通过成功')
+			// 		} else if (status == false) {
+			// 			this.$api.msg('驳回成功')
+			// 		}
+			// 		let that = this
+			// 		setTimeout(function() {
+
+			// 			if (that.everyCheck) {
+			// 				helper.setAudit(that.list)
+			// 			} else {
+			// 				uni.navigateBack()
+			// 			}
+			// 			uni.hideLoading()
+			// 		}, 1000);
+			// 	}
+			// },
 		}
 	}
 </script>
@@ -102,44 +482,46 @@
 <style scoped lang="scss">
 	.warp {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 240rpx 20rpx;
+		padding: 20rpx 20rpx 20rpx 20rpx;
 	}
 
 	.content1 {
+		font-size: 28rpx;
+		color: #333333;
 		margin-top: 30rpx;
+		padding: 20rpx;
+		// .content-item {
+		border-radius: 20rpx;
+		background: white;
+		// 	padding: 40rpx 20rpx;
+		// 	margin-bottom: 30rpx;
+		// }
 
-		.content-item {
-			border-radius: 20rpx;
-			background: white;
-			padding: 40rpx 20rpx;
-			margin-bottom: 30rpx;
-		}
+		// .title {
+		// 	font-size: 32rpx;
+		// 	font-weight: 600;
+		// 	color: #333333;
+		// 	margin: 30rpx 0;
+		// }
 
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333333;
-			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;
-		}
+		// .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: 20rpx 0;
 
 			.right,
 			input {
@@ -147,6 +529,85 @@
 				// color: #333333;
 			}
 		}
+
+		.img_css {
+			width: 50rpx;
+			height: 50rpx;
+		}
+
+		.file {
+			display: flex;
+			align-items: center;
+			margin: 30rpx 0 0 20rpx;
+
+			.text_css {
+				font-size: 30rpx;
+				margin-left: 20rpx;
+			}
+		}
+	}
+
+	.title {
+		font-size: 34rpx;
+		font-weight: 700;
+		// margin-bottom: 20rpx;
+		height: 70rpx;
+		border-bottom: 2rpx solid #EEEEEE;
+	}
+
+	.titlerow {
+		font-size: 34rpx;
+		font-weight: 700;
+		// margin-bottom: 20rpx;
+		// height: 70rpx;
+		// border-bottom: 2rpx solid #EEEEEE;
+	}
+
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				.item2 {
+					margin-left: 20rpx;
+
+					.name {
+						font-size: 32rpx;
+						font-weight: 800;
+					}
+
+					.status {
+						color: #6CC48C;
+					}
+				}
+			}
+
+			.right {
+				color: #B0B1B5;
+				margin-top: 10px;
+			}
+		}
+
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+
+		}
+
+		.audit {
+			margin-top: 20rpx;
+		}
 	}
 
 	.bottom-btn {
@@ -206,4 +667,89 @@
 			}
 		}
 	}
+
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.4);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: calc(100% - 198rpx);
+			height: 700rpx;
+			border-radius: 20rpx;
+
+			.alert-top {
+				padding: 33rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+			}
+
+			.title {
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.close {
+				position: absolute;
+				right: 33rpx;
+			}
+		}
+	}
+
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+		font-size: 34rpx;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+		color: #AFB3BF;
+	}
+
+	.confirm {
+		right: 0;
+		color: #22C572;
+	}
+
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
 </style>

pages/user/user.vue

@@ -41,8 +41,8 @@
 					<view class="cu-item" style='text-align:center;' v-for="(item,index) in gridList1" :key="index"
 						@click="gridClick(item, index)" v-show="item.show">
 						<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
-							<text v-if='item.num==4&&taskTip&&taskTip<100' class='badge_user'>{{taskTip}}</text>
-							<text v-if='item.num==4&&taskTip&&taskTip>100' class='badge_user'>...</text>
+							<text v-if='item.num==3&&taskTip&&taskTip<100' class='badge_user'>{{taskTip}}</text>
+							<text v-if='item.num==3&&taskTip&&taskTip>100' class='badge_user'>...</text>
 							<image :src="item.src" class="sign1"></image>
 						</view>
 						<text style="color: #333333;">{{item.name}}</text>
@@ -175,82 +175,18 @@
 						url: `/pages/erp/index`,
 						show: true
 					},
-					{
-						num: 1,
-						name: '入库管理',
-						// name: '收购业务',
-						// icon: 'cuIcon-copy',
-						src: '../../static/img/myimg/sg.png',
-						tips: 0,
-						url: `/pages/erpbusiness/index`,
-						show: true
-					},
-					{
-						num: 2,
-						name: '我的票据',
-						// icon: 'cuIcon-news',
-						src: '../../static/img/sign/piaoju@3x.png',
-						tips: 0,
-						url: `/pages/bill/index`,
-						show: true
-					},
-					{
-						num: 3,
-						name: '我的合同',
-						// icon: 'cuIcon-calendar',
-						src: '../../static/img/sign/myContract@2x.png',
-						tips: 0,
-						url: '/pageB/contract/contract',
-						show: true
-					},
-					{
-						num: 4,
-						name: '我的任务',
-						// icon: 'cuIcon-copy',
-						src: '../../static/img/sign/myTask@2x.png',
-						tips: 0,
-						url: '/pages/task/my_task',
-						show: true
-					},
-					{
-						num: 5,
-						name: '联系客服',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/service.png',
-						tips: 0,
-						url: `/pages/erp/contactCustomerService/contactCustomerService`,
-						show: true
-					},
-					{
-						num: 6,
-						name: '数据报表',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/shujubaobiao@2x.png',
-						tips: 0,
-						url: `/pages/user/report`,
-						show: false
-					},
-					{
-						num: 7,
-						name: '库点监控',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kudianjiankong@2x.png',
-						tips: 0,
-						url: `/pages/user/depotMonitoring`,
-						show: false
-					},
-					{
-						num: 8,
-						name: '库点收购',
-						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/kdsg.png',
-						tips: 0,
-						url: `/pages/user/depotAcquisition/depotAcquisition`,
-						show: true
-					},
-					
 					// {
 					// 	num: 1,
+					// 	name: '入库管理',
+					// 	// name: '收购业务',
+					// 	// icon: 'cuIcon-copy',
+					// 	src: '../../static/img/myimg/sg.png',
+					// 	tips: 0,
+					// 	url: `/pages/erpbusiness/index`,
+					// 	show: true
+					// },
+					// {
+					// 	num: 2,
 					// 	name: '我的票据',
 					// 	// icon: 'cuIcon-news',
 					// 	src: '../../static/img/sign/piaoju@3x.png',
@@ -259,7 +195,7 @@
 					// 	show: true
 					// },
 					// {
-					// 	num: 2,
+					// 	num: 3,
 					// 	name: '我的合同',
 					// 	// icon: 'cuIcon-calendar',
 					// 	src: '../../static/img/sign/myContract@2x.png',
@@ -268,7 +204,7 @@
 					// 	show: true
 					// },
 					// {
-					// 	num: 3,
+					// 	num: 4,
 					// 	name: '我的任务',
 					// 	// icon: 'cuIcon-copy',
 					// 	src: '../../static/img/sign/myTask@2x.png',
@@ -277,7 +213,7 @@
 					// 	show: true
 					// },
 					// {
-					// 	num: 4,
+					// 	num: 5,
 					// 	name: '联系客服',
 					// 	// icon: 'cuIcon-edit',
 					// 	src: '../../static/img/sign/service.png',
@@ -286,7 +222,7 @@
 					// 	show: true
 					// },
 					// {
-					// 	num: 5,
+					// 	num: 6,
 					// 	name: '数据报表',
 					// 	// icon: 'cuIcon-edit',
 					// 	src: '../../static/img/sign/shujubaobiao@2x.png',
@@ -295,7 +231,7 @@
 					// 	show: false
 					// },
 					// {
-					// 	num: 6,
+					// 	num: 7,
 					// 	name: '库点监控',
 					// 	// icon: 'cuIcon-edit',
 					// 	src: '../../static/img/sign/kudianjiankong@2x.png',
@@ -304,14 +240,78 @@
 					// 	show: false
 					// },
 					// {
-					// 	num: 7,
+					// 	num: 8,
 					// 	name: '库点收购',
 					// 	// icon: 'cuIcon-edit',
 					// 	src: '../../static/img/sign/kdsg.png',
 					// 	tips: 0,
 					// 	url: `/pages/user/depotAcquisition/depotAcquisition`,
 					// 	show: true
-					// }
+					// },
+					
+					{
+						num: 1,
+						name: '我的票据',
+						// icon: 'cuIcon-news',
+						src: '../../static/img/sign/piaoju@3x.png',
+						tips: 0,
+						url: `/pages/bill/index`,
+						show: true
+					},
+					{
+						num: 2,
+						name: '我的合同',
+						// icon: 'cuIcon-calendar',
+						src: '../../static/img/sign/myContract@2x.png',
+						tips: 0,
+						url: '/pageB/contract/contract',
+						show: true
+					},
+					{
+						num: 3,
+						name: '我的任务',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/sign/myTask@2x.png',
+						tips: 0,
+						url: '/pages/task/my_task',
+						show: true
+					},
+					{
+						num: 4,
+						name: '联系客服',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/service.png',
+						tips: 0,
+						url: `/pages/erp/contactCustomerService/contactCustomerService`,
+						show: true
+					},
+					{
+						num: 5,
+						name: '数据报表',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/shujubaobiao@2x.png',
+						tips: 0,
+						url: `/pages/user/report`,
+						show: false
+					},
+					{
+						num: 6,
+						name: '库点监控',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/kudianjiankong@2x.png',
+						tips: 0,
+						url: `/pages/user/depotMonitoring`,
+						show: false
+					},
+					{
+						num: 7,
+						name: '库点收购',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/sign/kdsg.png',
+						tips: 0,
+						url: `/pages/user/depotAcquisition/depotAcquisition`,
+						show: true
+					}
 				],
 				showTran: true,
 				companyId: 1,