前端

pages.json

@@ -1171,6 +1171,21 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, 
+		{
+			"path": "pages/task/audit/freight_settlement_approvalcopy",
+			"style": {
+				"navigationBarTitleText": "运费结算审核",
+				"enablePullDownRefresh": false
+			}
+		
+		}, {
+			"path": "pages/task/audit/freight_settlement_detailscopy",
+			"style": {
+				"navigationBarTitleText": "运费结算详情",
+				"enablePullDownRefresh": false
+			}
+		
 		}, {
 			"path": "pages/task/audit/acquisition_settlement_approval",
 			"style": {
@@ -1587,6 +1602,7 @@
             {
                 "navigationBarTitleText": "费用明细",
                 "enablePullDownRefresh": false
+				// "onReachBottomDistance": 50
             }
             
         }
@@ -1596,6 +1612,7 @@
             {
                 "navigationBarTitleText": "合同",
                 "enablePullDownRefresh": false
+				// "onReachBottomDistance": 50
             }
             
         }
@@ -1604,7 +1621,8 @@
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "合同利润",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": false,
+				"onReachBottomDistance": 50
             }
             
         }
@@ -1614,6 +1632,7 @@
             {
                 "navigationBarTitleText": "入库明细",
                 "enablePullDownRefresh": false
+				// "onReachBottomDistance": 50
             }
             
         }

pages/dataReport/Inventoryentrydetails.vue

@@ -1,48 +1,36 @@
 <template>
 	<view>
 		<view class='search'>
-			<u-search  placeholder='可按货源查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
+			<u-search v-model='searchKeyWord'  placeholder='可按货源查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
 		</view>
 		
 		<view style='justify-content: space-between;background:#fff;padding:20rpx;' class='flex'>
-			<view @click='show=true'>{{startDate}}-{{endDate}}></view>
-			<view>全部仓库></view>
+			<view @click='show=true'>{{startDate}}~{{endDate}}></view>
+			<view @click='show1=true'>{{warehouse?warehouse:'全部仓库'}}></view>
 		</view>
-		<u-calendar v-model="show" :mode="mode"></u-calendar>
-		<view class='contractwrap' v-for='(item,index) in warehouseList'>
-			<view class='flex contractwrap-title'>
-				<view class='contractNo'>{{item.contractNo}}</view>
-				<view class='contractNo'>{{item.date}}</view>
-			</view>
-			<view style='background:#EFFAF4;border-radius:10rpx;'>
-				<view style='color:#22C572;padding:20rpx;border-bottom:1rpx solid #D8E8E0;' class='flex'>
-					<view>111</view>
-					<view></view>
-					<view></view>
-				</view>
-				<view  class='flex contractwrap-item'>
-					<view class="title">买方</view>
-					<view></view>
-				</view>
-				<view  class='flex contractwrap-item'>
-					<view class="title">卖方</view>
-					<view></view>
+		<u-picker mode="selector" @confirm='confirm' v-model="show1" range-key='warehouseName'  :default-selector="[0]" :range="warehouseList"></u-picker>
+		<u-calendar @change='calendarchange' v-model="show" :mode="mode"></u-calendar>
+		<view>
+			<view class='contractwrap' v-for='(item,index) in warehouseList'>
+				<view class='flex contractwrap-title'>
+					<view class='contractNo'>{{item.contractNo}}</view>
+					<view class='contractNo'>{{item.issuingTime}}</view>
 				</view>
-				<view  class='flex contractwrap-item'>
-					<view class="title">最终完成量（吨）</view>
-					<view></view>
+				<view v-for='(item1,index1) in item.goodsNameList ' style='background:#EFFAF4;border-radius:10rpx;'>
+					<view style='color:#22C572;padding:20rpx;border-bottom:1rpx solid #D8E8E0;justify-content: space-between;' class='flex'>
+						<view style='width:33.3333%;text-align:left;'>{{item1.goodsName}}</view>
+						<view style='width:33.3333%;'>均水{{item1.weightedMoisture}}</view>
+						<view style='width:33.3333%;text-align:right;'>均价{{item1.avgCost}}</view>
+					</view>
+					<view v-for='(item2,index2) in item1.list' class='flex contractwrap-item'>
+						<view class="title">{{item2.goodsSource}}</view>
+						<view>{{item2.inWarehouseWeight}}吨</view>
+					</view>
 				</view>
-				<view  class='flex contractwrap-item'>
-					<view class="title">利润（元）</view>
-					<view></view>
-				</view>
-				<view  class='flex contractwrap-item'>
-					<view class="title">结算日期</view>
-					<view></view>
-				</view>	
+				
 			</view>
-			
 		</view>
+		<view v-if='show2' style='text-align:center;background:#F2F6FA;margin-top:20rpx;'>暂无更多数据</view>
 	</view>
 </template>
 
@@ -54,26 +42,140 @@
 				endDate:'',
 				mode:'range',
 				show:false,
-				warehouseList:[
-					{status:'已完成',
-					contractNo:'HT39854455',
-					costtype:'水费',
-					costmoney:'121111',
-					warehouse:'金信库',
-					name:'张三',
-					date:'2022.11.22 15:32:21'},
-				]
+				show1:false,
+				show2:false,
+				currentPage:1,
+				pageSize:10,
+				baseId:'',
+				warehouse:'',
+				searchKeyWord:'',
+				warehouseList:[],
+				isLoadMore:false
 			}
 		},
 		onLoad() {
-			
+			uni.showLoading({
+					title: "正在加载"
+				})
+			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
+				compId:uni.getStorageSync('pcUserInfo').compId,
+			}).then(res => {
+				if(res.data.code==200){
+					uni.hideLoading()
+					this.warehouseList=res.data.data
+				}else{
+					uni.hideLoading()
+					uni.showToast({
+						title: "系统异常，请联系管理员",
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			})
 		},
 		onShow() {
 			var date=new Date()
 			this.startDate=date.getFullYear()+'-'+((date.getMonth()+1)<10?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+(date.getDate()-1)
 			this.endDate=date.getFullYear()+'-'+((date.getMonth()+1)<10?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+date.getDate()
+			this.getList()
+		},
+		onReachBottom() { //上拉触底函数
+			// if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pageSize += 1
+					this.currentPage += 1
+					this.getList()
+				}
+			// }
 		},
 		methods: {
+			confirm(e){
+				console.log(e)
+				this.warehouse=this.warehouseList[e[0]].warehouseName
+				this.baseId=this.warehouseList[e[0]].id
+				this.getList()
+			},
+			calendarchange(e){
+				this.startDate=e.startDate
+				this.endDate=e.endDate
+				this.getList()
+				console.log(e)
+			},
+			getList(){
+				
+				// warehouseBaseInfo/selectWarehouseSelf
+				
+				this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					searchKeyWord:this.searchKeyWord,
+					compId:uni.getStorageSync('pcUserInfo').compId,
+					baseId:this.baseId,
+					startDate:this.startDate,
+					endDate:this.endDate
+				}).then(res => {
+					if(res.data.code==200){
+						
+						if(res.data.data.records.length>0){
+							this.show2=false
+							for (var i = 0; i < res.data.data.records.length; i++) {
+								var arr=[]
+								if(res.data.data.records[i].warehousingOrderList){
+									var data=res.data.data.records[i].warehousingOrderList
+									for (let q = 0; q < data.length; q++) {
+										if(arr.every((item)=>{return item.goodsName!=data[q].goodsName})){
+											var list=[]
+											list.push(data[q])
+											arr.push({goodsName:data[q].goodsName,list:list})
+										}else{
+											for (var t = 0; t < arr.length; t++) {
+												if(arr[t].goodsName=data[q].goodsName){
+													arr[t].list.push(data[q])
+												}
+											}
+										}
+									}
+								}
+								for (var q = 0; q < arr.length; q++) {
+									var weight=0
+									var weightedMoisture=0
+									var avgCost=0
+									for (var t = 0; t < arr[q].list.length; t++) {
+										weight+=arr[q].list[t].inWarehouseWeight
+										weightedMoisture+=(arr[q].list[t].weightedMoisture*arr[q].list[t].inWarehouseWeight)
+										avgCost+=(arr[q].list[t].avgCost*arr[q].list[t].inWarehouseWeight)
+									}
+									arr[q].weight=weight
+									arr[q].weightedMoisture=(weightedMoisture/weight).toFixed(2)
+									arr[q].avgCost=(avgCost/weight).toFixed(2)
+									
+								}
+								console.log(arr)
+								res.data.data.records[i].goodsNameList=arr
+							}
+							console.log(res.data.data.records)
+							if(this.currentPage==1){
+								this.warehouseList=res.data.data.records
+							}else{
+								this.warehouseList=this.warehouseList.concat(res.data.data.records)
+							}
+						}else{
+							this.show2=true
+							if(this.currentPage==1){
+								this.warehouseList=[]
+							}
+						}
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					
+				})
+			}
 		}
 	}
 </script>

pages/dataReport/breakdownofprofit.vue

@@ -1,43 +1,47 @@
 <template>
 	<view>
-		<view class='search'>
-			<u-search  placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
-		</view>
-		
-		<view style='background:#fff;'>
-			<view class='contracttypewrap'>
-				<view class='item left active'>销售</view>
-				<view class='item'>采购</view>
-				<view class='item'>收购</view>
-				<view class='item'>代收</view>
-				<view class='item right'>代储</view>
-			</view>
-		</view>
-		<view class='contractwrap' v-for='(item,index) in contractList'>
-			<view class='flex contractwrap-title'>
-				<view class='contractNo'>{{item.contractNo}}</view>
+		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+			<view class='search'>
+				<u-search  placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">买方</view>
-				<view></view>
+			<view style='background:#fff;'>
+				<view class='contracttypewrap'>
+					<view :class='searchContractType==1?"active":""' class='item left'>销售</view>
+					<view :class='searchContractType==2?"active":""' class='item'>采购</view>
+					<view :class='searchContractType==5?"active":""' class='item'>收购</view>
+					<view :class='searchContractType==3?"active":""' class='item'>代收</view>
+					<view :class='searchContractType==4?"active":""' class='item right'>代储</view>
+				</view>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">卖方</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">最终完成量（吨）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">利润（元）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">结算日期</view>
-				<view></view>
+		</view>
+		<view style='margin:260rpx 20rpx 20rpx;' v-if='contractList.length>0'>
+			<view class='contractwrap' v-for='(item,index) in contractList'>
+				<view class='flex contractwrap-title'>
+					<view class='contractNo'>{{item.contractNo}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">买方</view>
+					<view>{{item.buyer}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">卖方</view>
+					<view>{{item.seller}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">最终完成量（吨）</view>
+					<view>{{item.finalTradingVolume}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">利润（元）</view>
+					<view>{{item.profit}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">结算日期</view>
+					<view>{{item.settlementDate}}</view>
+				</view>
 			</view>
 		</view>
+		<view v-if='show' :style="{'margin-top':contractList.length==0?'260rpx':'0'}" style='text-align:center;background:#F2F6FA;'>暂无更多数据</view>
 	</view>
 </template>
 
@@ -45,24 +49,118 @@
 	export default {
 		data() {
 			return {
-				contractList:[
-					{status:'已完成',
-					contractNo:'HT39854455',
-					costtype:'水费',
-					costmoney:'121111',
-					warehouse:'金信库',
-					name:'张三',
-					date:'2022.11.22 15:32:21'},
-				]
+				customBar:0,
+				contractType:1,
+				searchContractType:1,
+				currentPage: 1,
+				pageSize: 10,
+				show:false,
+				contractList:[]
 			}
 		},
-		methods: {
+		onLoad(){
 			
+			uni.getSystemInfo({
+			    success: (e) => {
+			      // this.compareVersion(e.SDKVersion, '2.5.0')
+			      let statusBar = 0  //状态栏高度
+			      let customBar = 0  // 状态栏高度 + 导航栏高度  
+			      let navbar = 0 // 自定义标题与胶囊对齐高度
+			      
+			      
+			      // #ifdef MP
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      if (e.platform === 'android') {
+			        this.$store.commit('SET_SYSTEM_IOSANDROID', false)
+			        customBar = e.statusBarHeight + 50
+			      }
+			      // #endif
+			      
+			      
+			      // #ifdef MP-WEIXIN
+			      statusBar = e.statusBarHeight
+			      const custom = wx.getMenuButtonBoundingClientRect()
+			      customBar = custom.bottom + custom.top - e.statusBarHeight
+			 
+			      navbar = (custom.top - e.statusBarHeight) * 2 + custom.height
+			      // #endif
+			 
+			 
+			      // #ifdef MP-ALIPAY
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + e.titleBarHeight
+			      // #endif
+			 
+			 
+			      // #ifdef APP-PLUS
+			      console.log('app-plus', e)
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+			 
+			 
+			      // #ifdef H5
+			      statusBar = 0
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+					this.customBar=customBar
+			    }
+			})
+		},
+		onShow() {
+			this.getList()
+		},
+		onReachBottom() { //上拉触底函数
+			// if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pageSize += 1
+					this.currentPage += 1
+					this.getList()
+				}
+			// }
+		},
+		methods: {
+			getList(){
+				this.$api.doRequest('get', '/contractManagementInfo/selectContractInfo', {
+					searchContractType:this.searchContractType,
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+				}).then(res => {
+					if(res.data.code){
+						uni.hideLoading()
+						if(res.data.data.records.length>0){
+							this.show=false
+							if(this.currentPage==1){
+								this.contractList=res.data.data.records
+							}else{
+								this.contractList=this.contractList.concat(res.data.data.records)
+							}
+						}else{
+							this.show=true
+							if(this.currentPage==1){
+								this.contractList=[]
+							}
+						}
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			}
 		}
 	}
 </script>
 
 <style  lang='scss' scoped>
+	.fixedbox{
+		position:fixed;width:100%;top:0;background:#fff;
+		padding-top:20rpx;
+	}
 .contracttypewrap{
 	display:flex;
 	background:#fff;

pages/dataReport/contractdetails/contractdetails.vue

@@ -1,63 +1,69 @@
 <template>
 	<view>
-		<view class='search'>
-			<u-search  placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
-		</view>
-		
-		<view style='background:#fff;'>
-			<view class='contracttypewrap'>
-				<view class='item left active'>销售</view>
-				<view class='item'>采购</view>
-				<view class='item'>收购</view>
-				<view class='item'>代收</view>
-				<view class='item right'>代储</view>
-			</view>
-		</view>
-		<view class='costwrap'>
-			<view class='item active'>全部</view>
-			<view class='item'>粮款</view>
-			<view class='item'>非粮款</view>
-			<view class='item'>保证金</view>
-		</view>
-		<view class='contractwrap' v-for='(item,index) in contractList'>
-			<view class='flex contractwrap-title'>
-				<view class='contractNo'>{{item.contractNo}}</view>
-				<view v-if='item.status=="已完成"' style='color:#AFB3BF;' class='status'>{{item.status}}</view>
-				<view v-if='item.status=="执行中"' style='color:#22C572;' class='status'>{{item.status}}</view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">买方</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">卖方</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">合同重量（吨）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">合同单价（元/吨）</view>
-				<view></view>
-			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">合同总价（元）</view>
-				<view></view>
+		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+			<view class='search'>
+				<u-search  placeholder='可按合同编号或买方、卖方名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">已付款（元）</view>
-				<view></view>
+			<view style='background:#fff;'>
+				<view class='contracttypewrap'>
+					<view  :class='agreementType=="销售合同"?"active":""' @click='contractclick("销售合同")' class='item left'>销售</view>
+					<view :class='agreementType=="采购合同"?"active":""' @click='contractclick("采购合同")' class='item'>采购</view>
+					<view :class='agreementType=="收购合同"?"active":""' @click='contractclick("收购合同")' class='item'>收购</view>
+					<view :class='agreementType=="代收合同"?"active":""' @click='contractclick("代收合同")' class='item'>代收</view>
+					<view :class='agreementType=="代储合同"?"active":""' @click='contractclick("代储合同")' class='item right'>代储</view>
+				</view>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">已开发票（元）</view>
-				<view></view>
+			<view class='costwrap'>
+				<view :class='searchType==""?"active":""' @click='searchTypeclick("")' class='item'>全部</view>
+				<view :class='searchType==5?"active":""' @click='searchTypeclick(5)' class='item'>待执行</view>
+				<view :class='searchType==6?"active":""' @click='searchTypeclick(6)' class='item'>执行中</view>
+				<view :class='searchType==2?"active":""' @click='searchTypeclick(2)' class='item'>已完成</view>
 			</view>
-			<view  class='flex contractwrap-item'>
-				<view class="title">签订日期</view>
-				<view></view>
+		</view>
+		
+		<view style='margin:260rpx 20rpx 20rpx;' v-if='contractList.length>0'>
+			<view class='contractwrap' v-for='(item,index) in contractList'>
+				<view class='flex contractwrap-title'>
+					<view class='contractNo'>{{item.contractNo}}</view>
+					<view v-if='item.status=="待执行"' style='color:#FE6430;' class='status'>{{item.status}}</view>
+					<view v-if='item.status=="已完成"' style='color:#AFB3BF;' class='status'>{{item.status}}</view>
+					<view v-if='item.status=="执行中"' style='color:#22C572;' class='status'>{{item.status}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">买方</view>
+					<view>{{item.buyer}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">卖方</view>
+					<view>{{item.seller}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">合同重量（吨）</view>
+					<view>{{item.weight}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">合同单价（元/吨）</view>
+					<view>{{item.unitContractPrice?item.unitContractPrice:0}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">合同总价（元）</view>
+					<view>{{item.totalContractPrice?item.totalContractPrice:0}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">已付款（元）</view>
+					<view>{{item.mildewGrain}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">已开发票（元）</view>
+					<view>{{item.invoiced?item.invoiced:0}}</view>
+				</view>
+				<view  class='flex contractwrap-item'>
+					<view class="title">签订日期</view>
+					<view>{{item.signingDate}}</view>
+				</view>
 			</view>
 		</view>
+		<view v-if='show' :style="{'margin-top':contractList.length==0?'260rpx':'0'}" style='text-align:center;background:#F2F6FA;'>暂无更多数据</view>
 	</view>
 </template>
 
@@ -65,24 +71,136 @@
 	export default {
 		data() {
 			return {
-				contractList:[
-					{status:'已完成',
-					contractNo:'HT39854455',
-					costtype:'水费',
-					costmoney:'121111',
-					warehouse:'金信库',
-					name:'张三',
-					date:'2022.11.22 15:32:21'},
-				]
+				customBar:0,
+				// contractType:1,
+				agreementType:'销售合同',
+				currentPage:1,
+				pageSize:10,
+				searchType:'',
+				show:false,
+				contractList:[]
 			}
 		},
-		methods: {
+		onLoad(){
 			
+			uni.getSystemInfo({
+			    success: (e) => {
+			      // this.compareVersion(e.SDKVersion, '2.5.0')
+			      let statusBar = 0  //状态栏高度
+			      let customBar = 0  // 状态栏高度 + 导航栏高度  
+			      let navbar = 0 // 自定义标题与胶囊对齐高度
+			      
+			      
+			      // #ifdef MP
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      if (e.platform === 'android') {
+			        this.$store.commit('SET_SYSTEM_IOSANDROID', false)
+			        customBar = e.statusBarHeight + 50
+			      }
+			      // #endif
+			      
+			      
+			      // #ifdef MP-WEIXIN
+			      statusBar = e.statusBarHeight
+			      const custom = wx.getMenuButtonBoundingClientRect()
+			      customBar = custom.bottom + custom.top - e.statusBarHeight
+			 
+			      navbar = (custom.top - e.statusBarHeight) * 2 + custom.height
+			      // #endif
+			 
+			 
+			      // #ifdef MP-ALIPAY
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + e.titleBarHeight
+			      // #endif
+			 
+			 
+			      // #ifdef APP-PLUS
+			      console.log('app-plus', e)
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+			 
+			 
+			      // #ifdef H5
+			      statusBar = 0
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+					this.customBar=customBar
+			    }
+			})
+		},
+		onShow() {
+			this.getList()
+		},
+		onReachBottom() { //上拉触底函数
+			// if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pageSize += 1
+					this.currentPage += 1
+					this.getList()
+				}
+			// }
+		},
+		methods: {
+			contractclick(status){
+				this.currentPage = 1
+				this.agreementType=status
+				this.getList()
+			},
+			searchTypeclick(status){
+				this.currentPage = 1
+				this.searchType=status
+				this.getList()
+			},
+			getList(){
+				uni.showLoading({
+					title: "正在加载"
+				})
+				this.$api.doRequest('get', '/contractManagementInfo/selectInfo', {
+					compId:uni.getStorageSync('pcUserInfo').compId,
+					goodsType:1,
+					agreementType: this.agreementType,
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					searchType:this.searchType,
+					appFlag:1,
+				}).then(res => {
+					if(res.data.code){
+						uni.hideLoading()
+						if(res.data.data.records.length>0){
+							this.show=false
+							if(this.currentPage==1){
+								this.contractList=res.data.data.records
+							}else{
+								this.contractList=this.contractList.concat(res.data.data.records)
+							}
+						}else{
+							this.show=true
+							if(this.currentPage==1){
+								this.contractList=[]
+							}
+						}
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			}
 		}
 	}
 </script>
 
 <style  lang='scss' scoped>
+	.fixedbox{
+		position:fixed;width:100%;top:0;background:#fff;
+		padding-top:20rpx;
+	}
 .contracttypewrap{
 	display:flex;
 	background:#fff;

pages/dataReport/costbreakdown.vue

@@ -1,50 +1,58 @@
 <template>
 	<view>
-		<view style='background:#fff;'>
-			<view class='purposewrap'>
-				<view class='item left active'>合同费用</view>
-				<view class='item'>库点费用</view>
-				<view class='item right'>经营性费用</view>
+		<view class='fixedbox' :style='{"top":customBar+"px"}'>
+			<view class='search'>
+				<u-search @search='getList' v-model='expenseName' placeholder='可按费用名称查找' search-icon-color='#AFB3BF' bg-color='#F5F6F9' :shape='"round"'  :clearabled="true" :show-action='false'></u-search>
+			</view>
+			<view style='background:#fff;'>
+				<view class='purposewrap'>
+					<view :class='expensesPurpose==1?"active":""' @click='expenseclick(1)' class='item left'>合同费用</view>
+					<view :class='expensesPurpose==3?"active":""' @click='expenseclick(3)' class='item'>库点费用</view>
+					<view :class='expensesPurpose==5?"active":""' @click='expenseclick(5)' class='item right'>经营性费用</view>
+				</view>
+			</view>
+			<view v-if='expensesPurpose==1' class='costwrap'>
+				<view :class='costType==""?"active":""' @click='costTypeclick("")' class='item'>全部</view>
+				<view :class='costType==1?"active":""' @click='costTypeclick(1)' class='item'>粮款</view>
+				<view :class='costType==3?"active":""' @click='costTypeclick(3)' class='item'>非粮款</view>
+				<view :class='costType==5?"active":""' @click='costTypeclick(5)' class='item'>保证金</view>
+			</view>
+			<view v-if='expensesPurpose==3' class='costwrap'>
+				<view :class='wareExpenseType1==""?"active":""' @click='wareExpenseTypeclick("")' class='item'>全部</view>
+				<view :class='wareExpenseType1=="煤费"?"active":""' @click='wareExpenseTypeclick("煤费")' class='item'>煤费</view>
+				<view :class='wareExpenseType1=="电费"?"active":""' @click='wareExpenseTypeclick("电费")' class='item'>电费</view>
+				<view :class='wareExpenseType1=="人工费"?"active":""' @click='wareExpenseTypeclick("人工费")' class='item'>人工费</view>
+				<view :class='wareExpenseType1=="杂费"?"active":""' @click='wareExpenseTypeclick("杂费")' class='item'>杂费</view>
+				<view :class='searchType==1?"active":""' @click='wareExpenseTypeclick(1)' class='item'>收款</view>
 			</view>
 		</view>
-		<view class='costwrap'>
-			<view class='item active'>全部</view>
-			<view class='item'>粮款</view>
-			<view class='item'>非粮款</view>
-			<view class='item'>保证金</view>
-		</view>
-		<view class='costwrap'>
-			<view class='item'>全部</view>
-			<view class='item'>煤费</view>
-			<view class='item'>电费</view>
-			<view class='item'>人工费</view>
-			<view class='item'>杂费</view>
-			<view class='item'>收款</view>
-		</view>
-		<view class='costlistwrap'>
+		<view v-if='costList.length>0' class='costlistwrap' >
 			<view v-for='(item,index) in costList' :style='index!=costList.length-1?"border-bottom:2rpx solid #eee":""' class='item'>
 				<view class='flex align-item-center'>
-					<view v-if='item.status==1' class="status pay">付</view>
-					<view v-if='item.status==2' class="status income">收</view>
+					<view v-if='item.expensesType==1' class="status income">收</view>
+					<view v-if='item.expensesType==2' class="status pay">付</view>
 					<view style='width:92%;justify-content: space-between;' class="flex align-item-center">
-						<view class="costtype">{{item.costtype}}</view>
-						<view class="costmoney"><text>￥</text>{{item.costmoney}}</view>
+						<view class="costtype">{{item.expenseName}}</view>
+						<view class="costmoney"><text>￥</text>{{item.amountMoney}}</view>
 					</view>
 					
 				</view>
 				<view style='justify-content: space-between;font-size:28rpx;margin:10rpx 0;' class='flex align-item-center'>
-					<view>{{item.warehouse}}</view>
-				<!-- 	<view>{{item.contract}}</view>
-					<view>{{item.date}}</view> -->
-					<view>{{item.name}}</view>
+					<view v-if='item.expensesPurpose==3'>{{item.warehouseName}}</view>
+					<view v-if='item.expensesPurpose==1'>{{item.contractNo}}</view>
+					<view v-if='item.expensesPurpose==5'>{{item.paymentDate}}</view>
+					<view>{{item.agent}}</view>
 				</view>
-				<view style='font-size:24rpx;margin:20rpx 0;' class='flex align-item-center'>
+				<view v-if='item.expensesPurpose==1||item.expensesPurpose==3' style='font-size:24rpx;margin:20rpx 0;' class='flex align-item-center'>
 					<view class="">
-						{{item.date}}
+						{{item.paymentDate}}
 					</view>
 				</view>
 			</view>
 		</view>
+		<view v-if='show' :style="{'margin-top':costList.length==0?'260rpx':'0'}" style='text-align:center;background:#F2F6FA;' >
+			暂无更多数据
+		</view>
 	</view>
 </template>
 
@@ -52,27 +60,154 @@
 	export default {
 		data() {
 			return {
-				costList:[
-					{status:1,
-					costtype:'水费',
-					costmoney:'121111',
-					warehouse:'金信库',
-					name:'张三',
-					date:'2022.11.22 15:32:21'},{status:2,
-					costtype:'水费',
-					costmoney:'121111',
-					warehouse:'金信库',
-					name:'张三',
-					date:'2022.11.22 15:32:21'}],
+				customBar:0,
+				costType:'',
+				expensesPurpose:'1',
+				currentPage:1,
+				show:false,
+				wareExpenseType:'',
+				wareExpenseType1:'',
+				pageSize:10,
+				costList:[],
+				isLoadMore:false,
+				searchType:'',
+				expenseName:''
 			}
 		},
-		methods: {
+		onLoad(){
 			
+			uni.getSystemInfo({
+			    success: (e) => {
+			      // this.compareVersion(e.SDKVersion, '2.5.0')
+			      let statusBar = 0  //状态栏高度
+			      let customBar = 0  // 状态栏高度 + 导航栏高度  
+			      let navbar = 0 // 自定义标题与胶囊对齐高度
+			      
+			      
+			      // #ifdef MP
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      if (e.platform === 'android') {
+			        this.$store.commit('SET_SYSTEM_IOSANDROID', false)
+			        customBar = e.statusBarHeight + 50
+			      }
+			      // #endif
+			      
+			      
+			      // #ifdef MP-WEIXIN
+			      statusBar = e.statusBarHeight
+			      const custom = wx.getMenuButtonBoundingClientRect()
+			      customBar = custom.bottom + custom.top - e.statusBarHeight
+			 
+			      navbar = (custom.top - e.statusBarHeight) * 2 + custom.height
+			      // #endif
+			 
+			 
+			      // #ifdef MP-ALIPAY
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + e.titleBarHeight
+			      // #endif
+			 
+			 
+			      // #ifdef APP-PLUS
+			      console.log('app-plus', e)
+			      statusBar = e.statusBarHeight
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+			 
+			 
+			      // #ifdef H5
+			      statusBar = 0
+			      customBar = e.statusBarHeight + 45
+			      // #endif
+					this.customBar=customBar
+			    }
+			})
+		},
+		onShow() {
+			this.getList()
+		},
+		onReachBottom() { //上拉触底函数
+			// if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pageSize += 1
+					this.currentPage += 1
+					this.getList()
+				}
+			// }
+		},
+		methods: {
+			wareExpenseTypeclick(status){
+				this.currentPage=1
+				if(status==1){
+					this.searchType=1
+					this.wareExpenseType1=5
+					this.wareExpenseType=''
+				}else{
+					this.wareExpenseType1=status
+					this.wareExpenseType=status
+					this.searchType=''
+				}
+				this.getList()
+			},
+			costTypeclick(status){
+				this.currentPage=1
+				this.costType=status
+				this.getList()
+			},
+			expenseclick(status){
+				this.currentPage=1
+				this.expensesPurpose=status
+				this.getList()
+			},
+			getList(){
+				uni.showLoading({
+					title: "正在加载"
+				})
+				this.$api.doRequest('get', '/expenseInfo/selectInfo', {
+					expensesPurpose: this.expensesPurpose,
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					appFlag:1,
+					costType:this.costType,
+					wareExpenseType:this.wareExpenseType,
+					searchType:this.searchType,
+					expenseName:this.expenseName
+				}).then(res => {
+					if(res.data.code){
+						uni.hideLoading()
+						if(res.data.data.records.length>0){
+							if(this.currentPage==1){
+								this.costList=res.data.data.records
+							}else{
+								this.costList=this.costList.concat(res.data.data.records)
+							}
+						}else{
+							this.show=true
+							if(this.currentPage==1){
+								this.costList=[]
+							}
+						}
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					
+				})
+			}
 		}
 	}
 </script>
 
 <style lang='scss' scoped>
+.fixedbox{
+	position:fixed;width:100%;top:0;background:#fff;
+	padding-top:20rpx;
+}
 .purposewrap{
 	display:flex;
 	background:#fff;
@@ -112,7 +247,7 @@
 }
 .costlistwrap{
 	background:#fff;
-	margin:0 20rpx;
+	margin:260rpx 20rpx 20rpx;
 	border-radius:20rpx;
 	padding:0 20rpx;
 	.item{
@@ -144,4 +279,12 @@
 		}
 	}
 }
+.search{
+	width:100vw;
+	background:#fff;
+}
+.u-search{
+	width:94%;
+	margin:0 auto !important;
+}
 </style>

pages/erp/index.vue

@@ -138,26 +138,26 @@
 									// }
 								],
 				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: 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',
@@ -166,7 +166,7 @@
 						show: true
 					},
 					{
-						num: 3,
+						num: 1,
 						name: '待完善出库',
 						// icon: 'cuIcon-edit',
 						src: '../../static/img/erp/shougouzhijian@3x.png',

pages/task/audit/freight_settlement_approval.vue

@@ -256,7 +256,7 @@
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
 								businessKey: this.id,
-								branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
+								// branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {

pages/task/audit/freight_settlement_approvalcopy.vue

@@ -0,0 +1,1276 @@
+<template>
+	<view class="container">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="dataobj.approveStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="dataobj.approveStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="dataobj.approveStatus == '待决策人审核'|| dataobj.approveStatus == '待财务审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{dataobj.approveStatus?dataobj.approveStatus:dataobj.status}}</view>
+				</view>
+				<view class="infoData">{{dataobj.updateDate}}</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="top">
+				<view v-if='dataobj.contractFlag=="1"'>合同编号</view>
+				<view v-if='dataobj.contractFlag=="0"'>移库编号</view>
+				<view>{{dataobj.contractNo}}</view>
+			</view>
+			<view class="person-info">
+				
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>收款方</view>
+					<view class="top_info">{{dataobj.payee}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>账号</view>
+					<view class="top_info">{{dataobj.accountNumber}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>开户行</view>
+					<view class="top_info">{{dataobj.bank}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>开户支行</view>
+					<view class="top_info">{{dataobj.bankBranch}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>备注</view>
+					<view class="top_info">{{dataobj.bankBranch}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>合计</view>
+					<view class="top_info">{{num}}</view>
+				</view>
+			</view>
+			<view class="car-container">
+				<view v-for="item in list" class="car-container-item">
+					<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
+					</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">箱号{{item.boxNo}}
+					</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.settlementWeight}}吨</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.settlementPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">服</view>
+						<view class="textInfo">{{item.serviceCharge}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">税</view>
+						<view class="textInfo">{{item.taxPoint}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">实</view>
+						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">合</view>
+						<view class="textInfo">{{item.totalPayable}}元</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<u-form ref="uForm">
+			<view class="form_top">流程</view>
+			<view class="content2">
+				<view v-for="(item,index) in auditList" :key='index' class="audit">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
+						<view class="row-left">
+							<view class="item1">
+								<view class="item-content">{{item.operatorTitle}}</view>
+								<view v-if="item.status=='success'" class='status success'>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='error'" class='status error'>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='question'" class='status question'>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="row-right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view v-if="item.status=='success'" class="status success">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+									<view v-if="item.status=='error'" class="status error">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
+									</view>
+									<view v-if="item.status=='question'" class="status question">
+										{{item.commonStaffs1?item.staffscontent:''}}<text
+											v-if='!item.commonStaffs1'>未审核</text></view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+								</view>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+									class='time'>
+									{{item.updateDate}}
+								</view>
+							</view>
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
+							</view>
+						</view>
+						<view v-if='item.commonStaffs1' class="right">
+							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
+							</u-icon>
+						</view>
+					</view>
+					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+						<view class='row2'>
+							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+								<view class="item-content">
+									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+								</view>
+								<view class="name">{{item1.staffName}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="row-line" v-if="index!= auditList.length - 1 &&item.desc!='_PLACEHOLDER_'"></view>
+				</view>
+			</view>
+		</u-form>
+		<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}}/1000个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="1000" />
+				</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 v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import helper from '@/common/helper.js';
+	export default {
+		data() {
+			return {
+				isSHowBtn: true,
+				currentPage: 1,
+				pageSize: 10,
+				list: {
+					approveStatus: "",
+				},
+				dataobj:{},
+				title: '',
+				num:0,
+				show: false,
+				height: 200,
+				auditList:[],
+				auditMind: '',
+				autoHeight: true,
+				border: false,
+				everyCheck: '',
+				customerName: "", //客户
+				shippingAddress: "", //发货地址
+				receivingAddress: "", //收货地址
+			}
+		},
+		onBackPress(e) {
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.everyCheck = uni.getStorageSync("everyTask")
+			this.isSHowBtn = options.isShowbtn
+			this.getList()
+		},
+		methods: {
+			getList() {
+				var that =this
+				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.dataobj=res.data.data
+						if(res.data.data.tranSettlementReportList.length>0){
+							this.num=0
+							for (var i = 0; i < res.data.data.tranSettlementReportList.length; i++) {
+								if(res.data.data.tranSettlementReportList[i].totalPayable){
+									this.num+=res.data.data.tranSettlementReportList[i].totalPayable	
+								}
+							}
+						}
+						this.num=this.num.toFixed(2)
+						this.list = res.data.data.tranSettlementReportList
+						// console.log(this.list, 124)
+						// 查流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'FEIYONGYUNFEI-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id,
+								// branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i], 'status', 'question')
+									console.log(response.data.data[i].workflowHistoricTasks, i)
+									if (response.data.data[i].commonStaffs) {
+										response.data.data[i].showflow = false
+										response.data.data[i].operatorTitle = response.data.data[i]
+											.desc.substring(0, 2)
+										response.data.data[i].operatorName = response.data.data[i]
+											.desc
+										response.data.data[i].staffscontent = '共' + response.data
+											.data[i].commonStaffs.length + '人，当前审核' + response.data
+											.data[i].workflowHistoricTasks.length + '人'
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											if (response.data.data[i].workflowHistoricTasks
+												.length != response.data.data[i].commonStaffs
+												.length) {
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i], 'status',
+													'question')
+											} else {
+												this.$set(response.data.data[i], 'status',
+													'success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen = response.data.data[
+												i].workflowHistoricTasks.length
+											var workflowdata = response.data.data[i]
+												.workflowHistoricTasks
+											var staffsdata = response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status = false
+												staffsdata[q].staffTitle = staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if (staffsdata[q].staffId == workflowdata[k]
+														.operatorId) {
+														staffsdata[q].status = true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1 = response.data.data[i]
+											.commonStaffs
+									} else {
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											var len = response.data.data[i].workflowHistoricTasks
+												.length - 1
+											if (response.data.data[i].workflowHistoricTasks[len]
+												.approved) {
+												this.$set(response.data.data[i], 'status',
+													'success')
+											} else {
+												this.$set(response.data.data[i], 'status', 'error')
+											}
+											response.data.data[i].operatorTitle = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+												.substring(response.data.data[i]
+													.workflowHistoricTasks[0].operatorName.length -
+													2)
+											response.data.data[i].operatorName = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+											var time = new Date(response.data.data[i]
+												.workflowHistoricTasks[len].claimTime)
+											.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = response.data.data[i]
+												.workflowHistoricTasks[len].auditMind
+										} else {
+											this.$set(response.data.data[i], 'status', 'question')
+											// response.data.data[i].status='question'
+											if (response.data.data[i].desc == '总经理助理审核') {
+												response.data.data[i].operatorTitle = '总助'
+											} else if (response.data.data[i].desc == '杜大光审核') {
+												response.data.data[i].operatorTitle = '大光'
+											} else {
+												response.data.data[i].operatorTitle = response.data
+													.data[i].desc.substring(0, 2)
+											}
+						
+											response.data.data[i].operatorName = response.data
+												.data[i].desc
+											var time1 = new Date(response.data.data[i].updateDate)
+												.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = ''
+										}
+									}
+						
+								}
+								console.log(response.data.data)
+								for(let i = 0 ;i<response.data.data.length;i++){
+									if(response.data.data[i].status == "error"){
+										this.auditCheck = "error"
+										break;
+									}else if(response.data.data[i].status == "question"){
+										this.auditCheck = "question"
+										break;
+									}else{ 
+										this.auditCheck = "success"
+									}
+								}
+								this.auditList = response.data.data
+								var time2 = new Date(this.list[0].createDate).getTime()
+								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle: this.list[0].requester.substring(0, 2),
+									operatorName: this.list[0].requester,
+									updateDate: time3,
+									auditMind: '',
+									desc: '发起申请',
+									showflow: false,
+									commonStaffs1: null,
+									commonStaffs: null,
+									workflowHistoricTasks: [],
+									status: 'success'
+								})
+							})
+						})
+					}
+				})
+				// this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	this.contractNo = res.data.data.contractNo
+				// 	this.carId = res.data.data.carId
+				// 	this.customerName = res.data.data.customer
+				// 	this.shippingAddress = res.data.data.send
+				// 	this.receivingAddress = res.data.data.receive
+				// 	if (res.data.code == 200) {
+				// 		this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
+				// 			compId: "2710b21efc1e4393930c5dc800010dc4",
+				// 			currentPage: this.currentPage,
+				// 			pageSize: this.pageSize,
+				// 			contractNo: this.contractNo,
+				// 			carId: this.carId,
+				// 		}).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				this.list = res.data.data.records[0]
+				// 				console.log(this.list, 124)
+				// 			}
+				// 		})
+				// 	}
+				// })
+				
+			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			// 驳回
+			rejectSubmit() {
+				var that = this
+				if (!this.auditMind) {
+					this.$api.msg('驳回原因不能为空！')
+				} else {
+					this.show = false
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, false, true, that.auditMind)
+							}
+						}
+					})
+				}
+
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
+				} else {
+					this.show = false
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2, that.auditMind)
+							}
+						}
+					})
+				}
+			},
+			//审核方法
+			audit(list, index, status, status2, reason) {
+				uni.showLoading({
+					title: "审核中"
+				})
+				let that = this
+				if (this.list) {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
+						taskId: list.taskId,
+						approved: status,
+						auditMind: this.auditMind ,
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						if (status == true) {
+							this.$api.msg('通过成功')
+						} else if (status == false) {
+							this.$api.msg('驳回成功')
+						}
+						setTimeout(function() {
+							if (that.everyCheck) {
+								helper.setAudit(that.list[0])
+							} else {
+								uni.navigateBack()
+							}
+						}, 1000);
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 230rpx 20rpx;
+	}
+	.u-form {
+		margin-bottom: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
+		}
+	}
+	.content {
+		.top {
+			display: flex;
+			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 30rpx 20rpx;
+			font-size: 36rpx;
+			margin-top: 20rpx;
+		}
+
+		.top1 {
+			// display: flex;
+			justify-content: space-between;
+			align-items: center;
+			border-radius: 20rpx;
+			background: white;
+			padding: 10rpx 20rpx;
+			font-size: 30rpx;
+			margin-top: 20rpx;
+		}
+
+		.top_info {
+			margin: 10rpx 0;
+			width:70%;
+			text-align:right;
+		}
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+			margin-bottom: 30rpx;
+		}
+
+		.car-container {
+
+			// border-bottom: 2rpx solid #EEEEEE;
+		}
+
+		.car-container-item {
+			background: white;
+			padding: 10rpx 20rpx;
+			border-radius: 20rpx;
+			margin: 20rpx 0;
+		}
+
+		.car-type-item {
+			display: inline-flex;
+			// justify-content: center;
+			width: 33.33%;
+			margin-bottom: 40rpx;
+		}
+
+		.title {
+			font-size: 36rpx;
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		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;
+	}
+
+	.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;
+	}
+
+	.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;
+			}
+		}
+	}
+
+	.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;
+	}
+
+	.person-info {
+		background: white;
+		padding: 20rpx 0;
+		border-radius: 20rpx;
+		// margin-bottom: 50rpx;
+		margin: 20rpx 0;
+
+		.tit {
+			font-size: 36rpx;
+		}
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.c-row1 {
+		// display: -webkit-box;
+		// display: -webkit-flex;
+		// display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+	.container {
+		padding: 20rpx 20rpx 250rpx 20rpx;
+	}
+	
+	.u-form {
+		margin-bottom: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
+		}
+	}
+	
+	.content {
+		margin-top: 30rpx;
+	
+		.top {
+			display: flex;
+			justify-content: space-between;
+		}
+	
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+	
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+			margin: 20rpx 0;
+		}
+	
+		.car-container {
+			border-bottom: 2rpx solid #EEEEEE;
+		}
+	
+		.car-type-item {
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
+		}
+	
+		.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: 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;
+		}
+	}
+	
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			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;
+			}
+		}
+	}
+	
+	.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;
+	}
+	
+	.textarea {
+		margin: 18rpx auto;
+		width: 100%;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		font-size: 28rpx;
+		padding: 10px;
+	}
+	
+	.textCss {
+		display: flex;
+		justify-content: flex-end;
+		width: 100%;
+		text-align: right;
+		color: #333333;
+	}
+	
+	.u-textarea-style {
+		margin: 20rpx;
+		background: #F9F9FA;
+		border-radius: 10px;
+		border: 1px solid #EEEEEE;
+		padding: 10rpx 20rpx;
+		position: relative;
+	
+		height:240px;
+		/deep/.uni-textarea-textarea{
+			width: 80%;
+		}
+		.right-bottom {
+			position: absolute;
+			right: 20rpx;
+			bottom: 20rpx;
+			color: #AFB3BF;
+		}
+	}
+	
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
+	
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.row-left {
+				display: flex;
+				align-items: center;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
+					}
+	
+					.status {
+						position: absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background: #fff;
+					}
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
+					}
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
+					}
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
+					}
+				}
+	
+			}
+	
+			.row-right {
+				width: 80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
+					color: #B0B1B5;
+				}
+	
+				.right-item {
+					display: flex;
+					justify-content: space-between;
+	
+					.time {
+						color: #999;
+					}
+	
+					.item2 {
+						margin-left: 20rpx;
+						margin-top: -7px;
+	
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+							margin-bottom: 4px;
+						}
+	
+						.status.success {
+							color: #6CC48C;
+						}
+	
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+	
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}
+		}
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
+			}
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+		}
+	
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	
+	.form_top {
+		border-bottom: 1px solid #C7CAD6;
+		padding-bottom: 10px;
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+	}
+	.label_css{
+		font-size: 26rpx;
+		color: #878C9C;
+	}
+	.input_css{
+		font-size: 20rpx;
+	}
+	/deep/.uni-textarea-wrapper{
+		height:200px;
+	}
+	
+	// .fujian_title{
+	// 	font-size: 34rpx;
+	// 	margin-top: 20px;
+	// 	font-weight: 600;
+	// 	// margin-left: 10px;
+	// }
+	.headInfo{
+		height: 100px;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+		display: flex;
+		.headInfo_left{
+			width: 10%;
+			line-height: 60px;
+			text-align: center;
+		}
+		.headInfo_middle{
+			width: 70%;
+			padding-left: 10px;
+		}
+		.headInfo_right{
+			width: 20%;
+			line-height: 60px;
+			.char_a{
+				color: #22C572;
+			}
+			.char_b{
+				 color: #FE6430;
+			}
+			.char_c{
+				color: #FB2323;
+			}
+			.char_a,.char_b,.char_c{
+				font-size: 16px;
+			}
+		}
+		.adopt{
+			position: absolute;
+			right: 30px;
+			top: 60px;
+			.adopt_img{
+				width: 90px;
+				height: 90px;
+			}
+		}
+		.headInfo_title{
+			font-size: 19px;
+			color: #333333;
+			font-weight: 600;
+		}
+		.headInfo_No{
+			color: #878C9C;
+			font-size: 13px;
+			margin-top: 10px;
+		}
+	}
+	
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
+</style>

pages/task/audit/freight_settlement_detailscopy.vue

@@ -0,0 +1,712 @@
+<template>
+	<view class="container">
+		<view class="topInfo">
+			<view class="topInfo-item">
+				<view class="flex info">
+					<view class="logo">
+						<image src="../../../static/img/reject.png" mode="" v-if="dataobj.approveStatus == '已驳回'"
+							style="height: 40rpx;"></image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode="" v-if="dataobj.approveStatus == '已通过'"
+							style="height: 40rpx;"></image><!-- 通过 -->
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="dataobj.approveStatus == '待决策人审核'|| dataobj.approveStatus == '待财务审核'"
+							style="height: 40rpx;"></image><!-- 待审核 -->
+					</view>
+					<view class="infoText">{{dataobj.approveStatus?dataobj.approveStatus:dataobj.status}}</view>
+				</view>
+				<view class="infoData">{{dataobj.updateDate}}</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="top">
+				<view v-if='dataobj.contractFlag=="1"'>合同编号</view>
+				<view v-if='dataobj.contractFlag=="0"'>移库编号</view>
+				<view>{{dataobj.contractNo}}</view>
+			</view>
+			<view class="person-info">
+				
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>收款方</view>
+					<view class="top_info">{{dataobj.payee}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>账号</view>
+					<view class="top_info">{{dataobj.accountNumber}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>开户行</view>
+					<view class="top_info">{{dataobj.bank}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>开户支行</view>
+					<view class="top_info">{{dataobj.bankBranch}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>备注</view>
+					<view class="top_info">{{dataobj.bankBranch}}</view>
+				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>合计</view>
+					<view class="top_info">{{num}}</view>
+				</view>
+			</view>
+			<view class="car-container">
+				<view v-for="item in list" class="car-container-item">
+					<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
+					</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">箱号{{item.boxNo}}
+					</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.settlementWeight}}吨</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.settlementPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">服</view>
+						<view class="textInfo">{{item.serviceCharge}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">税</view>
+						<view class="textInfo">{{item.taxPoint}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">实</view>
+						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">合</view>
+						<view class="textInfo">{{item.totalPayable}}元</view>
+					</view>
+				</view>
+	
+			</view>
+		</view>
+		<u-form ref="uForm">
+			<view class="form_top">流程</view>
+			<view class="content2">
+				<view v-for="(item,index) in auditList" :key='index' class="audit">
+					<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
+						<view class="row-left">
+							<view class="item1">
+								<view class="item-content">{{item.operatorTitle}}</view>
+								<view v-if="item.status=='success'" class='status success'>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='error'" class='status error'>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='question'" class='status question'>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="row-right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view v-if="item.status=='success'" class="status success">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+									<view v-if="item.status=='error'" class="status error">
+										{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+											v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
+									</view>
+									<view v-if="item.status=='question'" class="status question">
+										{{item.commonStaffs1?item.staffscontent:''}}<text
+											v-if='!item.commonStaffs1'>未审核</text></view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+								</view>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+									class='time'>
+									{{item.updateDate}}
+								</view>
+							</view>
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
+							</view>
+						</view>
+						<view v-if='item.commonStaffs1' class="right">
+							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
+							</u-icon>
+						</view>
+					</view>
+					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+						<view class='row2'>
+							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+								<view class="item-content">
+									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+								</view>
+								<view class="name">{{item1.staffName}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="row-line" v-if="index!= auditList.length - 1 &&item.desc!='_PLACEHOLDER_'"></view>
+				</view>
+			</view>
+		</u-form>
+		<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}}/1000个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="1000" />
+				</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="fanHui" type="success" class="btn1" hover-class='none'>返回</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				currentPage: 1,
+				pageSize: 10,
+				num:0,
+				list: {
+					approveStatus: "",
+				},
+				auditList:[],
+				dataobj:{},
+				customerName: "", //客户
+				shippingAddress: "", //发货地址
+				receivingAddress: "", //收货地址
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		methods: {
+			getList() {
+				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
+					batchId: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.dataobj=res.data.data
+						if(res.data.data.tranSettlementReportList.length>0){
+							this.num=0
+							for (var i = 0; i < res.data.data.tranSettlementReportList.length; i++) {
+								if(res.data.data.tranSettlementReportList[i].totalPayable){
+									this.num+=res.data.data.tranSettlementReportList[i].totalPayable	
+								}
+							}
+						}
+						this.num=this.num.toFixed(2)
+						this.list = res.data.data.tranSettlementReportList
+						// console.log(this.list, 124)
+						// 查流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'FEIYONGYUNFEI-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i], 'status', 'question')
+									console.log(response.data.data[i].workflowHistoricTasks, i)
+									if (response.data.data[i].commonStaffs) {
+										response.data.data[i].showflow = false
+										response.data.data[i].operatorTitle = response.data.data[i]
+											.desc.substring(0, 2)
+										response.data.data[i].operatorName = response.data.data[i]
+											.desc
+										response.data.data[i].staffscontent = '共' + response.data
+											.data[i].commonStaffs.length + '人，当前审核' + response.data
+											.data[i].workflowHistoricTasks.length + '人'
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											if (response.data.data[i].workflowHistoricTasks
+												.length != response.data.data[i].commonStaffs
+												.length) {
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i], 'status',
+													'question')
+											} else {
+												this.$set(response.data.data[i], 'status',
+													'success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen = response.data.data[
+												i].workflowHistoricTasks.length
+											var workflowdata = response.data.data[i]
+												.workflowHistoricTasks
+											var staffsdata = response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status = false
+												staffsdata[q].staffTitle = staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if (staffsdata[q].staffId == workflowdata[k]
+														.operatorId) {
+														staffsdata[q].status = true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1 = response.data.data[i]
+											.commonStaffs
+									} else {
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											var len = response.data.data[i].workflowHistoricTasks
+												.length - 1
+											if (response.data.data[i].workflowHistoricTasks[len]
+												.approved) {
+												this.$set(response.data.data[i], 'status',
+													'success')
+											} else {
+												this.$set(response.data.data[i], 'status', 'error')
+											}
+											response.data.data[i].operatorTitle = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+												.substring(response.data.data[i]
+													.workflowHistoricTasks[0].operatorName.length -
+													2)
+											response.data.data[i].operatorName = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+											var time = new Date(response.data.data[i]
+												.workflowHistoricTasks[len].claimTime)
+											.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = response.data.data[i]
+												.workflowHistoricTasks[len].auditMind
+										} else {
+											this.$set(response.data.data[i], 'status', 'question')
+											// response.data.data[i].status='question'
+											if (response.data.data[i].desc == '总经理助理审核') {
+												response.data.data[i].operatorTitle = '总助'
+											} else if (response.data.data[i].desc == '杜大光审核') {
+												response.data.data[i].operatorTitle = '大光'
+											} else {
+												response.data.data[i].operatorTitle = response.data
+													.data[i].desc.substring(0, 2)
+											}
+						
+											response.data.data[i].operatorName = response.data
+												.data[i].desc
+											var time1 = new Date(response.data.data[i].updateDate)
+												.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = ''
+										}
+									}
+						
+								}
+								console.log(response.data.data)
+								for(let i = 0 ;i<response.data.data.length;i++){
+									if(response.data.data[i].status == "error"){
+										this.auditCheck = "error"
+										break;
+									}else if(response.data.data[i].status == "question"){
+										this.auditCheck = "question"
+										break;
+									}else{ 
+										this.auditCheck = "success"
+									}
+								}
+								this.auditList = response.data.data
+								var time2 = new Date(this.list[0].createDate).getTime()
+								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle: this.list[0].requester.substring(0, 2),
+									operatorName: this.list[0].requester,
+									updateDate: time3,
+									auditMind: '',
+									desc: '发起申请',
+									showflow: false,
+									commonStaffs1: null,
+									commonStaffs: null,
+									workflowHistoricTasks: [],
+									status: 'success'
+								})
+							})
+						})
+					}
+				})
+				// this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	this.contractNo = res.data.data.contractNo
+				// 	this.carId = res.data.data.carId
+				// 	this.customerName =  res.data.data.customer
+				// 	this.shippingAddress = res.data.data.send
+				// 	this.receivingAddress = res.data.data.receive
+				// 	if (res.data.code == 200) {
+				// 		this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+				// 			compId: "2710b21efc1e4393930c5dc800010dc4",
+				// 			currentPage: this.currentPage,
+				// 			pageSize: this.pageSize,
+				// 			contractNo: this.contractNo,
+				// 			carId: this.carId,
+				// 		}).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				this.list = res.data.data.records[0]
+				// 			}
+				// 		})
+				// 	}
+				// })
+			},
+			fanHui() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 230rpx 20rpx;
+	}
+
+	.content {
+		.top {
+			display: flex;
+			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 30rpx 20rpx;
+			font-size: 36rpx;
+			margin-top: 30rpx;
+		}
+
+		.top1 {
+			// display: flex;
+			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 10rpx 20rpx;
+			font-size: 30rpx;
+			margin-top: 20rpx;
+		}
+
+		.title {
+			font-size: 28rpx;
+			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;
+		}
+	}
+
+	.person-info {
+		background: white;
+		padding: 20rpx 0;
+		border-radius: 20rpx;
+		// margin-bottom: 50rpx;
+		margin: 20rpx 0;
+
+		.tit {
+			font-size: 36rpx;
+		}
+	}
+
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		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;
+	}
+
+	.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;
+	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+	
+		.topInfo-item {
+			height: 150rpx;
+			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;
+			}
+		}
+	}
+
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+
+	.rejectText {
+		text-align: center;
+	}
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
+	}
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.row-left {
+				display: flex;
+				align-items: center;
+	
+				.item1 {
+					position: relative;
+	
+					.item-content {
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
+					}
+	
+					.status {
+						position: absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background: #fff;
+					}
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
+					}
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
+					}
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
+					}
+				}
+	
+			}
+	
+			.row-right {
+				width: 80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
+					color: #B0B1B5;
+				}
+	
+				.right-item {
+					display: flex;
+					justify-content: space-between;
+	
+					.time {
+						color: #999;
+					}
+	
+					.item2 {
+						margin-left: 20rpx;
+						margin-top: -7px;
+	
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+							margin-bottom: 4px;
+						}
+	
+						.status.success {
+							color: #6CC48C;
+						}
+	
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+	
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}
+		}
+	
+		.row2 {
+			display: flex;
+	
+			.item-content {
+				background: #22C572;
+				width: 30px;
+				height: 30px;
+				border-radius: 50%;
+				line-height: 30px;
+				text-align: center;
+				font-size: 12px;
+				color: #fff;
+				padding: 0 2px;
+				margin: 0 auto;
+			}
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+		}
+	
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	.top_info {
+		margin: 10rpx 0;
+		width:70%;
+		text-align:right;
+	}
+</style>

pages/task/my_task.vue

@@ -617,7 +617,21 @@
 								.pcUserInfo.compId + "&isShowbtn=true"
 						})
 					}
-				} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
+				}
+				 else if (item.businessCode == 'FEIYONGYUNFEI-APPROVE') {
+				 	if (this.statusFlag == 1) {
+				 		uni.navigateTo({
+				 			url: `/pages/task/audit/freight_settlement_approvalcopy?id=` + item.businessId +
+				 				"&isShowbtn=true"
+				 		})
+				 	} else {
+				 		uni.navigateTo({
+				 			url: `/pages/task/audit/freight_settlement_detailscopy?id=` + item.businessId +
+				 				'&compId=' + this
+				 				.pcUserInfo.compId + "&isShowbtn=true"
+				 		})
+				 	}
+				 }else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +