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

# Conflicts:
#	pages/user/setUp.vue

App.vue

@@ -182,6 +182,7 @@
 			let type = uni.getSystemInfoSync().platform
 			console.log(type)
 			if (type == "android") {
+				APPUpdate()
 				const plugin = uni.requireNativePlugin("DCloud-PushSound");
 				plugin.setCustomPushChannel({
 					soundName: "ring",
@@ -315,12 +316,7 @@
 				this.version = res.versionName;
 			});
 			// #endif
-			let type = uni.getSystemInfoSync().platform
-			console.log(type)
-			if (type == "android") {
-				// AppUpdate()
-				APPUpdate()
-			}
+			
 			console.log('App Show')
 		},
 		onHide: function() {

common/helper.js

@@ -49,6 +49,62 @@ const getUserAllRoles = (item) => {
 	}
 	return rolesList;
 }
+const contactCustomerService = (phone) => {
+	console.log(phone)
+	//客服
+	if (!phone) {
+		phone = '18241771147'
+	}
+	const res = uni.getSystemInfoSync();
+	// ios系统默认有个模态框
+	if(res.platform=='ios'){
+		uni.makePhoneCall({
+		phoneNumber:phone,
+		success(){
+			console.log('拨打成功了');
+		},
+		fail() {
+			console.log('拨打失败了');
+		}
+	})
+	}else{
+	//安卓手机手动设置一个showActionSheet
+		uni.showActionSheet({
+			itemList: [phone,'呼叫'],
+			success:function(res){
+				console.log(res);
+			   if(res.tapIndex==1){
+				uni.makePhoneCall({
+				  phoneNumber: phone,
+				success: (res) => {
+					console.log('调用成功!')
+					
+				},
+			  
+				// 失败回调
+				fail: (res) => {
+					console.log('调用失败!')
+					// contactCustomerService(item)
+				}
+				})
+			  }
+			}
+		  })
+	}
+	// console.log("联系客服")
+	// uni.makePhoneCall({
+	// 	phoneNumber: item,
+	// 	success: (res) => {
+	// 		console.log('调用成功!')
+	// 	},
+
+	// 	// 失败回调
+	// 	fail: (res) => {
+	// 		console.log('调用失败!')
+	// 		contactCustomerService(item)
+	// 	}
+	// });
+}
 const setAudit = (item) => {
 	let _list = uni.getStorageSync("copyTaskInfo")
 	let _isShowbtn = true
@@ -262,6 +318,7 @@ const fUN_AmapLocation = uni.requireNativePlugin('FUN-AmapLocation');
 export default {
 	detailData,
 	selectContractNo,
+	contactCustomerService,
 	now,
 	isArray,
 	erpWarehouse,

config/index.js

@@ -3,13 +3,14 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	// baseUrlNew: 'http://192.168.110.55:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.9:9100/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
+	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.117",
-    "versionCode" : 21117,
+    "versionName" : "2.1.144",
+    "versionCode" : 21144,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -130,7 +130,8 @@
                     "<uses-permission android:name=\"android.permission.REORDER_TASKS\"/>",
                     "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             "icons" : {
                 "android" : {

pageA/product/detail.vue

@@ -216,6 +216,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view class="Regular">
+				<u-button class="talk-online" @click="editInfo" v-if="show">编辑</u-button>
 				<u-button class="talk-online" @click="contactUs">立即沟通</u-button>
 				<u-button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
 					class="action-btn no-border add-cart-btn">立即卖粮</u-button>
@@ -247,6 +248,7 @@
 				content1: '您尚未登录，是否立即登录?',
 				content: '您还未认证粮商身份，下单前请先完善您的身份信息。',
 				isShowAlert: false,
+				show: false,
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -296,6 +298,9 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.goods = res.data.data
+				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
+					that.show = true
+				}
 			})
 
 			// .then(res => {
@@ -313,6 +318,13 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			editInfo(){
+				const that = this
+				uni.navigateTo({
+					url: '/pageD/myRelease/buyEdit?id='+that.goods.id+'&compId='+that.goods.compId
+				})
+				
+			},
 			alertBtn1() {
 				uni.navigateTo({
 					url: '/pages/public/login'

pageA/product/sales_detail.vue

@@ -216,6 +216,7 @@
 		<!-- 底部操作菜单 -->
 		<view class="page-bottom1">
 			<view>
+				<button class="talk-online" @click="editInfo" v-if="show">编辑</button>
 				<button type="primary" @click="contactUs">立即沟通</button>
 				<button @click="salegrain" v-if="goods.pcFlag == 1" type="primary"
 					class=" action-btn no-border add-cart-btn">立即买粮</button>
@@ -241,6 +242,7 @@
 			return {
 				isShowAlert: false,
 				content: '您尚未登录，是否立即登录?',
+				show: false,
 				swiperCurrent: 0,
 				titleNViewBackground: '',
 				swiperLength: 0,
@@ -290,12 +292,22 @@
 			}).then(res => {
 				uni.hideLoading()
 				this.goods = res.data.data
+				if(that.goods.createUserId == uni.getStorageSync('userInfo').id){
+					that.show = true
+				}
 			})
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		methods: {
+			editInfo(){
+				const that = this
+				uni.navigateTo({
+					url: '/pageD/myRelease/sellEdit?id='+that.goods.id+'&compId='+that.goods.compId
+				})
+				
+			},
 			alertBtn() {
 				uni.navigateTo({
 					url: '/pages/public/login'

pageD/identity/companyIdentityThree.vue

@@ -460,7 +460,7 @@
 																				})
 																				//判断是不是从邀请页面进来的，如果是邀请进来的就直接邀请成功！
 																				if(that.identityAuthenticationInfo.invitation || that.identityAuthenticationInfo.inviteCompany){
-																					that.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
+																					that.$api.doRequest('post', '/identityAuthenticationInfo/saveCompanyIdentity', {
 																							id: res.data.data,
 																							compId:	that.identityAuthenticationInfo.inviteCompany,
 																						}, 'application/json;charset=UTF-8').then(res => {
@@ -549,7 +549,7 @@
 																	})
 																	//判断是不是从邀请页面进来的，如果是邀请进来的就直接邀请成功！
 																	if(that.identityAuthenticationInfo.invitation || that.identityAuthenticationInfo.inviteCompany){
-																		that.$api.doRequest('get', '/identityAuthenticationInfo/saveCompanyIdentity', {
+																		that.$api.doRequest('post', '/identityAuthenticationInfo/saveCompanyIdentity', {
 																				id: res.data.data,
 																				compId:	that.identityAuthenticationInfo.inviteCompany,
 																			}, 'application/json;charset=UTF-8').then(res => {

pages.json

@@ -171,38 +171,52 @@
 		{
 			"path": "pages/task/audit/salecontract",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "销售合同审核"
 			}
 		},
 		{
 			"path": "pages/task/audit/daishou_details",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "代收合同审核"
 			}
 		},
 		{
 			"path": "pages/task/audit/daichu_details",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "代储合同审核"
 			}
 		},
 		{
 			"path": "pages/task/audit/purchasecontract",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "采购合同审核"
 			}
 		},
 		{
 			"path": "pages/task/audit/acquisitioncontract",
 			"style": {
-				"enablePullDownRefresh": true,
+				"enablePullDownRefresh": false,
 				"navigationBarTitleText": "收购合同审核"
 			}
 		},
+		{
+			"path": "pages/task/audit/refuel",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "加油申请审核"
+			}
+		},
+		{
+			"path": "pages/user/mintor",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "查看监控"
+			}
+		},
 		{
 			"path": "pages/task/sale_details",
 			"style": {
@@ -598,6 +612,13 @@
 		},
 		{
 			"path": "pages/user/set_nickname",
+			"style": {
+				"navigationBarTitleText": "用户名",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/user/set_wechatNo",
 			"style": {
 				"navigationBarTitleText": "昵称",
 				"enablePullDownRefresh": true
@@ -775,7 +796,7 @@
 			"path": "pages/task/my_task",
 			"style": {
 				"navigationBarTitleText": "我的任务",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		},
@@ -1165,6 +1186,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/task/audit/viewDetail",
+			"style": {
+				"navigationBarTitleText": "入库详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/task/audit/warehouse_warrant_detail",
 			"style": {
@@ -1257,7 +1285,21 @@
 				"enablePullDownRefresh": false
 			}
 
+		},{
+			"path": "pages/erpbusiness/customerAudit",
+			"style": {
+				"navigationBarTitleText": "客户审核",
+				"enablePullDownRefresh": false
+			}
+
 		}, {
+			"path": "pages/erpbusiness/customerSee",
+			"style": {
+				"navigationBarTitleText": "客户详情",
+				"enablePullDownRefresh": false
+			}
+
+		},{
 			"path": "pages/user/depotAcquisition/depotAcquisition",
 			"style": {
 				"navigationBarTitleText": "库点收购",
@@ -1501,7 +1543,45 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/universalityAudit/list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的申请",
+                "enablePullDownRefresh": false,
+				"app-plus": {
+				    "titleNView": {
+						"buttons": [
+						{
+						"color": "#000",
+						"fontSize": "28rpx",
+						"text": "发布"
+						}
+						]
+				    }
+				}
+            }
+            
+        }
+        ,{
+            "path" : "pages/universalityAudit/look",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "申请详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/universalityAudit/addaduit",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "发起申请",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subpackages": [{
 			"root": "pageA",
 			"pages": [{

pages/bill/index.vue

@@ -12,17 +12,23 @@
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
-			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;' class="Semibold">
+			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;position:relative;' class="Semibold">
 				<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>全部</view>
 				<view @click='tabcarchange(5)' class='line' :class='TabCur==5?"active":""'>待付款</view>
 				<view @click='tabcarchange(6)' class='line' :class='TabCur==6?"active":""'>已付款</view>
+			<view style='position:absolute;right: 20px;font-weight:500;top:25%;' @click='dateshow=true'>{{datetext?datetext:'日期筛选'}}</view>
 			</view>
+			
+			<u-picker :range="dateList" range-key="value" @confirm='dateCheck($event)' v-model="dateshow"
+				mode="selector">
+			</u-picker>
 		</view>
 		<view class='wrap' v-for='item in dataInfo'>
 			<view style='margin:5px;padding:10px 0;border-bottom:1px solid #eee;'
 				class="flex justify-between align-item-center">
 				<view style='color:#878C9C;'>{{item.paymentNo}}</view>
-				<view class='already' v-if='item.status=="全部付款"'>已付款</view>
+				<view class='already' v-if='item.status=="部分付款"'>部分付款</view>
+				<view class='already' v-else-if='item.status=="全部付款"'>全部付款</view>
 				<view class='not' v-else>待付款</view>
 			</view>
 			<view style='line-height:30px;'>
@@ -99,7 +105,10 @@
 				show: false,
 				img: '',
 				searchType: '',
-				dataInfo: []
+				dataInfo: [],
+				dateshow:false,
+				dateList:[{value:'一个月'},{value:'三个月'},{value:'一年'}],
+				datetext:'一个月'
 			}
 		},
 		onShow() {},
@@ -133,6 +142,10 @@
 			closepop() {
 				this.show = false
 			},
+			dateCheck(e){
+				this.datetext=this.dateList[e[0]].value
+				this.loadData()
+			},
 			xiazai() {
 				const that = this;
 				uni.downloadFile({
@@ -258,6 +271,7 @@
 						managementType: 1,
 						appFlag:1,
 						customerPhone: this.userInfo.phone,
+						dateFilter:this.datetext
 						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {

pages/clock/supp_clock.vue

@@ -54,12 +54,16 @@
 				border: true,
 				height: 150,
 				autoHeight: true,
-				id: ""
+				id: "",
+				suppDay:'',
 			}
 		},
 
 		onLoad(options) {
 			this.id = options.id
+			let _day = new Date();
+			_day.setTime(_day.getTime());
+			this.suppDay = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -157,6 +161,7 @@
 							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 							that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
 							that.detailData.supplementClockType = that.typevalue
+							that.detailData.suppDay = that.suppDay
 							that.$api.doRequest('post', '/clockInfo/api/suppClock', that.detailData)
 								.then(res => {
 									if (res.data.code == 200) {

pages/clock/the_clock.vue

@@ -1,106 +1,42 @@
 <template>
 	<view>
-		<view class="dk" v-if="value==0">
-			<view class='wrap'>
-				<view class="c-row">
-					<view class="title">打卡原因</view>
-					<view style='padding:0;' class="con-list">
-						<u-radio-group activeColor="#22C572" v-model="typevalue">
-							<u-radio key="3" label="下班" name="3">下班</u-radio>
-							<u-radio key="1" label="上班" name="1">上班</u-radio>
-						</u-radio-group>
-					</view>
-				</view>
-				<view class="c-row">
-					<view class="title">目标位置</view>
-					<view class="con-list">
-						<view @click='show=true'>{{detailData.targetLocation}}</view>
-						<u-picker :range="warehouseBaseInfoList" range-key="warehouseName"
-							@confirm='targetLPicker($event)' v-model="show" mode="selector">
-						</u-picker>
-					</view>
-				</view>
-				<view class="c-row">
-					<view class="title">打卡距离</view>
-					<view class="con-list">
-						<view>{{clockDistance}}</view>
-					</view>
+		<view class='wrap'>
+			<view class="c-row">
+				<view class="title">打卡原因</view>
+				<view style='padding:0;' class="con-list">
+					<u-radio-group activeColor="#22C572" v-model="typevalue">
+						<u-radio key="3" label="下班" name="3">下班</u-radio>
+						<u-radio key="1" label="上班" name="1">上班</u-radio>
+					</u-radio-group>
 				</view>
 			</view>
-			<view>
-				<u-button type="primary" class="submit" hover-class="none" @click="submit">打卡</u-button>
+			<view class="c-row">
+				<view class="title">目标位置</view>
+				<view class="con-list">
+					<view @click='show=true'>{{detailData.targetLocation}}</view>
+					<u-picker :range="warehouseBaseInfoList" range-key="warehouseName" @confirm='targetLPicker($event)'
+						v-model="show" mode="selector">
+					</u-picker>
+				</view>
 			</view>
-		</view>
-		<view class="jl" v-else>
-			<view class="uni-container">
-				<view class="top">
-					<view class="center">月份</view>
-					<view @click='show=true'>{{createDate}}</view>
-					<u-picker v-model="show" mode="time" @confirm='dateChange($event)' :params="params"></u-picker>
+			<view class="c-row">
+				<view class="title">打卡距离</view>
+				<view class="con-list">
+					<view>{{clockDistance}}</view>
 				</view>
-				<uni-table border stripe emptyText="暂无更多数据">
-					<!-- 表头行 -->
-					<uni-tr>
-						<uni-th align="center" width="50">日期</uni-th>
-						<uni-th align="center" width="50">上班时间</uni-th>
-						<uni-th align="center" width="50">下班时间</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr v-for="(item, index) in tableData" :key="index">
-						<uni-td align="center" style="height: 30px;">{{ item.createDate.split(" ")[0]  }}</uni-td>
-						<uni-td align="center">
-							<view class="toClockDate" v-if="item.toClockDate">{{ item.toClockDate.split(" ")[1] }}
-							</view>
-							<view class="toClockDate" v-else-if="!item.toClockDate">
-								<view v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
-									class="bk-button">补卡</view>
-								<view v-if='item.approveStatus=="待人事审核"' class='listitemStatus audit Regular'>待人事审核
-								</view>
-								<view v-if='item.approveStatus=="待主管审核"' class='listitemStatus audit Regular'>待主管审核
-								</view>
-								<button v-if='item.status=="补卡失败"' class='listitemStatus notPass Regular' size="mini"
-									type="primary" align="center" style="height: 30px;">补卡失败</button>
-								<button v-if='item.status=="补卡成功"' class='listitemStatus pass Regular' size="mini"
-									type="primary" align="center" style="height: 30px;">补卡成功</button>
-							</view>
-						</uni-td>
-						<uni-td align="center">
-							<view class="offClockDate" v-if="item.offClockDate">{{ item.offClockDate.split(" ")[1] }}
-							</view>
-							<view class="offClockDate" v-else-if="!item.offClockDate">
-								<view v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
-									class="bk-button">补卡</view>
-								<button v-if='item.approveStatus=="待人事审核"' class='listitemStatus audit Regular'
-									size="mini" type="primary" align="center" style="height: 30px;">审核中</button>
-								<button v-if='item.status=="补卡失败"' class='listitemStatus notPass Regular' size="mini"
-									type="primary" align="center" style="height: 30px;">补卡失败</button>
-								<button v-if='item.status=="补卡成功"' class='listitemStatus pass Regular' size="mini"
-									type="primary" align="center" style="height: 30px;">补卡成功</button>
-							</view>
-						</uni-td>
-					</uni-tr>
-				</uni-table>
 			</view>
 		</view>
+		<view>
+			
+		</view>
+		<!-- <view class="footer">
+			<view @click='clockRecord' class="button">记录</view>
+			<view @click='submit' class="button">提交</view>
+		</view> -->
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
-			<view @click='clocksubmit'>
-				<image v-if='value==0' class="img" src="../../static/img/oa_office/leave/dkc.png" mode="widthFix">
-				</image>
-				<image v-else class="img" src="../../static/img/oa_office/leave/dk.png" mode="widthFix">
-				</image>
-				<view :style='{"color":value==0?"#22C572":"#000"}'>打卡</view>
-			</view>
-			<view @click='clockRecord' style=''>
-				<image v-if='value==1' class="img" src="../../static/img/oa_office/leave/jilu-check.png"
-					mode="widthFix">
-				</image>
-				<image v-else class="img" src="../../static/img/oa_office/leave/jilu.png" mode="widthFix">
-				</image>
-				<view :style='{"color":value==1?"#22C572":"#000"}'>记录</view>
-			</view>
-			<!-- <u-button type="primary" class="submit" hover-class="none" @click="clockRecord">记录</u-button> -->
-
+			<u-button type="primary" class="submit" hover-class="none" @click="clockRecord">记录</u-button>
+			<u-button type="primary" class="submit" hover-class="none" @click="submit">提交</u-button>
 		</view>
 	</view>
 </template>
@@ -109,11 +45,6 @@
 	export default {
 		data() {
 			return {
-				params: {
-					year: true,
-					month: true
-				},
-				value: 0,
 				typevalue: '1',
 				show: false,
 				detailData: {
@@ -129,51 +60,16 @@
 
 			}
 		},
-		onShow() {
-			this.getList()
-		},
-		onLoad(options) {
-			if (options.value) {
-				this.value = 1
-			}
-			console.log(uni.getStorageSync("clockwerehouse"))
-			if (!uni.getStorageSync("clockwerehouse")) {
-				uni.showLoading({
-					mask: true,
-					title: '加载中'
-				})
+		onLoad() {
+			if(!uni.getStorageSync("clockwerehouse")){
 				this.getWarehouse()
-			} else {
-				this.detailData.targetLocation = uni.getStorageSync("clockwerehouse")
+			}else{
+				this.detailData.targetLocation=uni.getStorageSync("clockwerehouse")
 			}
-
+			
 			// this.getLocation()
-			let _day = new Date();
-			_day.setTime(_day.getTime());
-			this.createDate = _day.getFullYear() + "-" + (_day.getMonth() + 1);
 		},
 		methods: {
-			supp(item) {
-				uni.navigateTo({
-					url: '/pages/clock/supp_clock' + `?id=${item.id}`,
-				})
-			},
-			dateChange(e) {
-				console.log(e)
-				this.createDate = e.year + "-" + e.month
-				uni.showLoading({
-					title: "加载中",
-					mask: true
-				})
-				this.getList()
-			},
-			clocksubmit() {
-				this.value = 0
-				uni.setNavigationBarTitle({
-					title: '打卡功能'
-				});
-			},
-
 			calculate() {
 				const query = uni.createSelectorQuery().in(this);
 				query.selectAll('.left')
@@ -185,14 +81,8 @@
 					compId: uni.getStorageSync("pcUserInfo").compId,
 					warehouseType: '1'
 				}).then(res => {
-					uni.hideLoading()
 					if (res.data.data.length != 0) {
 						that.warehouseBaseInfoList = res.data.data
-						that.warehouseBaseInfoList.unshift({
-							warehouseName: '黑龙江中天昊元贸易有限公司',
-							warehousePositioning: '40.63070,122.22580'
-
-						})
 						uni.getLocation({
 							type: 'gcj02',
 							geocode: true,
@@ -208,8 +98,7 @@
 											0],
 										that.warehouseBaseInfoList[0].warehousePositioning.split(
 											',')[1], that.lat2, that.lng2)
-									that.detailData.targetLocation = that.warehouseBaseInfoList[0]
-										.warehouseName
+											that.detailData.targetLocation = that.warehouseBaseInfoList[0].warehouseName
 								}
 							},
 							fail: function(req) {
@@ -221,12 +110,12 @@
 				})
 			},
 			targetLPicker(e) {
-				uni.setStorageSync("clockwerehouse", this.warehouseBaseInfoList[e[0]].warehouseName)
+				uni.setStorageSync("clockwerehouse",this.warehouseBaseInfoList[e[0]].warehouseName)
 				this.detailData.targetLocation = this.warehouseBaseInfoList[e[0]].warehouseName
 				this.clockDistance = this.utils.getDistance(this.warehouseBaseInfoList[e[0]].warehousePositioning.split(
 						',')[0],
 					this.warehouseBaseInfoList[e[0]].warehousePositioning.split(',')[1], this.lat2, this.lng2)
-
+					
 			},
 			submit() {
 				if (!this.typevalue) {
@@ -247,14 +136,13 @@
 							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 							that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
 							that.detailData.dept = uni.getStorageSync('pcUserInfo').deptName
-							that.detailData.deptId = uni.getStorageSync('pcUserInfo').deptId
 							that.detailData.phone = uni.getStorageSync('pcUserInfo').userMobilePhone
 							that.detailData.empName = uni.getStorageSync('userInfo').userName
 							that.detailData.clockType = that.typevalue
-							if (that.clockDistance.indexOf("km") > -1) {
-								that.detailData.clockDistance = that.clockDistance.replace("km", "") * 1000
-							} else {
-								that.detailData.clockDistance = that.clockDistance.replace("m", "")
+							if(that.clockDistance.indexOf("km") > -1){
+								that.detailData.clockDistance = that.clockDistance.replace("km","")*1000
+							}else{
+								that.detailData.clockDistance = that.clockDistance.replace("m","")
 							}
 							console.log(that.detailData)
 							that.$api.doRequest('post', '/clockInfo/api/addClock', that.detailData)
@@ -262,9 +150,6 @@
 									console.log(res.data)
 									if (res.data.code == 200) {
 										that.$api.msg('提交成功')
-										that.value = 1
-
-										that.getList()
 									} else {
 										that.$api.msg('提交失败')
 									}
@@ -274,37 +159,11 @@
 				})
 			},
 			clockRecord() {
-				this.value = 1
-				uni.setNavigationBarTitle({
-					title: '记录'
-				});
-				uni.showLoading({
-					title: '加载中',
-					mask: true
-				})
-				this.getList()
-				// uni.navigateTo({
-				// 	url: '/pages/clock/the_clock_record'
-				// })
-			},
-			getList() {
-				this.$api.doRequest('get', '/clockInfo/selectClockInfo', {
-					pageSize: 100,
-					currentPage: 1,
-					pcFlag: 0,
-					yearMonth: this.createDate,
-					compId: uni.getStorageSync('pcUserInfo').compId,
-					commonId: uni.getStorageSync('pcUserInfo').userId,
-				}).then(res => {
-					if (res.data.code == 200) {
-						uni.hideLoading()
-						this.tableData = res.data.data.records
-						this.$forceUpdate() //刷新data数据
-
-					}
+				uni.navigateTo({
+					url: '/pages/clock/the_clock_record'
 				})
 			},
-		}
+		},
 	}
 </script>
 
@@ -365,7 +224,7 @@
 
 	}
 
-	/* 	.footer {
+/* 	.footer {
 		background: #fff;
 		position: fixed;
 		bottom: 0;
@@ -384,12 +243,10 @@
 		}
 	} */
 	.submit {
-		width: 80%;
+		width: 40%;
 		background: #22C572;
-		border-radius: 50rpx;
-		margin-top: 50rpx;
+		border-radius: 10rpx;
 	}
-
 	.bottom-btn {
 		padding: 30rpx;
 		background: #FFFFFF;
@@ -398,9 +255,7 @@
 		bottom: 0rpx;
 		display: flex;
 		z-index: 9999;
-		justify-content: space-evenly;
 	}
-
 	.buns_item {
 		display: flex;
 		padding: 80rpx 0 50rpx 0;
@@ -419,42 +274,4 @@
 	/deep/.u-radio-group {
 		flex-direction: row-reverse;
 	}
-
-	.img {
-		width: 50rpx;
-	}
-
-	.uni-container {
-		padding: 20rpx;
-
-		.top {
-			display: flex;
-			align-items: center;
-			margin-bottom: 20rpx;
-
-			.center {
-				margin-right: 20rpx;
-			}
-		}
-
-	}
-
-	.listitemStatus {
-		color: red;
-	}
-
-	.bk-button {
-		background: #22C572;
-		color: white;
-		width: 100rpx;
-		padding: 10rpx;
-		box-sizing: border-box;
-		border-radius: 50rpx;
-	}
-
-	.offClockDate,
-	.toClockDate {
-		display: flex;
-		justify-content: center;
-	}
 </style>

pages/erp/contactCustomerService/contactCustomerService.vue

@@ -4,11 +4,11 @@
 			<view class="content">
 				<view class="row row-bottom">
 					<view class="left">姓名</view>
-					<input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></input>
+					<u-input v-model="personInfo.name" class="right-bottom" placeholder="请输入姓名"></u-input>
 				</view>
 				<view class="row row-bottom">
 					<view class="left">电话</view>
-					<input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></input>
+					<u-input class="right-bottom" v-model="personInfo.mobilePhone" placeholder="请输入电话"></u-input>
 				</view>
 				<view class="row no-boder">
 					<view class="left">留言</view>

pages/erp/exWarehousing/exWarehousing.vue

@@ -111,9 +111,8 @@
 				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<view class="left">车牌号</view>
 				<!-- 他运合同车牌号输入 -->
-				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号1" v-if="!showCar"></input>
-				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="showCar&&carjudge"></input>
-				<view v-else v-show="showCar" @click="carno = true">
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-if="!showCar"></input>
+				<view v-show="showCar" @click="carno = true" v-if="detailData.inOutType == '移库出库'|| (showCar&&contractType=='1')"><!-- showCar = true时为自运  carjudge为切换状态 contractType==1 为销售合同-->
 					<view v-if="detailData.tranCarNo">
 						{{detailData.carNo?detailData.carNo +'（'+detailData.tranCarNo+'）':"请选择车牌号"}}
 					</view>
@@ -121,13 +120,15 @@
 						{{detailData.carNo?detailData.carNo:"请选择车牌号"}}
 					</view>
 				</view>
+				<input v-model='detailData.carNo' @click.stop="handleShowKeyboard":disabled="true"  class="right-bottom" placeholder="请输入车牌号" v-else ></input>
+				
 				<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false" :defaultValue="detailData.carNo" @keyboardClick="handleClick"></master-keyboard>
 				<!-- <view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view> -->
 				<!-- 自运合同车牌号需下拉 -->
 				<u-picker :range="carList" range-key="carNo1" @confirm='carPicker($event)' v-model="carno"
 					mode="selector">
 				</u-picker> 
-				<view type="success" @click="carNoTypeChange" class="carNo_but" v-if="showCar||carjudge" v-show="showCar">{{carChange1}}</view>
+				<!-- <view type="success" @click="carNoTypeChange" class="carNo_but" v-if="showCar||carjudge" v-show="showCar">{{carChange1}}</view> -->
 			</view>
 			<view class="row row-bottom" v-if="detailData.outType=='火运'">
 				<view class="left">车号</view>
@@ -343,7 +344,9 @@
 				carList: [], //车牌号下拉
 				showCar: false,
 				carChange1:"手动填写",
-				carjudge:false
+				carjudge:false,
+				contractType:"",
+				contractList:[],
 			}
 		},
 		computed: {
@@ -500,13 +503,13 @@
 							this.detailData.inOutTypeKey = 6
 						}
 					}
-					console.log(this.detailData.inOutType)
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,
 						compId: helper.erpWarehouse.compId,
 					}).then(res => {
 						if (res.data.code == 200) {
+							this.contractList = res.data.data
 							for (let i = 0; i < res.data.data.length; i++) {
 								// "MYCGYMHLJ2021102401"
 								if (res.data.data[i].contractNo == this.detailData.contractNo) {
@@ -515,6 +518,7 @@
 									} else if (this.detailData.inOutType == '移库出库') {
 										this.detailData.tips = '入货库' + this.inOutNoList[0].receiveWarehouse
 									}
+									this.contractType = res.data.data[i].contractType //获取合同类型   用于判断输入车牌号
 									//如果查到该合同
 									// res.data.data[i].deliverType  = !res.data.data[i].deliverType?'1':res.data.data[i].deliverType  
 									if (res.data.data[i].deliverType == '1') { //判断自运1，他运2合同
@@ -549,12 +553,25 @@
 			},
 			inOutChange(e) {
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
+				this.detailData.inOutType  = this.inOutNoList[e[0]].inOutType
+				// this.contractType = this.inOutNoList[e[0]].contractType //获取合同类型   用于判断输入车牌号
 				this.detailData.agent = this.inOutNoList[e[0]].agent
 				if (this.inOutNoList[e[0]].contractNo) {
 					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
 				} else {
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
+				for(let i = 0 ; i<this.contractList.length ; i++){
+					if (this.contractList[i].contractNo == this.detailData.contractNo) {
+						this.contractType = this.contractList[i].contractType //获取合同类型   用于判断输入车牌号
+					}
+					
+					if (this.contractList[i].deliverType == '1') { //判断自运1，他运2合同
+						this.showCar = true
+					} else {
+						this.showCar = false
+					}
+				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade

pages/erp/index.vue

@@ -29,7 +29,6 @@
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 						<image :src="item.src" class="sign"></image>
 					</view>
-
 					<text>{{item.name}}</text>
 				</view>
 			</view>
@@ -599,7 +598,7 @@
 		width: 40px;
 		height: 40px;
 		top: 4px;
-		margin-right: 6px;
+		/* margin-right: 6px; */
 	}
 
 	.dropdown {

pages/erp/receivingfeedback/details.vue

@@ -726,6 +726,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranPrice = that.detailData.tranPrice
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
@@ -762,6 +763,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
@@ -802,6 +804,7 @@
 								var tranProcessInfo = {}
 								tranProcessInfo.id = that.detailData.id
 								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.flag = 1
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranPrice = that.detailData.tranPrice
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList

pages/erpbusiness/acquisitionInformation.vue

@@ -223,6 +223,9 @@
 						uni.hideLoading()
 						this.$api.msg('添加成功')
 					uni.navigateBack()
+					}else{
+						this.$api.msg('添加失败')
+						this.isShowAlert = false
 					}
 				})
 			},

pages/erpbusiness/customer.vue

@@ -18,13 +18,13 @@
 
 			<view v-for='item in gridList'>
 				<view v-if='searchKeyWord.length>0&&show==true' class='searchwrap' @click='checkcustomer(item)'>
-					<view v-if="item.supplier"> {{item.customerName}}({{item.customerPhone}})-{{item.supplier}} </view>
-					<view v-else> {{item.customerName}}({{item.customerPhone}}) </view>
+					<view v-if="item.supplier"> {{item.customerName}}({{item.bankCard}})-{{item.supplier}} </view>
+					<view v-else> {{item.customerName}}({{item.bankCard}}) </view>
 				</view>
 			</view>
 			<view v-for='item in recentCustomers' style='display:inline-block;'>
 				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>
-					{{item.customerName}}({{item.customerPhone}})
+					{{item.customerName}}({{item.bankCard}})
 				</view>
 			</view>
 		</view>

pages/erpbusiness/customerAudit.vue

@@ -0,0 +1,148 @@
+<template>
+	<view class="content">
+		<view class="datalist" v-for="(item,index) in dataList">
+			<view class="item">
+				<view class="item_top">
+					<view class="item_name">{{item.customerName}}</view>
+					<view class="item_audit" ><span @click="auditSubmit(item)">审核</span></view>
+				</view>
+				<view class="item_lower">
+					<view class="item_phone">{{item.customerPhone}}</view>
+					<view class="item_date">{{item.updateDate}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-show="isLoadMore">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				dataList: [],
+				currentPage:1,
+				pageSize:10,
+				isLoadMore: false, //是否加载中
+				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
+			}
+		},
+		onShow() {
+			this.getList()
+		},
+		onLoad() {},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.currentPage = 1
+			this.pageSize = 10
+			this.isLoadMore = false
+			this.loadStatus = 'loading'
+			this.getList()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				this.getList()
+			}
+		},
+		methods: {
+			getList() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$api.doRequest('get', '/identityAuthenticationInfo/selectIdentityAuthenticationInfoPc', {
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					searchType: 1, //searchType:1待审核
+					compId: uni.getStorageSync('pcUserInfo').compId,
+					searchKeyWord: "个人"
+				}).then(res1 => {
+					uni.hideLoading()
+					if (res1.data.code == 200) {
+						if (res1.data.data.records.length > 0) {
+							this.isLoadMore = false
+							this.loadStatus = 'loading'
+						} else {
+							this.isLoadMore = true
+							this.loadStatus = 'nomore'
+						}
+						if (this.currentPage == 1) {
+							this.dataList = res1.data.data.records
+						} else {
+							this.dataList = this.dataList.concat(res1.data.data.records)
+						}
+					}
+				})
+			},
+			auditSubmit(val) {
+				let obj = JSON.stringify(val)
+				uni.navigateTo({
+					url: '/pages/erpbusiness/customerSee?data=' + obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		padding: 30rpx 20rpx;
+	}
+
+	.datalist {
+		.item {
+			margin-bottom: 20rpx;
+			background-color: #ffffff;
+			padding: 30rpx 20rpx;
+			border-radius: 10rpx;
+			height: 200rpx;
+			padding: 40rpx 40rpx;
+		}
+
+		.item_top,
+		.item_lower {
+			display: flex;
+		}
+		.item_lower{
+			margin-top: 30rpx;
+		}
+
+		.item_name,
+		.item_phone,
+		.item_date,
+		.item_audit {
+			width: 50%;
+		}
+		.item_name{
+			font-size: 36rpx;
+			font-weight: 600;
+		}
+		.item_audit{
+			font-size: 36rpx;
+			font-weight: 600;
+			color: #5C76DF ;
+		}
+		.item_phone,.item_date{
+			color: #878C9C;
+			font-size: 28rpx;
+		}
+
+		.item_date,
+		.item_audit {
+			text-align: right;
+		}
+	}
+</style>

pages/erpbusiness/customerSee.vue

@@ -0,0 +1,331 @@
+<template>
+	<view class="content">
+		<view class="data_css">
+			<view class="wrap">
+				<view class="c-row">
+					<view class="title">客户姓名</view>
+					<view class="con-list">
+						{{dataInfo.customerName}}
+					</view>
+				</view>
+				<view class="c-row" v-show="dataInfo.customerPhone">
+					<view class="title">手机号</view>
+					<view class="con-list">
+						{{dataInfo.customerPhone}}
+					</view>
+				</view>
+				<view class="c-row" v-show="dataInfo.compAddress">
+					<view class="title">联系地址</view>
+					<view class="con-list">
+						{{dataInfo.compAddress}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">身份证号</view>
+					<view class="con-list">
+						{{dataInfo.customerNumberCard}}
+					</view>
+				</view>
+			</view>
+			<view class="wrap">
+				<view class="tips">身份证照片</view>
+				<view class="img" v-if="dataInfo.cardAddressUrl.length > 0">
+					<u-swiper :list="dataInfo.cardAddressUrl" @change="e => currentNum = e.current" radius="10"
+						indicatorMode="dot" height="360" img-mode="true" :autoplay="true" @click="openDocument1">
+					</u-swiper>
+				</view>
+			</view>
+			<view class="wrap">
+				<view class="c-row ">
+					<view class="title">银行卡号</view>
+					<view class="con-list">
+						{{dataInfo.bankCard}}
+					</view>
+				</view>
+				<view class="c-row ">
+					<view class="title">开户行</view>
+					<view class="con-list">
+						{{dataInfo.bankDeposit}}
+					</view>
+				</view>
+				<view class="c-row ">
+					<view class="title">开户支行</view>
+					<view class="con-list">
+						{{dataInfo.bankDepositBranch}}
+					</view>
+				</view>
+			</view>
+			<view class="wrap">
+				<view class="tips">银行卡照片</view>
+				<view class="img" v-if="dataInfo.payeeAddressUrl.length > 0">
+					<u-swiper :list="dataInfo.payeeAddressUrl" @change="e => currentNum = e.current" radius="10"
+						indicatorMode="dot" height="360" img-mode="true" :autoplay="true" @click="openDocument2">
+					</u-swiper>
+				</view>
+			</view>
+			<view class="wrap">
+				<view class="c-row ">
+					<view class="title">供应商</view>
+					<view class="con-list">
+						{{dataInfo.supplier?dataInfo.supplier:"暂无"}}
+					</view>
+				</view>
+				<view class="c-row ">
+					<view class="title">供应商电话</view>
+					<view class="con-list">
+						{{dataInfo.supplierPhone?dataInfo.supplierPhone:"暂无"}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="btn">
+			<view class="btn_left">
+				<view class="noway" @click="submit(1)">
+					驳回
+				</view>
+			</view>
+			<view class="btn_right">
+				<view class="sure" @click="submit(2)">
+					通过
+				</view>
+			</view>
+		</view>
+		<u-modal v-model="auditShow" confirm-color='#22C572' confirm-text='确定' title='提示' showCancelButton='false'
+			:content="content" @confirm="next" @cancel="cancel"></u-modal>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataInfo: {},
+				auditShow: false,
+				title: "提示",
+				content: "",
+				tips: "",
+				currentNum: "",
+				list3: [
+					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+				],
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(options) {
+			if (options.data) {
+				this.dataInfo = JSON.parse(options.data)
+				if (this.dataInfo.cardAddressUrl) {
+					this.dataInfo.cardAddressUrl = this.dataInfo.cardAddressUrl.split(",")
+				}
+				if (this.dataInfo.payeeAddressUrl) {
+					this.dataInfo.payeeAddressUrl = this.dataInfo.payeeAddressUrl.split(",")
+				}
+			}
+		},
+		methods: {
+			cancel() {
+				this.auditShow = false
+			},
+			next() {
+				if (this.tips == 1) {
+					this.reject()
+				} else if (this.tips == 2) {
+					this.adopt()
+				}
+			},
+			openDocument1(e) {
+				let imgUrl = this.dataInfo.cardAddressUrl[e]
+				uni.downloadFile({
+					url: imgUrl,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			openDocument2(e) {
+				let imgUrl = this.dataInfo.payeeAddressUrl[e]
+				uni.downloadFile({
+					url: imgUrl,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			submit(num) {
+				if (num == 1) {
+					this.tips = 1
+					this.content = "确定驳回客户信息？"
+				} else {
+					this.tips = 2
+					this.content = "确定通过客户信息？"
+				}
+				this.auditShow = true
+			},
+			reject() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/examine', {
+					id: this.dataInfo.id,
+					flag: 2,
+					examiner: uni.getStorageSync('userInfo').userName
+				}).then(res1 => {
+					uni.hideLoading()
+					this.$api.msg('驳回成功！')
+					setTimeout(function() {
+						uni.navigateBack({
+							delta: 1
+						});
+					}, 2000);
+				})
+			},
+			adopt() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$api.doRequest('post', '/identityAuthenticationInfo/api/examine', {
+					id: this.dataInfo.id,
+					flag: 1,
+					examiner: uni.getStorageSync('userInfo').userName
+				}).then(res1 => {
+					uni.hideLoading()
+					this.$api.msg('通过成功！')
+
+					setTimeout(function() {
+						uni.navigateBack({
+							delta: 1
+						});
+					}, 2000);
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.data_css {
+		margin-bottom: 220rpx;
+	}
+
+	.wrap {
+		padding-bottom: 10px;
+		font-size: 14px;
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 30rpx 30rpx;
+
+		input {
+			font-size: 14px;
+		}
+
+		.title {
+			font-size: 28rpx;
+		}
+
+		.tips {
+			font-size: 34rpx;
+			font-weight: 600;
+			border-bottom: 1px solid #EEEEEE;
+			padding-bottom: 30rpx;
+		}
+
+		.c-row {
+			display: -webkit-box;
+			display: -webkit-flex;
+			display: flex;
+			-webkit-box-align: center;
+			-webkit-align-items: center;
+			align-items: center;
+			padding: 40rpx 0;
+			position: relative;
+			border-bottom: 1px solid #EEEEEE;
+		}
+
+		.con-list {
+			-webkit-box-flex: 1;
+			-webkit-flex: 1;
+			flex: 1;
+			display: -webkit-box;
+			display: -webkit-flex;
+			display: flex;
+			-webkit-box-orient: vertical;
+			-webkit-box-direction: normal;
+			-webkit-flex-direction: column;
+			flex-direction: column;
+			color: #AFB3BF;
+			line-height: 40rpx;
+			text-align: right;
+			padding-right: 20rpx;
+		}
+	}
+
+	.btn {
+		width: 100%;
+		height: 200rpx;
+		background-color: #ffffff;
+		position: fixed;
+		bottom: 0px;
+		display: flex;
+		padding-top: 40rpx;
+
+		.btn_left,
+		.btn_right {
+			width: 50%;
+			text-align: center;
+			// line-height: 160rpx;
+			margin: 0 auto;
+		}
+
+		.noway,
+		.sure {
+			width: 80%;
+			height: 90rpx;
+			line-height: 90rpx;
+			margin: 0 auto;
+			border-radius: 45rpx;
+			font-size: 32rpx;
+		}
+
+		.sure {
+			background-color: #5C76DF;
+			color: #ffffff;
+		}
+
+		.noway {
+			background-color: #F7F8FA;
+			color: #AFB3BF;
+		}
+	}
+
+	.img {
+		width: 100%;
+		margin: 20rpx auto;
+		text-align: center;
+
+		// .img_css {
+		// 	width: 96%;
+		// 	height: 440rpx;
+		// }
+	}
+</style>

pages/erpbusiness/edit_quality_testing.vue

@@ -146,7 +146,7 @@
 					<!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
 					</view> -->
-					<view v-if='flag==4||flag==0' @click='goodsName = true'>{{gridList.goodsName}}</view>
+					<view v-if='flag==4||flag==0'>{{gridList.goodsName}}</view>
 					<view v-else>{{gridList.goodsName}}</view>
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodsPicker($event)'
 						v-model="goodsName" mode="selector">
@@ -184,7 +184,7 @@
 				<view class="con-list">
 					<view v-if='flag==4||flag==0' @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
 					<view v-else>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
-					<u-picker  @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show5"
+					<u-picker  @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show6"
 						mode="selector">
 					</u-picker>
 				</view>
@@ -237,21 +237,7 @@
 					<input :disabled='flag!=4&&flag!=0' v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-if="gridList.type == '潮粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					<input :disabled='flag==1&&pricedisabled' v-model='gridList.tidalGrainPrice'  @blur='inputprice' placeholder="自动获取,不可编辑"
-						name="input"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
-			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
-				</view>
-				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-			</view>
+			
 			<view class="c-row-fj" v-if="flag==2||flag==1">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 				<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注"
@@ -267,12 +253,7 @@
 				</view>
 
 			</view>
-			<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.dryGrainPrice}}
-				</view>
-			</view>
+			
 		</view>
 		<view v-if='flag!=3' style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -311,9 +292,9 @@
 					<view v-else class="title">蛋白</view>
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
-							name="input"></input>
-							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重"
-								name="input"></input>
+							name="input"  @input="obtainPrice"></input>
+							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重" 
+								name="input"  @input="obtainPrice"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -353,6 +334,60 @@
 						<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
 				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">水分增价（元/吨）</view>
+					<view class="con-list">
+						<input  v-model='gridList.waterPriceIncrease' @focus="pricefocus($event,1)" @blur="priceblur($event,1)" @input='deductionchange'
+							placeholder="请输入水分增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">水分扣价（元/吨）</view>
+					<view class="con-list">
+						<input  v-model='gridList.waterPriceDeduction' @focus="pricefocus($event,2)" @blur="priceblur($event,2)" @input='deductionchange'
+							placeholder="请输入水分扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">质量增价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceIncrease' @focus="pricefocus($event,3)" @blur="priceblur($event,3)" @input='deductionchange'
+							placeholder="请输入质量增价" name="input" type="digit"></input>
+					</view>
+				</view>
+				
+				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')"
+					class="c-row">
+					<view class="title">质量扣价（元/吨）</view>
+					<view class="con-list">
+						<input v-model='gridList.qualityPriceDeduction' @focus="pricefocus($event,4)"  @blur="priceblur($event,4)" @input='deductionchange'
+							placeholder="请输入质量扣价" name="input" type="digit"></input>
+					</view>
+				</view>
+				<view v-if="gridList.type == '潮粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						<input :disabled='flag==1&&pricedisabled' v-model='gridList.tidalGrainPrice'  @blur='inputprice' placeholder="自动获取,不可编辑"
+							name="input"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==3&&flag!=3" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled' type="digit"  @blur='inputprice' placeholder="请输入干粮单价" name="input"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
+				<view v-if="gridList.type == '干粮'&&gridList.serviceManagementType==1&&flag!=3" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.dryGrainPrice}}
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -491,6 +526,8 @@
 				cangid: '',
 				goodsList: [],
 				taskNolist:[],
+				dryGrainPrice:0,
+				tidalGrainPrice:0,
 				isShowAlert: false,
 				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 			}
@@ -531,6 +568,7 @@
 			this.cangid = options.cangid
 			this.warehouseName=options.warehouseName
 			this.managementType = options.managementType
+			
 			console.log(this.flag)
 			var that = this
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
@@ -544,6 +582,63 @@
 						that.value = false
 					}
 					that.gridList = data
+					if(that.gridList.type=='干粮'){
+						if (this.gridList.goodsName &&
+							this.gridList.bulkDensity &&
+							this.cangid) {
+							this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+								warehouseId: this.cangid,
+								goodsName: this.gridList.goodsName,
+								bulkDensity:this.gridList.bulkDensity
+							}).then(res => {
+								if(res.data.data != 0){
+									this.gridList.dryGrainPrice = res.data.data
+									this.dryGrainPrice = res.data.data
+									this.deductionchange()
+								}
+							})
+						}
+					}else if(that.gridList.type=='潮粮'){
+						if (
+							this.gridList.goodsName &&
+							this.gridList.waterContent &&
+							this.gridList.grade 
+						) {
+						console.log('123123')
+							this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+								warehouseId: this.cangid,
+								goodsName: this.gridList.goodsName,
+								waterContent: this.gridList.waterContent,
+								grade: this.gridList.grade,
+							}).then(res => {
+								
+								if (that.gridList.paramType == '1') {
+									// console.log(that.gridList)
+									if(that.gridList.buckleMiscellaneous){
+										that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+										.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+										.dryGrainPrice)).toFixed(4)
+										that.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+										.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+										.dryGrainPrice)).toFixed(4)
+									}
+									if (!that.gridList.tidalGrainPrice) {
+										that.gridList.tidalGrainPrice = ''
+									}
+								} else {
+									that.gridList.tidalGrainPrice = res.data.data
+									that.tidalGrainPrice = res.data.data
+								}
+								this.deductionchange()
+							})
+						}
+					}
+					// if(that.gridList.dryGrainPrice){
+					// 	that.dryGrainPrice=that.gridList.dryGrainPrice
+					// }
+					// if(that.gridList.tidalGrainPrice){
+					// 	that.tidalGrainPrice=that.gridList.tidalGrainPrice
+					// }
 					if(!that.gridList.reGrade){
 						that.gridList.reGrade=that.gridList.grade
 					}
@@ -588,8 +683,14 @@
 				warehouseId: this.cangid
 			}).then(res => {
 				if (res.data.data) {
-					this.goodsList = res.data.data
+					that.goodsList = res.data.data
+					if (that.goodsList.length > 0) {
+						that.gridList.goodsName = that.goodsList[0].goodsName
+						uni.setStorageSync('purchasePriceList', that.goodsList)
+						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
+					}
 				}
+				
 			})
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
@@ -640,6 +741,97 @@
 			}
 		},
 		methods: {
+			pricefocus(e,status){
+				console.log(e)
+				if(status==1){
+					if(e.detail.value==0){
+						this.gridList.waterPriceIncrease=''
+						
+					}
+				}else if(status==2){
+					if(e.detail.value==0){
+						this.gridList.waterPriceDeduction=''
+						
+					}
+					
+				}else if(status==3){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceIncrease=''
+						
+					}
+					
+				}else if(status==4){
+					if(e.detail.value==0){
+						this.gridList.qualityPriceDeduction=''
+						
+					}
+					
+				}
+				
+			},
+			priceblur(e,status){
+				console.log(e)
+				if(status==1){
+					if(e.detail.value==''){
+						this.gridList.waterPriceIncrease=0
+						
+					}
+				}else if(status==2){
+					if(e.detail.value==''){
+						this.gridList.waterPriceDeduction=0
+						
+					}
+					
+				}else if(status==3){
+					if(e.detail.value==''){
+						this.gridList.qualityPriceIncrease=0
+						
+					}
+					
+				}else if(status==4){
+					if(e.detail.value==''){
+						this.gridList.qualityPriceDeduction=0
+						
+					}
+					
+				}
+				
+			},
+			deductionchange(){
+				if(this.gridList.type=='干粮'){
+					if(this.dryGrainPrice!=''){
+						console.log(Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)),Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(2))
+						this.gridList.dryGrainPrice=Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}else if(this.gridList.type=='潮粮'){
+					if(this.tidalGrainPrice!=''){
+						this.gridList.tidalGrainPrice=Number(this.tidalGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3)
+					}
+					
+				}
+				this.$forceUpdate()
+			},
+			obtainPrice(){//根据容重获取价格
+				if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
+					// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
+						this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {            
+							warehouseId: this.cangid,
+							goodsName: this.gridList.goodsName,
+							bulkDensity:this.gridList.bulkDensity
+						}).then(res => {
+							if(res.data.data != 0){
+								this.gridList.dryGrainPrice = res.data.data
+								this.dryGrainPrice = res.data.data
+								this.gridList.waterPriceIncrease=0
+								this.gridList.waterPriceDeduction=0
+								this.gridList.qualityPriceIncrease=0
+								this.gridList.qualityPriceDeduction=0
+							}
+						})
+					// }
+				}
+			},
 			changeprice(){
 				if(this.pricetext=='解锁'){
 					this.pricedisabled=false
@@ -784,6 +976,18 @@
 			},
 			waterContentChange() {
 				var that = this
+				if (this.gridList.goodsName) {
+					for (var i = 0; i < this.purchasePriceList.length; i++) {
+						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
+							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
+							this.gridList.paramType = this.purchasePriceList[i].paramType
+						}
+					}
+				}
+				console.log(this.gridList.serviceManagementType)
+				if(this.gridList.serviceManagementType != 3){ //非收购入库 不需在获取价格
+					return
+				}
 				if (this.gridList.goodsName && this.cangid) {
 					if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
 						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
@@ -791,44 +995,48 @@
 							goodsName: this.gridList.goodsName
 						}).then(res => {
 							that.gridList.dryGrainPrice = res.data.data
+							that.dryGrainPrice = res.data.data
+							
 						})
 					}
 				}
-				if (this.gridList.goodsName) {
-					for (var i = 0; i < this.purchasePriceList.length; i++) {
-						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
-							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
-							this.gridList.paramType = this.purchasePriceList[i].paramType
-						}
-					}
-				}
-				var numReg = /^[0-9]*$/
-				var numRe = new RegExp(numReg)
-				//潮粮单价改变事件
-				if (
-					this.gridList.goodsName &&
-					this.gridList.waterContent &&
-					this.gridList.grade &&
-					numRe.test(this.gridList.waterContent)
-				) {
-					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
-						warehouseId: this.cangid,
-						goodsName: this.gridList.goodsName,
-						waterContent: this.gridList.waterContent,
-						grade: this.gridList.grade,
-					}).then(res => {
-						if (that.gridList.paramType == '1') {
-							that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
-								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
-								.dryGrainPrice)).toFixed(4)
-							if (!that.gridList.tidalGrainPrice) {
-								that.gridList.tidalGrainPrice = ''
+				that.gridList.waterPriceIncrease=0
+				that.gridList.waterPriceDeduction=0
+				that.gridList.qualityPriceIncrease=0
+				that.gridList.qualityPriceDeduction=0
+					//潮粮单价改变事件
+					if (
+						this.gridList.goodsName &&
+						this.gridList.waterContent &&
+						this.gridList.grade 
+					) {
+					console.log('123123')
+						this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
+							warehouseId: this.cangid,
+							goodsName: this.gridList.goodsName,
+							waterContent: this.gridList.waterContent,
+							grade: this.gridList.grade,
+						}).then(res => {
+							
+							if (that.gridList.paramType == '1') {
+								// console.log(that.gridList)
+								if(that.gridList.buckleMiscellaneous){
+									that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+									.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+									.dryGrainPrice)).toFixed(4)
+									that.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
+									.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+									.dryGrainPrice)).toFixed(4)
+								}
+								if (!that.gridList.tidalGrainPrice) {
+									that.gridList.tidalGrainPrice = ''
+								}
+							} else {
+								that.gridList.tidalGrainPrice = res.data.data
 							}
-						} else {
-							that.gridList.tidalGrainPrice = res.data.data
-						}
-					})
-				}
+						})
+					}
+				
 			},
 			goodsPicker(e) {
 				this.gridList.goodsName = this.goodsList[e[0]].goodsName
@@ -836,6 +1044,11 @@
 			submit() {
 				this.$delete(this.gridList,'status')
 				this.gridList.agent=this.userInfo.userName;
+
+				// if(!this.$u.test.isEmpty(this.gridList.tidalGrainPrice)){
+				// 	this.gridList.tidalGrainPrice=''
+				// 	return
+				// }
 				if(this.flag==3){
 					this.gridList.statusFlag=7
 				}else if(this.flag==4||this.flag==0){
@@ -1014,6 +1227,7 @@
 								that.$api.doRequest('post',
 									'/qualityInspectionManagement/api/editQualityInspection', that.gridList)
 								.then(res => {
+									uni.setStorageSync("quality_print", that.gridList)
 									that.gridList.id=kid
 									that.gridList.statusFlag=1
 									that.$api.doRequest('post',
@@ -1023,7 +1237,7 @@
 									if (res.data.code == 200) {
 										that.$api.msg('编辑质检成功')
 										that.gridList.warehouseId = that.cangid
-										uni.setStorageSync("quality_print", that.gridList)
+										
 										console.log('that.gridList', that.gridList)
 										if(that.utils.getCurrectRoles('acquisitionQuality.initial')){
 											that.isShowPrint = true
@@ -1051,6 +1265,7 @@
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				this.gridList.reGrade = this.gradeList[e[0]].value
 				this.gridList.reGradeKey = this.gradeList[e[0]].key
+
 			},
 			binNumberpicker(e) {
 				this.gridList.binNumber = this.warehouseList[e[0]].binNumber

pages/erpbusiness/examine_quality_testing.vue

@@ -119,18 +119,7 @@
 				</view>
 			</view>
 			
-			<view v-if="gridList.type == '潮粮'" class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.tidalGrainPrice}}
-				</view>
-			</view>
-			<view v-if="gridList.type == '干粮'" class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
-				<view class="con-list">
-					{{gridList.dryGrainPrice}}
-				</view>
-			</view>
+			
 			<view class="c-row ">
 				<view class="title">运输方式</view>
 				<view class="con-list">
@@ -233,6 +222,43 @@
 						<view>{{gridList.reJiaorenli}}</view>
 					</view>
 				</view>
+				<view class="c-row">
+					<view class="title">水分增价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.waterPriceIncrease}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">水分扣价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.waterPriceDeduction}}
+					</view>
+				</view>
+				<view class="c-row">
+					<view class="title">质量增价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.qualityPriceIncrease}}
+					</view>
+				</view>
+				
+				<view class="c-row">
+					<view class="title">质量扣价（元/吨）</view>
+					<view class="con-list">
+						{{gridList.qualityPriceDeduction}}
+					</view>
+				</view>
+				<view v-if="gridList.type == '潮粮'" class="c-row">
+					<view class="title">净重单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.tidalGrainPrice}}
+					</view>
+				</view>
+				<view v-if="gridList.type == '干粮'" class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						{{gridList.dryGrainPrice}}
+					</view>
+				</view>
 			</view>
 		</view>
 

pages/erpbusiness/index.vue

@@ -99,9 +99,7 @@
 						tips: 0,
 						url: '/pages/erpbusiness/quality_testing?managementType=1',
 						show: true
-					},
-
-					{
+					},{
 						num: 2,
 						// name: '入库检斤',
 						name: '收购检斤',
@@ -110,10 +108,7 @@
 						tips: 0,
 						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
 						show: true
-					}
-,
-
-					{
+					},{
 						num: 3,
 						name: '收购信息',
 						// icon: 'cuIcon-copy',
@@ -121,6 +116,14 @@
 						tips: 0,
 						url: '/pages/erpbusiness/acquisitionInformation',
 						show: true
+					},{
+						num: 4,
+						name: '客户审核',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/customerAudit.png',
+						tips: 0,
+						url: '/pages/erpbusiness/customerAudit',
+						show: true
 					}
 					// {
 					// 	num: 5,
@@ -327,8 +330,7 @@
 						this.gridList[i].show = this.getRoles('acquisitionQuality.view')
 					} else if (i == 2) {
 						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
-					}
-					else if (i == 3) {
+					} else if (i == 3) {
 						this.gridList[i].show = this.utils.getRoles('acquisitionInfor.view')
 					}
 				}

pages/erpbusiness/quality_testing.vue

@@ -77,6 +77,8 @@
 						@click.stop='edit(item,1)' class='button'>复检</view>
 					<view v-if='getRoles("acquisitionQualityOut.edit")&&item.status=="已称毛重"&&managementType==3'
 						@click.stop='quality_testing(item)' class='button'>质检</view>
+					<view v-if='item.status!="待初检"&&managementType==1'
+						@click.stop='print(item)' class='button'>小票</view>
 				</view>
 			</view>
 			<!-- <view class='wrap' v-for='item in gridList' @click='examine(item)'>
@@ -276,6 +278,13 @@
 			})
 		},
 		methods: {
+			print(item){
+				
+				uni.setStorageSync("quality_print", item)
+				uni.navigateTo({
+					url: '/pages/erpbusiness/bleConnect'
+				})
+			},
 			clickstatus(status){
 				this.statusType=status
 				this.getList(true)

pages/erpbusiness/sm/sm.vue

@@ -130,6 +130,7 @@
 				this.show = false
 				this.show1 = true
 				this.companyId = uni.getStorageSync('pcUserInfo').compId
+				
 				this.userName = uni.getStorageSync('userInfo').userName.split("-")[1]
 				if (this.companyId == this.compId) {
 					this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
@@ -259,7 +260,9 @@
 			},
 			//粮商认证
 			toGrainMerchantCertification() {
+				
 				var that = this
+				console.log(that.user.companyId)
 				// url: `/pageA/product/list?keywords=${key}&TabCur=${TabCur}`
 				uni.navigateTo({
 					url: `/pageD/identity/companyIdentity?status=1&compId=${that.user.companyId}&ids=${that.user.title}`,

pages/grain_pulse/enter.vue

@@ -78,14 +78,14 @@
 							:customBtnWidth='custombtnwidth' customBack='#F9FAFE' :customBtnImage="custombtnimage"
 							:customBtn='custombtn' :custom="uploadCustom"></upload>
 					</view>
-					<view v-if="license2 != ''">
+					<!-- <view v-if="license2 != ''">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 							:size-type="['compressed']" @on-success="getImgUrl1" @on-uploaded="isAdd = true"
 							:before-upload="filterFileType" :options="uploadOptions1" customBack='#FEF9FA'
 							customBorder='2px dashed #F9D5DC' customBtnFontSize="14" customBtnColor="#6A7282"
 							:customBtnHeight='custombtnheight' :customBtnWidth='custombtnwidth'
 							:customBtnImage="custombtnimage" :customBtn='custombtn' :custom="uploadCustom"></upload>
-					</view>
+					</view> -->
 				</view>
 			</view>
 			<!-- :disabled="true" -->
@@ -359,10 +359,10 @@
 					this.$api.msg('封面照片不能为空')
 					return
 				}
-				if (!this.deptList.licenseAddress) {
-					this.$api.msg('营业执照不能为空')
-					return
-				}
+				// if (!this.deptList.licenseAddress) {
+				// 	this.$api.msg('营业执照不能为空')
+				// 	return
+				// }
 				if (this.deptList.compName.length < 2 || this.deptList.compName.length > 25) {
 					this.$api.msg('公司名称输入错误')
 					return

pages/leave/the_leave.vue

@@ -38,7 +38,7 @@
 				</view>
 				<view style='position:relative;' class="wrap no-boder">
 					<u-input class='textarea' v-model="detailData.reasonForLeave" :type="type" :border="border"
-						:height="height" :auto-height="autoHeight" />
+						:height="height" :auto-height="autoHeight" maxlength="100" />
 					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>
 						{{detailData.reasonForLeave.length}}/100个字
 					</view>
@@ -143,6 +143,7 @@
 				show: false,
 				show1: false,
 				show2: false,
+				isFreeTime: true,
 				detailData: {
 					leaveType: '选择请假类型',
 					reasonForLeave: "",
@@ -172,7 +173,18 @@
 						leaveType: "病假"
 					},
 				],
-
+				startDate:"",
+				endDate:"",
+				beginTime:"",
+				endTime:"",
+				days:"",
+				hours:"",
+				date:"",
+				stWorkTime:"",
+				enWrokTime:"",
+				freeTimeMon:"",
+				freeTimeAft:"",
+				freeTime:"",
 			}
 		},
 		onReachBottom() { //上拉触底函数
@@ -247,21 +259,127 @@
 					this.detailData.leaveTypeKey = "3"
 				}
 			},
+			/**
+			 * 计算请假时长
+			 * beginTime    开始时间
+			 * endTime      结束时间
+			 * stWorkTime   上班时间
+			 * enWrokTime   下班时间
+			 * isFreeTime  是否要去除午休工作时长
+			 * freeTimeMon  午休开始时间
+			 * freeTimeAft  午休结束时间
+			 * 
+			 */
 			dateChange(e) {
 				this.detailData.startDate = e.year + "-" + e.month + "-" + e.day + " " + e.hour + ":" + e.minute
-				// this.startDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
-				// + ":" + "00"
+			},
+			diffDay(earlyDate,lastDate){
+			    return (Date.parse(lastDate) - Date.parse(earlyDate))/1000/60/60/24 +1;
 			},
 			dateChange1(e) {
 				this.detailData.endDate = e.year + "-" + e.month + "-" + e.day + " " + e.hour + ":" + e.minute
-				var endtime = new Date(this.detailData.endDate)
-				var starttime = new Date(this.detailData.startDate)
-				console.log(endtime - starttime)
-				this.detailData.leaveDuration = Math.floor((endtime - starttime) / (3600 * 1000))
+				var days;
+				var hours;
+				var date;
+				var freeTimeAft =13 ;
+				var freeTimeMon = 12;
+				var stWorkTime = 8;
+				var enWrokTime = 17;
+				var isFreeTime = true;
+				var freeTime = freeTimeAft - freeTimeMon;
+
+				var beginTime = (this.detailData.startDate).replace(/-/g, '/');
+				var beginArr = beginTime.split(" ");
+				var beginMonth = parseInt(beginArr[0].split("/")[1]);
+				var beginDay = parseInt(beginArr[0].split("/")[2]);
+				var beginHours = parseInt(beginArr[1].split(":")[0]);
+				var beginMin = parseInt(beginArr[1].split(":")[1]);
+				var beginHoursMin = beginHours + beginMin / 60;
+
+				var endTime = (this.detailData.endDate).replace(/-/g, '/');
+				var endArr = endTime.split(" ");
+				var endMonth = parseInt(endArr[0].split("/")[1]);
+				var endDay = parseInt(endArr[0].split("/")[2]);
+				var endHours = parseInt(endArr[1].split(":")[0]);
+				var endMin = parseInt(endArr[1].split(":")[1]);
+				var endHoursMin = endHours + endMin / 60;
+				//如果beginHoursMin时间小于上班时间都算上班时间
+				if (beginHoursMin <= stWorkTime) {
+					beginHoursMin = stWorkTime;
+				}
+				//如果endHoursMin时间大于上班时间都算下班时间
+				if (endHoursMin >= enWrokTime) {
+					endHoursMin = enWrokTime;
+				}
+				//如果开始时间在freeTimeMon和freeTimeAft之间都算freeTimeAft
+				if (isFreeTime == true) {
+					if (beginHoursMin >= freeTimeMon && beginHoursMin <= freeTimeAft) {
+						beginHoursMin = freeTimeAft;
+					}
+				}
+				//如果结束时间在freeTimeMon和freeTimeAft之间都算freeTimeMon
+				if (isFreeTime == true) {
+					if (endHoursMin >= freeTimeMon && endHoursMin <= freeTimeAft) {
+						endHoursMin = freeTimeMon;
+					}
+				}
+				//获取结束时间-开始时间的天数
+				var daysBetween = this.diffDay(beginTime.substring(0, 10), endTime.substring(0, 10));
+				if (daysBetween > 0) {
+					 var hour = enWrokTime - stWorkTime - freeTime;
+					if (daysBetween == 1) {
+						//同一天
+						if(beginHoursMin < freeTimeMon && endHoursMin > freeTimeAft){
+							hours = (endHoursMin) - (beginHoursMin) - freeTime;
+						}else{
+							hours = endHoursMin - beginHoursMin;
+						}
+					} else if (daysBetween == 2) {
+						//跨一天   
+						//第一天的时长
+						hours = enWrokTime - beginHoursMin;
+						//是否有午休         
+						if (beginHoursMin <= freeTimeMon)
+							hours = hours - freeTime;
+						//第二天的时长    
+						hours += endHoursMin - stWorkTime;
+						//是否有午休 
+						if (endHoursMin >= freeTimeAft)
+							hours = hours - freeTime;
+
+					} else {
+						//跨两天以上 
+						//第一天的时长
+						hours = enWrokTime - beginHoursMin;
+						//是否有午休             
+						if (beginHoursMin <= freeTimeMon)
+							hours = hours - freeTime;
+						//中间时长
+						hours += (daysBetween - 2) * (hour);
+						//最后一天时长
+						hours += endHoursMin - stWorkTime;
+						//是否有午休 
+						if (endHoursMin >= freeTimeAft)
+							hours = hours - freeTime;
+					}
+					days = Math.floor(hours / hour);
+					hours = hours % hour;
+					date = {
+						"days": days,
+						"hours": hours
+					};
+				}
+				this.detailData.leaveDuration = Math.round((date.days * 8 + date.hours) * 10) /10
+				return date;
+				// var endtime = new Date(this.detailData.endDate)
+				// var starttime = new Date(this.detailData.startDate)
+				// console.log(endtime - starttime)
+				// this.detailData.leaveDuration = Math.floor((endtime - starttime) / (3600 * 1000))
 				// this.endDate1 = e.year + "-" + e.month + "-" + e.day + "-" + e.hour + "-" + e.minute + "-" + e.second
+			
 			},
 			submit() {
-				if (!this.detailData.leaveType) {
+				if (!this.detailData.leaveType || this.detailData.leaveType == '选择请假类型') {
 					this.$api.msg('请假类型不能为空')
 					return
 				}
@@ -269,7 +387,7 @@
 					this.$api.msg('请选择请假开始时间')
 					return
 				}
-				if (!this.detailData.endDate) {
+				if (!this.detailData.endDate || this.detailData.endDate == '选择结束时间') {
 					this.$api.msg('请选择请假结束时间')
 					return
 				}

pages/leave/the_leave_record.vue

@@ -4,7 +4,7 @@
 		<view class='wrap' v-for="(item, index) in tableData" :key="index">
 			<view class="wenzi audit1" v-if="item.approveStatus == '待人事审核' || item.approveStatus == '待主管审核' ">审核中</view>
 			<view class="wenzi audit2" v-if="item.status == '已通过'">已通过</view>
-			<view class="wenzi audit3" v-if="item.status == '未通过'">未通过</view>
+			<view class="wenzi audit3" v-if="item.status == '已驳回'">未通过</view>
 			<view class="c-row">
 				<view class="title">请假类型 : {{item.leaveType}}</view>
 			</view>

pages/oa_office/the_oaOffice.vue

@@ -91,7 +91,16 @@
 						tips: 0,
 						url: `/pages/reimbursement/the_reimbursement`,
 						show: true
-					}
+					},
+					// {
+					// 	num: 5,
+					// 	name: '申请审批',
+					// 	// icon: 'cuIcon-edit',
+					// 	src: '../../static/img/oa_office/shneqingshenpi.png',
+					// 	tips: 0,
+					// 	url: `/pages/universalityAudit/list`,
+					// 	show: true
+					// }
 				],
 
 			}

pages/public/login.vue

@@ -121,7 +121,7 @@
 				})
 			},
 			gocode(){
-				if(this.phone.length==11 && /^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)){
+				if(this.phone.length==11 && /^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(this.phone)){
 					uni.navigateTo({
 						url:'/pages/public/code?phone='+this.phone
 					})

pages/public/login_account_number.vue

@@ -119,27 +119,27 @@
 								helper.getListByUserId()
 							}
 							else{
-								that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '14444444444',
-								veriCode: "123456",}).then(res2 => {
-									uni.setStorageSync('pcUserInfo', res2.data.data)
-									helper.getListByUserId()
-								})
+								// that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '14444444444',
+								// veriCode: "123456",}).then(res2 => {
+								// 	uni.setStorageSync('pcUserInfo', res2.data.data)
+								// 	helper.getListByUserId()
+								// })
 							}
+							that.$store.commit('login', res.data.data)
+							var name = 'userInfo';
+							var value = res.data.data;
+							that.$store.commit('$uStore', {
+								name,
+								value
+							});
+							// that.liangxinLogin()
 							
+							uni.switchTab({
+								url: '/pages/sale/information'
+							});
+							uni.hideLoading()
 						})
-						that.$store.commit('login', res.data.data)
-						var name = 'userInfo';
-						var value = res.data.data;
-						that.$store.commit('$uStore', {
-							name,
-							value
-						});
-						// that.liangxinLogin()
 						
-						uni.switchTab({
-							url: '/pages/sale/information'
-						});
-						uni.hideLoading()
 					}else{
 						uni.hideLoading()
 						uni.showToast({

pages/public/register.vue

@@ -153,7 +153,7 @@
 			},
 			getcode() {
 				var that = this
-				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
+				if (/^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(this.phone)) {
 					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
 							phone: this.phone
 						}).then(res => {

pages/reimbursement/get_request_funds.vue

@@ -15,6 +15,12 @@
 					<view>{{detailData.warehouseName}}</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.purpose == '库点费用'">
+				<view class="title">类型</view>
+				<view class="con-list">
+					<view>{{detailData.wareExpenseType}}</view>
+				</view>
+			</view>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
 				<view class="title">合同编号</view>
 				<view class="con-list">
@@ -27,6 +33,18 @@
 					<view>{{detailData.expenseName}}</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.expensesType == '2'">
+				<view class="title">付款方名头</view>
+				<view class="con-list">
+					<view>{{detailData.payerHeader}}</view>
+				</view>
+			</view>
+			<view class="c-row" v-if="detailData.purpose == '经营性费用' && detailData.expensesType == '2'">
+				<view class="title">所属名头</view>
+				<view class="con-list">
+					<view>{{detailData.belongName}}</view>
+				</view>
+			</view>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
 				<view class="con-list">
@@ -44,43 +62,63 @@
 				</view>
 			</view>
 			<view class="c-row">
-				<view class="title">附件（选填）</view>
+				<view class="title">附件</view>
 			</view>
-			<view style="display: flex;flex-wrap: wrap;">
-
+			<view>
 				<view v-if='imglist2.length>0'>
-					<view style="justify-content: space-between;margin-top: 20rpx;display: flex;" v-for='item in imglist2'>
-						<view class="" style="display: flex;">
-							<image
-								v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/pdf3.png" mode="">
-							</image>
-							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/excle3.png" mode="">
-							</image>
-							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/word3.png" mode="">
-							</image>
-							<image v-else style="width: 80px; height: 80px;" :src="item.appendixPath" mode=""></image>
-						</view>
-						<!-- 	<view class="" style="justify-content: space-between;margin-top: 20rpx;display: flex;" v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'">
-							<image class="upload" src="../../static/img/oa_office/pdf.png" mode=""></image>
-							<view style="max-width:60%;word-break: break-word">
-								{{item.appendixName}}
+					<view style="margin-top: 20rpx;" v-for='item in imglist2'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
+								</image>
 							</view>
-							<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
-								点击下载
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
 							</view>
-						</view> -->
-						<!-- <view  v-else style="margin-left: 20rpx;display: flex;flex-wrap: wrap;"> -->
-						<!-- <image else :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image> -->
-						<!-- </view> -->
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+							<view class="img_dowload" @click="openDocument(item)">下载</view>
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view v-if="detailData.expensesType == '2'" class='wrap margin-bottom'>
+			<view class="xinxi"  style="font-size: 28rpx; ">收款账户信息</view>
+			<view class="c-row">
+				<view class="title">收款方</view>
+				<view class="con-list">
+					<view>{{detailData.payee}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">账户</view>
+				<view class="con-list">
+					<view>{{detailData.accountNumber}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户行</view>
+				<view class="con-list">
+					<view>{{detailData.bank}}</view>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户支行</view>
+				<view class="con-list">
+					<view>{{detailData.bankBranch}}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -127,7 +165,6 @@
 								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
-						console.log(res)
 					})
 				},
 				deep: true
@@ -289,4 +326,30 @@
 		width: 80rpx;
 		height: 80rpx;
 	}
+
+	.char_css {
+		font-size: 30rpx;
+		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_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

pages/reimbursement/request_funds.vue

@@ -22,6 +22,17 @@
 					</view>
 				</view>
 			</view>
+			<view class="c-row" v-if="detailData.purpose == '库点费用'">
+				<view class="title">类型</view>
+				<view class="con-list">
+					<view @click='show2=true'>{{detailData.wareExpenseType?detailData.wareExpenseType:"请选择类型"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+				</view>
+			</view>
+			<u-picker :range="typeList" range-key="value" @confirm='typeCheck($event)' v-model="show2"
+				mode="selector">
+			</u-picker>
 			<view class="c-row" v-if="detailData.purpose == '合同费用'">
 				<view class="title">合同编号</view>
 				<view class="con-list">
@@ -36,6 +47,23 @@
 					<input v-model='detailData.expenseName' placeholder="输入费用名称,1-15个字"></input>
 				</view>
 			</view>
+			<view v-if="reType == 2 || expensesType == '2'" class="c-row">
+				<view class="title">付款方名头</view>
+				<view class="con-list">
+					<input v-model='detailData.payerHeader' maxlength='25' placeholder="输入付款方名头"></input>
+				</view>
+			</view>
+			<view v-show="reType == 2&&detailData.purpose=='经营性费用' || expensesType == '2'&&detailData.purpose=='经营性费用'" class="c-row">
+				<view class="title">所属名头</view>
+				<view class="con-list">
+					<view @click='show1=true'>{{detailData.belongName?detailData.belongName:"请选择所属名头"}}
+						<u-icon name="arrow-right" color=""></u-icon>
+					</view>
+				</view>
+			</view>
+			<u-picker :range="namelist" range-key="name" @confirm='confirmname($event)' v-model="show1"
+				mode="selector">
+			</u-picker>
 			<view class="c-row">
 				<view class="title">金额（元）</view>
 				<view class="con-list">
@@ -64,7 +92,7 @@
 					<view class="delete_img" @click="deleteImg(index)">X</view>
 					<image :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image>
 				</view>
-				<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 9">
+				<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 30">
 					<view class="tubiao">
 						<image class="upload" src="../../static/img/oa_office/upload.png" mode="">
 						</image>
@@ -75,6 +103,33 @@
 				</view>
 			</view>
 		</view>
+		<view v-if="reType == 2 || expensesType == '2'" class='wrap margin-bottom'>
+			<view class="xinxi"  style="font-size: 28rpx; ">收款账户信息</view>
+			<view class="c-row">
+				<view class="title">收款方</view>
+				<view class="con-list">
+					<input v-model='detailData.payee' placeholder="输入收款方"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">账户</view>
+				<view class="con-list">
+					<input v-model='detailData.accountNumber' placeholder="输入账户"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户行</view>
+				<view class="con-list">
+					<input v-model='detailData.bank' placeholder="输入开户行"></input>
+				</view>
+			</view>
+			<view class="c-row">
+				<view class="title">开户支行</view>
+				<view class="con-list">
+					<input v-model='detailData.bankBranch' placeholder="输入开户支行"></input>
+				</view>
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 		<view class="bottom-btn">
 			<view @click="submit()" class="btn">提交</view>
@@ -88,10 +143,12 @@
 		data() {
 			return {
 				show: false,
+				show2:false,
 				showWare: false,
 				detailData: {
 					purpose: '库点费用',
 					remark: "",
+					wareExpenseType:'杂费',
 					warehouseName: '选择仓库',
 					expenseName: '',
 					amountMoney: '',
@@ -105,6 +162,7 @@
 					totalDistribution: '0',
 				},
 				fileList1: [],
+				show1:false,
 				warehouseType: '1',
 				typeRemark: 'textarea',
 				border: true,
@@ -122,6 +180,41 @@
 						purpose: "经营性费用"
 					},
 				],
+				typeList:[
+					{value: "杂费"},
+					{value: "电费"},
+					{value: "煤费"},
+					{value: "人工费"},
+				],
+				namelist:[{
+						name: "黑龙江中天昊元贸易有限公司"},
+					{name: "中天昊元-建发合营"},
+					{name: "中天昊元-六水香合营"},
+					{name: "中天昊元-昊友合营"},
+					{name: "黑龙江中天昊元贸易有限公司辽宁分公司"},
+					{name: "黑龙江众利合粮食贸易有限公司"},
+					{name: "黑龙江欣洋粮食贸易有限公司"},
+					{name: "黑龙江启兴粮食贸易有限公司"},
+					{name: "黑龙江鑫满仓粮食贸易有限公司"},
+					{name: "黑龙江谷香粮食贸易有限公司"},
+					{name: "黑龙江益储益运粮食贸易有限公司"},
+					{name: "黑龙江海天粮食农业发展有限公司"},
+					{name: "黑龙江中天绿粮供应链管理有限公司"},
+					{name: "中天昊元（海南）国际贸易有限公司"},
+					{name: "克东县嘉达建筑装潢有限责任公司"},
+					{name: "克东县金博粮食有限公司"},
+					{name: "克东县安正商贸有限公司"},
+					{name: "克东县万祥农业科技开发有限公司"},
+					{name: "克东县万润运输有限公司"},
+					{name: "黑龙江大金仓农业科技有限公司"},
+					{name: "克东县华祥通讯管线工程有限公司"},
+					{name: "黑龙江峰海粮食贸易有限公司(季度报 增值税季度）"},
+					{name: "黑龙江鑫宝仓粮食贸易有限公司"},
+					{name: "黑龙江中仓粮食贸易有限公司"},
+					{name: "黑龙江晟鸿泰粮食贸易有限公司"},
+					{name: "黑龙江新粮仓粮食贸易有限公司"},
+					{name: "齐齐哈尔米林设备制造有限公司"},
+				],
 				reType: "",
 				flag: "",
 				warehouseInfo: {},
@@ -131,6 +224,11 @@
 		onLoad(options) {
 			this.reType = options.reType
 			this.expensesType = options.expensesType
+			if(this.reType==2||this.expensesType==2){
+				uni.setNavigationBarTitle({
+						title: '请款'
+					});
+			}
 			this.id = options.id
 			if (this.id) {
 				this.getRequest()
@@ -148,7 +246,16 @@
 			if (this.contractNoInfo && this.detailData.purpose == "合同费用") {
 				this.detailData.contractId = this.contractNoInfo.id
 				this.detailData.contractNo = this.contractNoInfo.contractNo
-				this.$forceUpdate()
+				this.$api.doRequest('get', 'customerInfo/getPayeeInfo', {
+					contractNo: this.detailData.contractNo
+				}).then(res => {
+					this.detailData.payee=res.customerType=="企业客户"?res.compName:res.customerName
+					this.detailData.accountNumber=res.bankCard
+					this.detailData.bank=res.bankDeposit
+					this.detailData.bankBranch=res.bankDepositBranch
+					this.$forceUpdate()
+				})
+				
 			}
 		},
 		watch: {
@@ -164,20 +271,36 @@
 			}
 		},
 		methods: {
+			typeCheck(e){
+				this.detailData.wareExpenseType=this.typeList[e[0]].value
+			},
 			afterRead(e) {
 				console.log(e)
 			},
-			uploadClick() {
+			async uploadClick() {
 				let baseUrlNew = config.def().baseUrlNew
+				console.log('baseUrlNew',baseUrlNew)
 				uni.chooseImage({
+					count:10,
 					success: (chooseImageRes) => {
-						let a = chooseImageRes.tempFiles
-						uni.uploadFile({
+						console.log('chooseImageRes',chooseImageRes)
+						let files = []
+						for (let item of chooseImageRes.tempFiles) {
+							files.push({
+								name: 'fileName',
+								url : item.path
+							});
+						}
+						console.log(files)
+						for (let i = 0; i < files.length; i++) {
+							uni.uploadFile({
 							url: baseUrlNew + 'appendix/api/uploadFiles',
 							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
-							files: a,
+							// files: files[i],
+							filePath:files[i].url,
+							name:files[i].name,
 							formData: {
-								fileName: chooseImageRes.tempFiles[0],
+								// fileName: chooseImageRes.tempFiles[0],
 								companyId: "2710b21efc1e4393930c5dc800010dc4",
 								modelId: '',
 								vesselId: '',
@@ -193,8 +316,14 @@
 									console.log(res)
 								})
 								console.log(uploadFileRes.data);
+							},
+							fail(res) {
+								
+								console.log(res);
 							}
 						});
+						}
+						
 					}
 				});
 			},
@@ -220,9 +349,16 @@
 					this.detailData.expensesPurpose = "5"
 					delete this.detailData.warehouseName
 					delete this.detailData.contractNo
+					if(this.reType == 2){
+						this.show1 = true
+					}
+					
 				}
 				console.log(this.detailData)
 			},
+			confirmname(e) {
+				this.detailData.belongName = this.namelist[e[0]].name
+			},
 			selectCon() {
 				uni.navigateTo({
 					url: '/pages/reimbursement/selectContract'
@@ -246,6 +382,12 @@
 					this.$api.msg('请选择合同编号')
 					return
 				}
+				if (this.expensesType == '2') {
+					if(!this.detailData.payerHeader){
+						this.$api.msg('付款方不能为空')
+						return
+					}
+				}
 				if (!this.detailData.amountMoney) {
 					this.$api.msg('金额不能为空')
 					return
@@ -289,9 +431,9 @@
 									if (res.data.code == 200) {
 										uni.hideLoading()
 										that.$api.msg('提交成功')
-										uni.navigateTo({
-											url: '/pages/reimbursement/the_reimbursement'
-										})
+										uni.navigateBack({
+											delta: 1
+										});
 									} else {
 										that.$api.msg('提交失败')
 									}
@@ -472,4 +614,7 @@
 		display: flex;
 		justify-content: center;
 	}
+	.margin-bottom{
+		margin-bottom:84px;
+	}
 </style>

pages/reimbursement/selectContract.vue

@@ -45,7 +45,6 @@
 			this.newSelectList =  uni.getStorageSync('reContractNoList');
 		},
 		onLoad(options) {
-			this.flag = options.flag
 			this.compId = helper.erpWarehouse.compId 
 			this.getContractNoList()
 		},
@@ -81,35 +80,16 @@
 				});
 			},
 			getContractNoList() {
-				if(this.flag){
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						compId: this.compId,
-						flag: 5,
-						
-					}).then(res => {
-						if (res.data.code == 200) {
-							this.moreList = res.data.data
-							this.newList = res.data.data
-						}
-					})
-				}else{
+
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						compId: this.compId,
-						flag: 7,
+						flag: 11,
 					}).then(res => {
 						if (res.data.code == 200) {
 							this.newList = res.data.data
-						}
-					})
-					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-						compId: this.compId,
-						flag: 6,
-					}).then(res => {
-						if (res.data.code == 200) {
 							this.moreList = res.data.data
 						}
 					})
-				}
 			},
 		}
 	}

pages/reimbursement/the_reimbursement.vue

@@ -39,9 +39,9 @@
 					<!-- v-if="item.status == '已驳回'" -->
 					<!-- v-if="item.status == '已驳回'" -->
 					<view class="wenzi1 audit" @click="deleExpense(item)"
-						v-if="!item.approveStatus||item.status=='已完成'">删除</view>
+						v-if="item.status=='已驳回'">删除</view>
 					<view class="wenzi1 audit" @click="requestFunds(3,item)"
-						v-if="item.approveStatus=='待内勤审核'&&item.status!='已完成'&&item.status!='已付款'">编辑</view>
+						v-if="item.status=='已驳回'">编辑</view>
 					<view class="wenzi1 audit" @click="getRequestFunds(1,item)">查看</view>
 				</view>
 			</view>
@@ -101,6 +101,7 @@
 					pageSize: this.pageSize,
 					currentPage: this.currentPage,
 					compId: uni.getStorageSync('pcUserInfo').compId,
+					createUserId : uni.getStorageSync('userInfo').id
 				}).then(res => {
 					if (res.data.code == 200) {
 						uni.hideLoading()

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -25,6 +25,7 @@
 			<u-form :model="OutList" ref="uForm">
 				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
 					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
+					<u-input v-model="retreatList.inOutType" input-align="right" disabled v-else-if="retreatList.inOutType" />
 					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
 				<view v-if="retreatList.judge == 3">
@@ -35,6 +36,8 @@
 							<view class="left">编号</view>
 							<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
 						</view>
+						
+						
 						<view class='row'>
 							<view class="left">仓库</view>
 							<view class="right">{{retreatList.warehouseName}}</view>
@@ -71,6 +74,7 @@
 							<view class="left">收货人</view>
 							<view class="right">{{retreatList.agent}}</view>
 						</view>
+
 					</view>
 					<view class="uForm_item">
 						<u-form-item label="品级" prop="grade" label-width="150">
@@ -86,6 +90,10 @@
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
 							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
 						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
+							<u-input v-model="retreatList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" disabled />
+						</u-form-item>
 						<u-form-item v-if='!retreatList.status' label="单价(元/吨)" prop="unitPrice" label-width="160">
 							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
 						</u-form-item>
@@ -247,7 +255,7 @@
 						流程
 					</view>
 					<view v-for="(item,index) in auditList" :key='index' class="audit">
-						<view class="row">
+						<view class="row"  v-if='item.desc!="_PLACEHOLDER_"'>
 							<view class="left">
 								<view class="item1">
 									<view class="item-content">{{item.operatorTitle}}</view> 
@@ -297,7 +305,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="row-line" :style='[{"height":item.auditMind?"80px":"40px"}]' v-if="index!= auditList.length - 1"></view>
+						<view class="row-line" :style='[{"height":item.auditMind?"80px":"40px"}]' v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 					</view>
 				</view>
 			</u-form>
@@ -312,10 +320,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -396,9 +404,10 @@
 				item.showflow=!item.showflow
 			},
 			getList() {
+				var that =this
 				uni.showLoading({
 					title:'加载中',
-					mask:true
+					mask:true,
 				})
 				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
 					id: this.id
@@ -448,95 +457,97 @@
 								}
 								})
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'INOUTTASK-TASK-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
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'INOUTTASK-TASK-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.jointVentureParties?that.list.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
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}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='大光'
+											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{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												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=''
 											}
-											
-											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)
-								this.auditList = response.data.data
-								var time2=new Date(this.list.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle:this.list.creater.substring(0,2),
-									operatorName:this.list.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									console.log(response.data.data)
+									this.auditList = response.data.data
+									var time2=new Date(this.list.createDate).getTime()
+									var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle:this.list.creater.substring(0,2),
+										operatorName:this.list.creater,
+										updateDate:time3,
+										auditMind:'',
+										desc:'发起申请',
+										showflow:false,
+										commonStaffs1:null,
+										commonStaffs:null,
+										workflowHistoricTasks:[],
+										status:'success'
+									})
 								})
-							})
+							})	
 						})
 					}
 				})
@@ -660,7 +671,7 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
 										auditMind: that.auditMind,
@@ -738,7 +749,7 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
+						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.auditMind,
@@ -1185,7 +1196,7 @@
 	}
 	.content2 {
 		background: white;
-		margin: 20rpx 10px;
+		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
 	
@@ -1195,98 +1206,118 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
-			width: 2px;
+			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;

pages/task/audit/Issueandreceipt_task_details.vue

@@ -25,6 +25,7 @@
 			<u-form :model="OutList" ref="uForm">
 				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
 					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
+					<u-input v-model="retreatList.inOutType" input-align="right" disabled v-else-if="retreatList.inOutType" />
 					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
 				<view v-if="retreatList.judge == 3 && retreatList">
@@ -84,6 +85,10 @@
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
 							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" disabled />
 						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
+							<u-input v-model="retreatList.businessDescribe" input-align="left" placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150" disabled />
+						</u-form-item>
 						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
 							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" disabled />
 						</u-form-item>
@@ -245,7 +250,7 @@
 						流程
 					</view>
 					<view v-for="(item,index) in auditList" :key='index' class="audit">
-						<view class="row">
+						<view class="row"  v-if='item.desc!="_PLACEHOLDER_"'>
 							<view class="left">
 								<view class="item1">
 									<view class="item-content">{{item.operatorTitle}}</view> 
@@ -295,7 +300,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="row-line" v-if="index!= auditList.length - 1"></view>
+						<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 					</view>
 				</view>
 			</u-form>
@@ -355,6 +360,7 @@
 				item.showflow=!item.showflow
 			},
 			getList() {
+				var that = this
 				uni.showLoading({
 					title:'加载中',
 					mask:true
@@ -363,6 +369,7 @@
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
+						this.list=res.data.data
 						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
 							relevanceId: res.data.data.relevanceId
 						}).then(res => {
@@ -386,96 +393,99 @@
 									}
 								}
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'INOUTTASK-TASK-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
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'INOUTTASK-TASK-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.jointVentureParties?that.list.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
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}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='大光'
+											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{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												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=''
 											}
-											
-											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)
-								this.auditList = response.data.data
-								var time2=new Date(this.list.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle:this.list.creater.substring(0,2),
-									operatorName:this.list.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									console.log(response.data.data)
+									this.auditList = response.data.data
+									var time2=new Date(this.list.createDate).getTime()
+									var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle:this.list.creater.substring(0,2),
+										operatorName:this.list.creater,
+										updateDate:time3,
+										auditMind:'',
+										desc:'发起申请',
+										showflow:false,
+										commonStaffs1:null,
+										commonStaffs:null,
+										workflowHistoricTasks:[],
+										status:'success'
+									})
 								})
 							})
 						})
+						
 					}
 				})
 				
@@ -633,7 +643,7 @@
 	}
 	.content2 {
 		background: white;
-		margin: 20rpx 10px;
+		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
 	
@@ -643,96 +653,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/acquisition_settlement_approval.vue

@@ -169,10 +169,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -366,7 +366,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -401,7 +401,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -438,7 +438,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

pages/task/audit/acquisition_settlement_details.vue

@@ -367,7 +367,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -402,7 +402,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -439,7 +439,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

pages/task/audit/acquisitioncontract.vue

@@ -1,5 +1,24 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			<view class="headInfo_middle">
+				<view class="headInfo_title">收购合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
 		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
 			<u-form-item label-width='260' label="合同编号" :borderBottom="false">
@@ -11,170 +30,206 @@
 			<u-form-item label-width='260' label="收购方电话" :borderBottom="false">
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方" :borderBottom="false">
-				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-show="list.jointVentureParties">
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-show="list.jointPhone">
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="交货日期（起 - 止）" :borderBottom="false">
+				<view class="textCss">
+					{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+				</view> 
+			</u-form-item>
+			<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false">
+				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-show="list.unitContractPrice">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-show="list.totalContractPrice">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-show="list.finalTradingVolume">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-show="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
+					disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方电话" :borderBottom="false">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-show="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
+					disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-show="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false" v-show="list.contractProcessInfo.mildewGrain">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<view class="form_view" style="background: #F9F9FA;">
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-show="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
+			</u-form-item>
+			<u-form-item>
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+			</u-form-item>
+			
+			<!-- <u-form-item label-width='260' label="附件"> -->
+				<!-- <view class="textCss">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
+				</view> -->
+				
+			<!-- </u-form-item> -->
+			
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
+			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="交易主体" class="label_css" :borderBottom="false">
-							<u-input v-model="list.transactionSubject" class="input_css" input-align="right"
+						<u-form-item label-width='100' label="货名" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.grade" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="重量（吨）" class="label_css" :borderBottom="false">
-							<u-input v-model="list.weight" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='230' label="容重（克/升）>=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.bulkDensity" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='150' label="签订日期" class="label_css" :borderBottom="false">
-							<u-input v-model="list.signingDate" class="input_css" input-align="right" placeholder="--"
-								disabled />
+						<u-form-item label-width='230' label="霉变粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.mildewGrain" class="input_css" input-align="right"
+								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="货名" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="水分（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.waterContent" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="水分（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.waterContent" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="杂质（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.grade" class="input_css" input-align="right"
+						<u-form-item label-width='200' label="热损伤（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="杂质（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='230' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.imperfectGrain" class="input_css"
+								input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
+				
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<view class="form_view">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='200' label="容重（克/升）>=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.bulkDensity" class="input_css" input-align="right"
+						<u-form-item label-width='150' label="交易主体" class="label_css" :borderBottom="false">
+							<u-input v-model="list.transactionSubject" class="input_css" input-align="right"
 								placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="霉变粒（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.mildewGrain" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='200' label="热损伤（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right"
-								placeholder="--" disabled />
+						<u-form-item label-width='150' label="重量（吨）" class="label_css" :borderBottom="false">
+							<u-input v-model="list.weight" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='230' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.imperfectGrain" class="input_css"
-								input-align="right" placeholder="--" disabled />
+						<u-form-item label-width='150' label="签订日期" class="label_css" :borderBottom="false">
+							<u-input v-model="list.signingDate" class="input_css" input-align="right" placeholder="--"
+								disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
+				
 			</view>
-			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false">
-				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--"
-					disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--"
-					disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
-			</u-form-item>
-			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="附件">
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view style="max-width:60%;word-break: break-word">
-							{{item.appendixName}}
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else class="imgsign" :src="item.appendixPath" mode="">
+							</image>
 						</view>
-						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
-							点击下载
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
 						</view>
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
+					
+					<!-- <u-icon name="attach" ></u-icon> -->
+					<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 				</view>
-			</u-form-item>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</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="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view>
@@ -232,7 +287,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>
@@ -252,11 +307,11 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/500个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="100" /> -->
-						<textarea maxlength="500" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -299,7 +354,8 @@
 				isAdd: true,
 				imgShow: false,
 				url: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -312,10 +368,8 @@
 		},
 		onLoad(options) {
 			this.id = options.id
-
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
-
 		},
 		onShow() {
 			this.getList()
@@ -366,130 +420,147 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist = res1.data.data
-						})
-						// 查流程
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'SHOU-CONTRACT-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
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
+							// 查流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'SHOU-CONTRACT-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.jointVentureParties?that.list.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
+											response.data.data[i].commonStaffs1 = response.data.data[i]
+												.commonStaffs
 										} 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 {
+											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].desc.substring(0, 2)
-											}
-
-											response.data.data[i].operatorName = response.data
-												.data[i].desc
-											var time1 = new Date(response.data.data[i].updateDate)
+													.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(
-												time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind = ''
+												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)
-								this.auditList = response.data.data
-								var time2 = new Date(this.list.createDate).getTime()
-								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle: this.list.creater.substring(0, 2),
-									operatorName: this.list.creater,
-									updateDate: time3,
-									auditMind: '',
-									desc: '发起申请',
-									showflow: false,
-									commonStaffs1: null,
-									commonStaffs: null,
-									workflowHistoricTasks: [],
-									status: 'success'
+									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.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
 								})
-							})
+							})	
 						})
 					}
 				})
-
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -510,7 +581,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -549,7 +620,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -573,7 +644,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -601,14 +672,15 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
-
+	
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
-			font-size: 20rpx;
+			font-size: 26rpx;
 			color: #878C9C;
 		}
 	}
@@ -798,11 +870,10 @@
 		justify-content: flex-end;
 		width: 100%;
 		text-align: right;
+		color: #333333;
 	}
-
-
 	.textarea {
-		margin: 20px auto;
+		margin: 15rpx auto;
 		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
@@ -835,28 +906,28 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -865,27 +936,27 @@
 						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;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -894,31 +965,33 @@
 					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;
 						}
@@ -926,10 +999,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -942,45 +1015,137 @@
 				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;
+		border-bottom: 1px solid #F5F6FA;
 		padding-bottom: 10px;
+		margin-bottom: 18rpx;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
 
-	.form_view {
+	.form_view{
 		margin: 20rpx 0;
 		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
 	}
 
 	.label_css {
-		font-size: 20rpx;
+		font-size: 26rpx;
 		color: #878C9C;
 	}
 
 	.input_css {
 		font-size: 20rpx;
 	}
+	.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;
+		}
+	}
+	.headInfo{
+		height: 100px;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+		display: flex;
+		position: relative;
+		.headInfo_left{
+			width: 10%;
+			line-height: 60px;
+			text-align: center;
+		}
+		.headInfo_middle{
+			width: 70%;
+			padding-left: 10px;
+			margin-top: 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: 6px;
+		}
+	}
 </style>

pages/task/audit/charge_against_revenue.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,6 +117,27 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件
@@ -119,21 +148,21 @@
 						<view class="img_item">
 							<view class="" style="width: 16%;">
 								<image
-									v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									v-if="item.type == 'pdf'"
+									class="imgsign" src="../../../static/img/oa_office/pdf3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									class="imgsign" src="../../../static/img/oa_office/excle3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									class="imgsign" src="../../../static/img/oa_office/word3.png"
 									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;"
+								<image v-else class="imgsign"
 									src="../../../static/img/oa_office/img.png" mode=""></image>
 							</view>
 							<view class="" style="width: 70%;">
 								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
+								<view class="img_size">{{item.appendixSize}}</view>
 							</view>
 							<view class="img_dowload" @click="openDocument(item)">下载</view>
 						</view>
@@ -232,10 +261,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+					<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -306,13 +335,16 @@
 		watch: {
 			imglist: {
 				handler: function() {
+					let that = this
 					this.$api.doRequest('get', 'appendix/query/getFileList', {
 						appendixIds: this.imglist.toString()
 					}).then(res => {
 						this.imglist2 = res.data.data
 						for (let i = 0; i < this.imglist2.length; i++) {
-							if (this.imglist2[i].appendixName) {
-								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							if (this.imglist2[i].appendixName) {//获取文件的后缀名
+								let index = that.imglist2[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								that.imglist2[i].type = that.imglist2[i].appendixName.substring(index+1)
+								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
 					})
@@ -401,23 +433,24 @@
 				}
 			},
 			getList() {
+				var that =this
 				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/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 => {
@@ -457,7 +490,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -636,26 +670,26 @@
 							success: function(res) {
 								if (res.confirm) {
 									uni.showLoading({
-										title: "审核中...",
+										title: "驳回中...",
 										mask: true
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
 										needReapply: true
 									}).then(res => {
-										count++
-										if (count == that.List.length) {
+										// count++
+										// if (count == that.List.length) {
 											uni.hideLoading()
-											that.$api.msg('审核成功！')
+											that.$api.msg('驳回成功！')
 											console.log('驳回成功！')
 											setTimeout(function() {
 												uni.navigateBack();
 											}, 2000);
-										}
+										// }
 									})
 									// }
 								}
@@ -676,14 +710,14 @@
 									mask: true
 								})
 								// for (let num = 0; num < that.List.length; num++) {
-								var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								// var tmp = 0
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
 									needReapply: false
 								}).then(res => {
-									tmp++
+									// tmp++
 									// if (tmp == that.List.length) {
 									uni.hideLoading()
 									that.$api.msg('审核成功！')
@@ -715,7 +749,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -844,28 +878,28 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -874,27 +908,27 @@
 						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;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -903,31 +937,33 @@
 					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;
 						}
@@ -935,10 +971,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -951,27 +987,26 @@
 				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;
 		}
 	}
-
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -1123,26 +1158,49 @@
 		margin: 5px;
 	}
 
-	.char_css {
-		// text-align: center;
-		// width: 90px;
-		font-size: 30rpx;
-		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;
-	}
+	// .char_css {
+	// 	// text-align: center;
+	// 	// width: 90px;
+	// 	font-size: 30rpx;
+	// 	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_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;

pages/task/audit/charge_against_revenue_detail.vue

@@ -65,6 +65,14 @@
 				<view class="left">费用名称</view>
 				<view class="right">{{auditInfo.expenseName}}</view>
 			</view>
+			<view class="row" v-if='auditInfo.expensesType==2'>
+				<view class="left">付款方名头</view>
+				<view class="right">{{auditInfo.payerHeader}}</view>
+			</view>
+			<view class="row" v-if='auditInfo.expensesPurpose==5 && auditInfo.expensesType==2'>
+				<view class="left">所属名头</view>
+				<view class="right">{{auditInfo.belongName}}</view>
+			</view>
 			<view class="row">
 				<view class="left">金额（元）</view>
 				<view class="right">{{auditInfo.amountMoney}}</view>
@@ -109,14 +117,59 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="title ">
+				收款账户信息
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">收款方</view>
+				<view class="right">{{auditInfo.payee}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">账户</view>
+				<view class="right">{{auditInfo.accountNumber}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户行</view>
+				<view class="right">{{auditInfo.bank}}</view>
+			</view>
+			<view v-if='auditInfo.expensesType==2' class="row">
+				<view class="left">开户支行</view>
+				<view class="right">{{auditInfo.bankBranch}}</view>
+			</view>
+		</view>
 		<view class="content1" v-if="url && url != 'ng'">
 			<view class="title ">
 				附件
 			</view>
 			<view v-if='auditInfo.srcList.length>0' class="">
 				<view style='flex-wrap: wrap;' class="file">
-					<image v-for='(item,index) in auditInfo.srcList' @click="previewImageFn(index)" class='fujianImg'
-						:src="item" mode=""></image>
+					<view class="" v-for='(item,index) in imglist2'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									class="imgsign" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									class="imgsign" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else class="imgsign"
+									src="../../../static/img/oa_office/img.png" mode=""></image>
+							</view>
+							<view style='justify-content: space-between;width: 81%;' class="flex">
+								<view>
+									<view class="char_css">{{item.appendixName}}</view>
+									<view class="img_size">{{item.appendixSize}}</view>
+								</view>
+								<view class="img_dowload" @click="openDocument(item)">下载</view>
+							</view>
+							
+						</view>
+					</view>
 				</view>
 			</view>
 			<view v-else class="">
@@ -190,25 +243,6 @@
 				<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='fanhui' type="success" class="btn2">返回</u-button>
@@ -246,6 +280,8 @@
 				id: "",
 				auditList: [],
 				url: "11",
+				imglist: [],
+				imglist2: []
 			}
 		},
 		onBackPress(e) {
@@ -268,6 +304,25 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+						for (let i = 0; i < this.imglist2.length; i++) {
+							if (this.imglist2[i].appendixName) {
+								let index = this.imglist2[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								this.imglist2[i].type = this.imglist2[i].appendixName.substring(index+1)
+								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		methods: {
 			previewImageFn(index) {
 				/* 预览图片 */
@@ -315,6 +370,22 @@
 					}
 				});
 			},
+			openDocument(src) {
+				console.log(src)
+				uni.downloadFile({
+					url: src.appendixPath,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			openXls() {
 				if (this.url && this.url != "ng") {
 					uni.downloadFile({
@@ -333,6 +404,7 @@
 				}
 			},
 			getList() {
+				var that =this
 				uni.showLoading({
 					title: "加载中...",
 					mask: true
@@ -372,6 +444,9 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if (this.auditInfo.addressUrl) {
+							this.imglist = this.auditInfo.addressUrl.split(',')
+						}
 						if (this.auditInfo.addressUrl && this.auditInfo.addressUrl != '') {
 							this.auditInfo.srcList = this.auditInfo.addressUrl.split(',')
 						} else {
@@ -385,7 +460,8 @@
 					}).then(res1 => {
 						this.$api.doRequest('get', '/commonUser/getHis', {
 							workflowId: res1.data.data[0].id,
-							businessKey: this.id
+							businessKey: this.id,
+							branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 						}).then(response => {
 							uni.hideLoading()
 							for (let i = 0; i < response.data.data.length; i++) {
@@ -539,7 +615,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -675,96 +751,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
@@ -928,4 +1024,54 @@
 		border: 1px solid #ccc;
 		margin: 5px;
 	}
+	
+	// .char_css {
+	// 	// text-align: center;
+	// 	// width: 90px;
+	// 	font-size: 30rpx;
+	// 	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_item {
+		display: flex;
+		width: 85vw;
+		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/collection_business_approval.vue

@@ -212,7 +212,7 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
 										auditMind: that.auditMind,
@@ -290,7 +290,7 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
+						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.auditMind,

pages/task/audit/daichu_details.vue

@@ -132,20 +132,106 @@
 			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="附件">
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<view v-for='item in imglist'>
-					<view @click='shadeshow(item)'>
-						<image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image>
+			<u-form-item label-width='120' label="附件">
+					<view class="form_top">共{{imglist.length}}个附件</view>
+					<view v-if='imglist.length>0'>
+						<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+							<view class="img_item">
+								<view class="" style="width: 16%;">
+									<image
+										v-if="item.type == 'pdf'"
+										class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+										 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+										 class="imgsign" src="../../../static/img/oa_office/word3.png"
+										mode=""></image>
+									<image v-else  class="imgsign" :src="item.appendixPath" mode="">
+									</image>
+								</view>
+								<view class="" style="width: 70%;">
+									<view class="char_css">{{item.appendixName}}</view>
+									<view class="img_size">{{item.appendixSize}}</view>
+								</view>
+								<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+									下载
+								</view>
+							</view>
+							</view>
 					</view>
-				</view>
 			</u-form-item>
 		</u-form>
+		<u-form style='margin-top:10px;' 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="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="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 style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
@@ -205,6 +291,7 @@
 				isAdd: true,
 				imgShow: false,
 				url: "",
+				auditList:[],
 				everyCheck: ''
 			}
 		},
@@ -243,10 +330,144 @@
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for (var i = 0; i < res1.data.data.length; i++) {
-								that.imglist.push(res1.data.data[i].appendixPath)
+							that.imglist=res1.data.data
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
 							}
 						})
+						// 审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'DAICHU-CONTRACT-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.jointVentureParties?that.list.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.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
+								})
+							})
 					}
 				})
 			},
@@ -269,7 +490,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -308,7 +529,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -332,7 +553,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -585,4 +806,172 @@
 			color: #AFB3BF;
 		}
 	}
+	.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: 16%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.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;
+					}
+				}
+	
+			}
+	
+			.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;
+		}
+	}
 </style>

pages/task/audit/daishou_details.vue

@@ -109,20 +109,106 @@
 			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="附件">
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
-						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<view v-for='item in imglist'>
-					<view @click='shadeshow(item)'>
-						<image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image>
-					</view>
+			<u-form-item label-width='120' label="附件">
+				<view class="form_top">共{{imglist.length}}个附件</view>
+				<view v-if='imglist.length>0'>
+					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									 class="imgsign" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else  class="imgsign" :src="item.appendixPath" mode="">
+								</image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="img_size">{{item.appendixSize}}</view>
+							</view>
+							<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+								下载
+							</view>
+						</view>
+						</view>
 				</view>
 			</u-form-item>
 		</u-form>
+		<u-form style='margin-top:10px;' 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="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="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 style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
@@ -139,10 +225,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -176,6 +262,7 @@
 				auditMind: '',
 				show: false,
 				title: '',
+				auditList:[],
 				contractNo: "",
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -220,10 +307,144 @@
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for (var i = 0; i < res1.data.data.length; i++) {
-								that.imglist.push(res1.data.data[i].appendixPath)
+							that.imglist=res1.data.data
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
 							}
 						})
+						// 审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'DAISHOU-CONTRACT-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.jointVentureParties?that.list.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.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
+								})
+							})
 					}
 				})
 			},
@@ -246,7 +467,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -285,7 +506,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -309,7 +530,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -562,4 +783,172 @@
 			color: #AFB3BF;
 		}
 	}
+	.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: 16%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.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;
+					}
+				}
+	
+			}
+	
+			.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;
+		}
+	}
 </style>

pages/task/audit/expense_allocation.vue

@@ -388,7 +388,7 @@
 									})
 									var count = 0
 									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId: that.List[num].taskId,
 											approved: false,
 											auditMind: that.auditMind ? that.auditMind : "",
@@ -423,7 +423,7 @@
 								})
 								for (let num = 0; num < that.List.length; num++) {
 									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.List[num].taskId,
 										approved: true,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -460,7 +460,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

pages/task/audit/freight_setting_approval.vue

@@ -18,6 +18,9 @@
 		</view>
 		<view class="transaction">
 			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="运费类型" prop="contractNo" label-width="140">
+					{{list.tranType}}运费
+				</u-form-item>
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -41,13 +44,81 @@
 					</view>
 
 				</u-form-item>
-				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-if='list.billingMethod==1' v-model="list.tranPriceIng" input-align="right"
+				<u-form-item label="运费（元）" prop="tranPrice" label-width="250">
+					<u-input v-if='list.billingMethod==1&&list.tranType=="汽运"' v-model="list.tranPriceIng" input-align="right"
+						placeholder="请输入运费单价" />
+					<u-input v-else-if='list.billingMethod!=1&&list.tranType=="汽运"' v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-else v-model="list.tranPriceIng" input-align="right"
 						placeholder="请输入运费单价" />
-					<u-input v-else v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</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>
 		<u-modal v-model="show" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
 			showCancelButton='false' :content="content" @confirm="passSubmit" @cancel="show = false"></u-modal>
@@ -73,6 +144,7 @@
 				show: false,
 				rejectInfo: "", //审核意见
 				title: "提示",
+				auditList:[],
 				content: '是否通过该设置?'
 			}
 		},
@@ -95,20 +167,152 @@
 		},
 		methods: {
 			getList() {
+				var that = this
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
 					id: this.id
 				}).then(res => {
 					this.list = res.data.data
+					// 查流程
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'YUNJIA-TRAN-APPROVE',
+						tmpCompId: uni.getStorageSync('pcUserInfo').compId
+					}).then(res1 => {
+						this.$api.doRequest('get', '/commonUser/getHis', {
+							workflowId: res1.data.data[0].id,
+							businessKey: this.id,
+							// branch:'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'
+							})
+						})
+					})
 				})
 			},
 			passSubmit() {
 				var that = this
-				if (!this.list.tranPriceIng && this.list.billingMethod == 1 || !this.list.tranPriceIngCar && this.list
-					.billingMethod == 2) {
+				if (!this.list.tranPriceIng && this.list.billingMethod == 1&&this.list.tranType=="汽运" || !this.list.tranPriceIngCar && this.list
+					.billingMethod == 2&&this.list.tranType=="汽运"||!this.list.tranPriceIng &&this.list.tranType!="汽运") {
 					this.$api.msg('运费单价不能为空')
 					return
 				}
-
 				uni.showLoading({
 					title: "审核中"
 				})
@@ -119,7 +323,7 @@
 				tranProcessInfo.billingMethod = that.list.billingMethod
 				tranProcessInfo.reviewer = that.userInfo.userName
 				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
-				if (that.list.billingMethod == 1) {
+				if (that.list.billingMethod == 1&&that.list.tranType=="汽运"||that.list.tranType!="汽运") {
 					tranProcessInfo.tranPriceIng = that.list.tranPriceIng
 					url = '/tranProcessInfo/api/setUpTranPrice'
 				} else {
@@ -129,15 +333,23 @@
 				that.$api.doRequest('post', url, tranProcessInfo)
 					.then(res => {
 						if (res.data.code == 200) {
-							that.$api.msg('审核通过成功!')
-							setTimeout(function() {
-								if (that.everyCheck) {
-									helper.setAudit(that.list)
-								} else {
-									uni.navigateBack()
-								}
-								uni.hideLoading()
-							}, 1000);
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: true,
+								auditMind: '',
+								needReapply: true,
+							}).then(res => {
+								that.$api.msg('通过成功')
+								that.show = false
+								setTimeout(function() {
+									if (that.everyCheck) {
+										helper.setAudit(that.list)
+									} else {
+										uni.navigateBack()
+									}
+									uni.hideLoading()
+								}, 1000);
+							})
 						}
 					})
 
@@ -230,4 +442,151 @@
 		width: 100%;
 		justify-content: flex-end;
 	}
+	.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;
+		}
+	}
+	.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;
+		}
+	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -18,6 +18,9 @@
 		</view>
 		<view class="transaction">
 			<u-form :model="list" ref="list" class="uForm">
+				<u-form-item label="运费类型" prop="contractNo" label-width="140">
+					{{list.tranType}}运费
+				</u-form-item>
 				<u-form-item label="合同编号" prop="contractNo" label-width="140">
 					<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 				</u-form-item>
@@ -34,10 +37,80 @@
 					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-if='list.billingMethod==2&&list.tranPriceCar!=0' v-model="list.tranPriceCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==2&&list.tranPriceCar==0' v-model="list.tranPriceIngCar" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.billingMethod==1&&list.tranPrice==0' v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else-if='list.tranPrice' v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
+					<u-input v-else v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</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>
 	     <u-button type="primary" class="submit" @click="fanHui()">返回</u-button>
 	</view>
 </template>
@@ -53,6 +126,7 @@
 					priceStatus:"",
 				},
 				id: "",
+				auditList:[]
 			}
 		},
 		onLoad(options) {
@@ -64,11 +138,143 @@
 		},
 		methods: {
 			getList() {
+				var that =this
 				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
 					id: this.id
 				}).then(res => {
 					this.list = res.data.data
-				})
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'YUNJIA-TRAN-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id,
+								// branch:'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'
+								})
+							})
+						})
+					})
 			},
 			fanHui(){
 				uni.navigateBack()
@@ -138,4 +344,151 @@
 		border-radius: 40rpx;
 		margin-top: 40rpx;
 	}
+	.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;
+		}
+	}
+	.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;
+		}
+	}
 </style>

pages/task/audit/freight_settlement_approval.vue

@@ -12,18 +12,19 @@
 							v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list[0].approveStatus}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>
@@ -61,21 +62,105 @@
 						<view class="textInfo">{{item.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">运</view>
+						<view class="left">预</view>
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="center">扣</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view class="center">算</view>
+						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="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">
@@ -86,10 +171,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -117,6 +202,7 @@
 				title: '',
 				show: false,
 				height: 200,
+				auditList:[],
 				auditMind: '',
 				autoHeight: true,
 				border: false,
@@ -142,12 +228,145 @@
 		},
 		methods: {
 			getList() {
+				var that =this
 				this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
 					batchId: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.list = res.data.data
 						// console.log(this.list, 124)
+						// 查流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'TRANSPORTATION-SETTLEMENT-REPORT',
+							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', {
@@ -173,6 +392,7 @@
 				// 		})
 				// 	}
 				// })
+				
 			},
 			close() {
 				this.show = false
@@ -188,7 +408,7 @@
 			// 驳回
 			rejectSubmit() {
 				var that = this
-				if (!this.rejectInfo) {
+				if (!this.auditMind) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
 					this.show = false
@@ -198,7 +418,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, that.rejectInfo)
+								that.audit(that.list[0], 0, false, true, that.auditMind)
 							}
 						}
 					})
@@ -218,7 +438,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2, that.rejectInfo1)
+								that.audit(that.list[0], 0, true, 2, that.auditMind)
 							}
 						}
 					})
@@ -231,10 +451,10 @@
 				})
 				let that = this
 				if (this.list) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
-						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
+						auditMind: this.auditMind ,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						if (status == true) {
@@ -261,7 +481,19 @@
 		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;
@@ -526,4 +758,495 @@
 		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_details.vue

@@ -9,18 +9,19 @@
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 					</view>
-					<view class="infoText">{{list[0].status}}</view>
+					<view class="infoText">{{list[0].approveStatus?list[0].approveStatus:list[0].status}}</view>
 				</view>
 				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
-				<view>合同编号</view>
+				<view v-if='list[0].contractFlag=="1"'>合同编号</view>
+				<view v-if='list[0].contractFlag=="0"'>移库编号</view>
 				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-				<view class="top1" style="display: flex;">
+				<view v-if='list[0].contractFlag=="1"' class="top1" style="display: flex;">
 					<view>客户</view>
 					<view>{{list[0].customer}}</view>
 				</view>
@@ -54,20 +55,104 @@
 						<view class="textInfo">{{item.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="left">运</view>
+						<view class="left">预</view>
 						<view class="textInfo">{{item.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="center">扣</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view class="center">算</view>
+						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view v-if='item.deductionAmount>=0' class="right">扣</view>
+						<view v-if='item.deductionAmount<0' class="right">加</view>
+						<view v-if='item.deductionAmount<0' class="textInfo">{{-item.deductionAmount}}元</view>
+						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="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>
 		<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>
@@ -84,6 +169,7 @@
 				list: {
 					approveStatus: "",
 				},
+				auditList:[],
 				customerName: "", //客户
 				shippingAddress: "", //发货地址
 				receivingAddress: "", //收货地址
@@ -101,6 +187,137 @@
 					if (res.data.code == 200) {
 						this.list = res.data.data
 						// console.log(this.list, 124)
+						// 查流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'TRANSPORTATION-SETTLEMENT-REPORT',
+							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', {
@@ -305,4 +522,138 @@
 	/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;
+		}
+	}
 </style>

pages/task/audit/leave_approve.vue

@@ -57,9 +57,9 @@
 			<view class="u-textarea-style1">
 				
 				<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-					maxlength="100" />
+					maxlength="1000" />
 					<view class="right-bottom1">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 			</view>
 			<view @click='close()' class="cancel1">取消</view>
@@ -128,6 +128,14 @@
 					
 					}
 				})
+				// this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+				// 	businessCode: 'QINGJIA-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 => {})})
 			},
 			close() {
 				this.show = false
@@ -153,7 +161,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -200,7 +208,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

pages/task/audit/purchase_settlement_approval.vue

@@ -63,10 +63,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -203,7 +203,7 @@
 					title: "审核中"
 				})
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,

pages/task/audit/purchasecontract.vue

@@ -1,158 +1,265 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			
+			<view class="headInfo_middle">
+				<view class="headInfo_title">采购合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
 		<u-form ref="uForm">
-			<u-form-item label-width='260' label="合同编号">
-				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="交易主体">
-				<u-input v-model="list.transactionSubject" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="买方">
-				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方">
-				<u-input v-model="list.seller" input-align="right" placeholder="" disabled />
+			<view class="form_top">基本信息</view>
+			<u-form-item label-width='260' label="合同编号" :borderBottom="false">
+				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="买方" :borderBottom="false">
+				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="结算方式">
-				<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="买方电话" :borderBottom="false">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货方式">
-				<u-input v-model="list.deliverType1" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="卖方" :borderBottom="false">
+				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="运输方式">
-				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="卖方电话" :borderBottom="false">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="包装方式">
-				<u-input v-model="list.packingMethod" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交易主体" :borderBottom="false" v-if="list.transactionSubject">
+				<u-input v-model="list.transactionSubject" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="验收方式">
-				<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="重量（吨）">
-				<u-input v-model="list.weight" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（起）">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交货日期（起）" :borderBottom="false">
+				<!-- <u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled /> -->
+			    <view class="textCss">
+			    	{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+			    </view> 
 			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）">
-				<u-input v-model="list.overShort" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="签订日期" :borderBottom="false">
+				<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同单价（元/吨）" :borderBottom="false" v-if="list.unitContractPrice">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同单价（元/吨）">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同总价（元）" :borderBottom="false" v-if="list.totalContractPrice">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同总价（元）">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='300' label="结算单价（元/吨）" :borderBottom="false" v-if="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="货源所在地区">
+			<!-- <u-form-item label-width='260' label="交货日期（止）" :borderBottom="false">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='260' label="货源所在地区" :borderBottom="false" v-if="list.sourceProvince">
 				<view class="textCss">
 					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' label="货源详细地址">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="货源详细地址" :borderBottom="false" v-if="list.sourceGoods">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货地所在地区">
+			<u-form-item label-width='260' label="交货地所在地区" :borderBottom="false" v-if="list.deliveryProvince">
 				<view class="textCss">
 					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="签订日期">
-				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量（吨）">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
-				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' label="结算单价（元/吨）">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="货名">
-				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="水分（%）<=">
-				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="品级">
-				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="杂质（%）<=">
-				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交货地详细地址" :borderBottom="false" v-if="list.placeDelivery">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="容重（克/升）>=">
-				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
+			
+			<u-form-item label-width='300' label="最终实际交易量（吨）" :borderBottom="false" v-if="list.finalTradingVolume">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="霉变粒（%）<=">
-				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled />
+			<u-form-item v-if='list.deliverType == 1 && list.personCharge' label-width='260' label="临时仓库负责人" :borderBottom="false">
+				<u-input v-model="list.personCharge" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="热损伤（%）<=">
-				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同收入（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="不完善粒（%）<=">
-				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="已开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同收入（元）">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="费用支出（元）" :borderBottom="false" v-if="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="已开发票（元）">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="未开发票（元）" :borderBottom="false" v-if="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="费用支出（元）">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="未回款（元）" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未开发票（元）">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false" v-if="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未回款（元）">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="备注信息">
+			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
 			</u-form-item>
 			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无信息" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="附件">
+			<!-- <u-form-item label-width='260' label="附件"> -->
 				<!-- <view class="textCss">
 					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
 						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view> -->
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view style="max-width:60%;word-break: break-word">
-							{{item.appendixName}}
+				
+			<!-- </u-form-item> -->
+			
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
+			<view class="form_view">
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='100' label="货名" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='230' label="容重（克/升）>=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='200' label="水分（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='200' label="热损伤（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='200' label="杂质（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='200' label="霉变粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='250' label="不完善粒（%）<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<u-form-item label-width='150' label="结算方式" class="label_css" :borderBottom="false">
+				<u-input v-model="list.settlementMethod" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<view class="form_view">
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						
+						<u-form-item label-width='260' label="溢短装（%）" :borderBottom="false" >
+							<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.deliverType1" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='150' label="运输方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.shippingType" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' label="包装方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.packingMethod" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='150' label="验收方式" class="label_css" :borderBottom="false">
+							<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' label="重量（吨）" class="label_css" :borderBottom="false">
+							<u-input v-model="list.weight" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								 class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								 class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else class="imgsign" :src="item.appendixPath" mode="">
+							</image>
 						</view>
-						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
-							点击下载
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
 						</view>
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
-				</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
+						</view>
+					</view>
+					<!-- <u-icon name="attach" ></u-icon> -->
+					<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 				</view>
-			</u-form-item>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</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="row" v-if='item.desc!="_PLACEHOLDER_"'>
 						<view class="left">
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view> 
@@ -202,7 +309,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 				</view>
 			</view>
 		</u-form>
@@ -222,9 +329,9 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/500个字
+						{{auditMind.length}}/1000个字
 					</view>
-					<textarea maxlength="500" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
 					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="300" /> -->
 				</view>
@@ -267,7 +374,8 @@
 				isAdd: true,
 				imgShow: false,
 				url: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -330,93 +438,110 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist=res1.data.data
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'BUY-CONTRACT-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
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") //获取最后出现.的字符
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'BUY-CONTRACT-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.jointVentureParties?that.list.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
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}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='大光'
+											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{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												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=''
 											}
-											
-											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)
-								this.auditList = response.data.data
-								var time2=new Date(this.list.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle:this.list.creater.substring(0,2),
-									operatorName:this.list.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									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.createDate).getTime()
+									var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle:this.list.creater.substring(0,2),
+										operatorName:this.list.creater,
+										updateDate:time3,
+										auditMind:'',
+										desc:'发起申请',
+										showflow:false,
+										commonStaffs1:null,
+										commonStaffs:null,
+										workflowHistoricTasks:[],
+										status:'success'
+									})
 								})
 							})
 						})
@@ -442,7 +567,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -481,7 +606,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -505,7 +630,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -533,13 +658,16 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
-		padding: 0 10px;
-
+		padding: 30rpx 10px;
+	
 		.u-form-item {
 			line-height: 30px;
-			padding: 5px 0;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
 		}
 	}
 
@@ -728,17 +856,18 @@
 		justify-content: flex-end;
 		width: 100%;
 		text-align: right;
+		color: #333333;
 	}
 
 
 	.textarea {
-		margin: 20px auto;
-		width: 100%;
-		background: #F9F9FA;
-		border-radius: 10px;
-		border: 1px solid #EEEEEE;
-		font-size: 28rpx;
-		padding: 10px;
+	margin: 18rpx auto;
+	width: 100%;
+	background: #F9F9FA;
+	border-radius: 10px;
+	border: 1px solid #EEEEEE;
+	font-size: 28rpx;
+	padding: 10px;
 	}
 
 	.u-textarea-style {
@@ -771,96 +900,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
@@ -873,4 +1022,112 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_top {
+		border-bottom: 1px solid #F5F6FA;
+		padding-bottom: 10px;
+		margin-bottom: 18rpx;
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
+	}
+	.label_css{
+		font-size: 26rpx;
+		color: #878C9C;
+	}
+	.input_css{
+		font-size: 20rpx;
+	}
+	.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;
+		}
+	}
+	.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: 60%;
+			padding-left: 10px;
+			margin-top: 10px;
+		}
+		.headInfo_right{
+			width: 30%;
+			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: 6px;
+		}
+	}
 </style>

pages/task/audit/refuel.vue

@@ -0,0 +1,1014 @@
+<template>
+	<view class="container">
+		
+		<u-form ref="uForm" >
+			<view class="form_top">基本信息</view>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" class="label_css"  label="车牌号">
+				<u-input v-model="list.carNo" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="起点">
+				{{list.originProvince}}{{list.originCity}}{{list.originArea}}{{list.originAddress}}
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="终点">
+				{{list.destinationProvince}}{{list.destinationCity}}{{list.destinationArea}}{{list.destinationAddress}}
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="总油耗(升)">
+				<u-input v-model="list.tfc" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="总金额(元)">
+				<u-input v-model="list.totalCost" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==1' label-width='260' :borderBottom="false" label="申请时间">
+				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="仓库名">
+				<u-input v-model="list.warehouseName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="备注">
+				<u-input v-model="list.remark" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="请款金额">
+				<u-input v-model="list.amountRequested" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item v-if='list.strokeType==3' label-width='260' :borderBottom="false" label="请款时间">
+				<u-input v-model="list.createDate" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+
+			
+		</u-form>
+		
+		 <view v-if="list.fillingDetailInfoList">
+		    <u-form v-for="(item,index) in list.fillingDetailInfoList">
+		      <div>加油-{{index+1}}</div>
+		      <el-form-item label="油耗（升）">
+		        {{item.oilConsumption}}
+		      </el-form-item>
+		      <el-form-item label="单价（元/升）">
+		        {{item.currentOilPrice}}
+		      </el-form-item>
+		      <el-form-item label="油费（元）">
+		        {{item.currentConsumption}}
+		      </el-form-item>
+		      <el-form-item label="凭证">
+		        <img :src="item.addressUrl" alt="">
+		      </el-form-item>
+		    </u-form>
+		  </view>
+		    <view v-if="list.shortFillingInfoList">
+		    <u-form v-for="(item,index) in list.shortFillingInfoList">
+		      <div>加油-{{index+1}}</div>
+		      <el-form-item label="车牌号">
+		        {{item.carNo}}
+		      </el-form-item>
+		      <el-form-item label="起始地">
+		        {{item.originProvince}}{{item.originCity}}{{item.originArea}}{{item.originAddress}}
+		      </el-form-item>
+		      <el-form-item label="终到地">
+		        {{item.destinationProvince}}{{item.destinationCity}}{{item.destinationArea}}{{item.destinationAddress}}
+		      </el-form-item>
+		    </u-form>
+		  </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="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="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='list.taskId' style='padding:10px;' class='flex bottom-btn'>
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
+				驳回
+			</u-button>
+			<u-button v-if='list.approveStatus||isSHowBtn' @click='pass' type="success" class="btn2">通过
+			</u-button>
+		</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}}/1000个字
+					</view>
+					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+		
+				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
+			</view>
+		</view>
+		<view @click='imgShow=false' v-if="imgShow" class="shade">
+			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				everyCheck: '',
+				id: "",
+				currentPage: 1,
+				pageSize: 10,
+				list: {
+					status: "",
+					contractGoodsInfo: {},
+					contractProcessInfo: {}
+				},
+				imglist: [],
+				title: '',
+				auditMind: '',
+				auditList: [],
+				show: false,
+				contractNo: "",
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				url: "",
+				imgShow: false,
+				height: 200,
+				autoHeight: true,
+				border: false,
+				rejectInfo: "",
+				rejectInfo1: "",
+				isSHowBtn: true,
+				auditCheck:"question",//判断审核是否通过
+			}
+		},
+		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: {
+			openDocument(src) {
+				uni.downloadFile({
+					url: src.appendixPath,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			shadeshow(url) {
+				this.imgShow = true
+				this.url = url
+			},
+			showcontent(item) {
+				item.showflow = !item.showflow
+			},
+			getList(id) {
+				var that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				this.$api.doRequest('get', '/fuelFillingInfo/getFilling', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data
+						// this.$api.doRequest('get', '/appendix/query/getFileList', {
+						// 	appendixIds: that.list.addressUrl
+						// }).then(res1 => {
+						// 	that.imglist = res1.data.data
+						// 	for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+						// 		if (that.imglist[i].appendixName) {
+						// 			let index = that.imglist[i].appendixName.lastIndexOf(".") 
+						// 			that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+						// 		}
+						// 	}
+							// 审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'JIAYOU-SHENHE-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.jointVentureParties?that.list.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.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
+								})
+							})
+					}
+				})
+			},
+			onRemove() {
+
+				return
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			//驳回
+			rejectSubmit() {
+				var that = this
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
+					taskId: that.list.taskId,
+					approved: false,
+					auditMind: this.auditMind,
+					needReapply: true,
+				}).then(res => {
+					that.$api.msg('驳回成功')
+					that.show = false
+					setTimeout(function() {
+						if (that.everyCheck) {
+							helper.setAudit(that.list)
+						} else {
+							uni.navigateBack()
+						}
+
+						uni.hideLoading()
+					}, 1000);
+				})
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				if (this.title == '驳回原因（驳回）') {
+					this.rejectSubmit()
+				} else {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
+						taskId: that.list.taskId,
+						approved: true,
+						auditMind: this.auditMind,
+						needReapply: true,
+					}).then(res => {
+						that.$api.msg('通过成功')
+						that.show = false
+						setTimeout(function() {
+							if (that.everyCheck) {
+								helper.setAudit(that.list)
+							} else {
+								uni.navigateBack()
+							}
+							uni.hideLoading()
+						}, 1000);
+					})
+				}
+
+
+
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+						that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+						that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.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;
+	
+			.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;
+					}
+				}
+	
+			}
+	
+			.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 #F5F6FA;
+		padding-bottom: 10px;
+		margin-bottom: 18rpx;
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
+	}
+	.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: 60%;
+			padding-left: 10px;
+			margin-top: 10px;
+		}
+		.headInfo_right{
+			width: 30%;
+			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: 6px;
+		}
+	}
+	
+	.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/salecontract.vue

@@ -1,24 +1,123 @@
 <template>
 	<view class="container">
+		<view class="headInfo">
+			<view class="headInfo_left">
+				<u-icon name="checkmark" color="#22C572" size="30" v-if="auditCheck=='success'"></u-icon>
+				<u-icon name="close" color="#FB2323" size="24" v-if="auditCheck=='error'"></u-icon>
+				<u-icon name="clock-fill" color="#FE6430" size="30" v-if="auditCheck=='question'"></u-icon>
+			</view>
+			
+			<view class="headInfo_middle">
+				<view class="headInfo_title">销售合同审批</view>
+				<view class="headInfo_No">{{list.contractNo}}</view>
+			</view>
+			<view class="headInfo_right">
+				<view class="char_a" v-if="auditCheck == 'success'">审批通过</view>
+				<view class="char_b" v-if="auditCheck == 'question'">审核中</view>
+				<view class="char_c" v-if="auditCheck == 'error'">审批未通过</view>
+			</view>
+			<view class="adopt" v-if="auditCheck == 'success'">
+				<image src="../../../static/img/oa_office/adopt.png" class="adopt_img" mode=""></image>
+			</view>
+		</view>
+		
 		<u-form ref="uForm" >
 			<view class="form_top">基本信息</view>
+			<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="合同编号">
+				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="买方">
+				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="买方电话">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="卖方">
+				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-show="list.jointVentureParties">
+				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-show="list.jointPhone">
+				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
+				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
+			</u-form-item> 
+			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起 - 止）" v-show="list.deliveryDateStart">
+			   <view class="textCss">
+			   	{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
+			   </view> 
+			</u-form-item>
 			
+			<!-- <u-form-item label-width='260' :borderBottom="false" label="交货日期（止）">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
+			</u-form-item> -->
+			<u-form-item label-width='150' :borderBottom="false" label="签订日期">
+			<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='230' :borderBottom="false" label="合同总价（元）">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区" v-show="list.sourceProvince">
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址" v-show="list.sourceGoods">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区" v-show="list.deliveryProvince">
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址" v-show="list.placeDelivery">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）" v-show="list.settlementPrice">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）" v-show="list.contractProcessInfo.goodsNameKey">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）" v-show="list.contractProcessInfo.goodsName">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）" v-show="list.contractProcessInfo.waterContent">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）" v-show="list.contractProcessInfo.impurity">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）" v-show="list.contractProcessInfo.mildewGrain">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况" v-show="list.contractProcessInfo.grade">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' :borderBottom="false" label="备注信息" v-show="list.contractProcessInfo.grade">
+			</u-form-item>
+			<!-- <view class="form_top">备注信息</view> -->
+			<u-form-item>
+				<textarea class='textarea' autoHeight v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
+			</u-form-item>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">货物信息</view>
 			<view class="form_view" style="background: #F9F9FA;">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="结算方式" class="label_css">
-							<u-input v-model="list.settlementMethod" class="input_css" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="交货方式" class="label_css">
-							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--" disabled />
-						</u-form-item>
-					</u-col>
-				</u-row>
-				<u-row customStyle="margin-bottom: 10px;">
-					<u-col span="6">
-						<u-form-item label-width='150' :borderBottom="false" label="货名" class="label_css">
+						<u-form-item label-width='100' :borderBottom="false" label="货名" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.goodsName" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
@@ -44,21 +143,21 @@
 						</u-form-item>
 					</u-col>
 				</u-row>
-
+				
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='230' :borderBottom="false" label="热损伤（%）<=" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.jiaorenli" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
-
+				
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='230' :borderBottom="false" label="杂质（%）<=" class="label_css">
 							<u-input v-model="list.contractGoodsInfo.impurity" class="input_css" input-align="right" placeholder="--"
 								disabled />
 						</u-form-item>
-
+				
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
@@ -75,6 +174,24 @@
 						</u-form-item>
 					</u-col>
 				</u-row>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">约定信息</view>
+			<view class="form_view">
+				<u-row customStyle="margin-bottom: 10px;">
+					<u-col span="6">
+						<u-form-item label-width='150' :borderBottom="false" label="结算方式" class="label_css">
+							<u-input v-model="list.settlementMethod" class="input_css" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+					<u-col span="6">
+						<u-form-item label-width='150' :borderBottom="false" label="交货方式" class="label_css">
+							<u-input v-model="list.deliverType1" class="input_css" input-align="right" placeholder="--" disabled />
+						</u-form-item>
+					</u-col>
+				</u-row>
+				
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' :borderBottom="false" label="运输方式" class="label_css">
@@ -113,175 +230,104 @@
 					</u-col>
 				</u-row>
 			</view>
-			<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="合同编号">
-				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起）">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货日期（止）">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='150' :borderBottom="false" label="签订日期">
-			<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='230' :borderBottom="false" label="合同总价（元）">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="买方">
-				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="买方电话">
-				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="卖方">
-				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
-				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区">
-				<view class="textCss">
-					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区">
-				<view class="textCss">
-					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
-				</view>
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="备注信息">
-			</u-form-item>
-			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
-			</u-form-item>
-			<u-form-item label-width='90' label="附件">
-				<!-- <view class="textCss">
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imglist"
-					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
-				</view> -->
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<!-- <view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
-				</view> -->
-				<view v-if='imglist.length>0'>
-					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
-						<view style="max-width:60%;word-break: break-word">
-							{{item.appendixName}}
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">共{{imglist.length}}个附件</view>
+			<view v-if='imglist.length>0'>
+				<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+					<view class="img_item">
+						<view class="" style="width: 16%;">
+							<image
+								v-if="item.type == 'pdf'"
+								class="imgsign" src="../../../static/img/oa_office/pdf3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+								 class="imgsign" src="../../../static/img/oa_office/excle3.png"
+								mode=""></image>
+							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+								 class="imgsign" src="../../../static/img/oa_office/word3.png"
+								mode=""></image>
+							<image v-else  class="imgsign" :src="item.appendixPath" mode="">
+							</image>
 						</view>
-						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
-							点击下载
+						<view class="" style="width: 70%;">
+							<view class="char_css">{{item.appendixName}}</view>
+							<view class="img_size">{{item.appendixSize}}</view>
+						</view>
+						<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+							下载
 						</view>
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
-				</view>
-			</u-form-item>
+					</view>
+			</view>
+		</u-form>
+		<u-form ref="uForm">
+			<view class="form_top">流程</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">
-								<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 v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
+					<view class="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 class="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 class="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='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
-									class='time'>
-									{{item.updateDate}}
+								<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='item.auditMind' class="right-content">
-								{{item.auditMind}}
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+								class='time'>
+								{{item.updateDate}}
 							</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 v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
 						</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 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 class="row-line" v-if="index!= auditList.length - 1"></view>
 				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
+			</view>
 			</view>
 		</u-form>
 		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
@@ -301,16 +347,15 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/500个字
+						{{auditMind.length}}/1000个字
 					</view>
-					<textarea maxlength="500" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
 		
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
 		</view>
-
 		<view @click='imgShow=false' v-if="imgShow" class="shade">
 			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
 		</view>
@@ -352,6 +397,7 @@
 				rejectInfo: "",
 				rejectInfo1: "",
 				isSHowBtn: true,
+				auditCheck:"question",//判断审核是否通过
 			}
 		},
 		onBackPress(e) {
@@ -411,123 +457,140 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist = res1.data.data
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'SALE-CONTRACT-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
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
+							// 审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'SALE-CONTRACT-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.jointVentureParties?that.list.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
+											response.data.data[i].commonStaffs1 = response.data.data[i]
+												.commonStaffs
 										} 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 {
+											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].desc.substring(0, 2)
+													.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 = ''
 											}
-
-											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)
-								this.auditList = response.data.data
-								var time2 = new Date(this.list.createDate).getTime()
-								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle: this.list.creater.substring(0, 2),
-									operatorName: this.list.creater,
-									updateDate: time3,
-									auditMind: '',
-									desc: '发起申请',
-									showflow: false,
-									commonStaffs1: null,
-									commonStaffs: null,
-									workflowHistoricTasks: [],
-									status: 'success'
+									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.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
 								})
 							})
 						})
@@ -568,7 +631,7 @@
 					title: '加载中',
 					mask: true
 				});
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -605,7 +668,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -630,7 +693,7 @@
 			//审核方法
 			audit(item, index, status, status2, reason) {
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -658,6 +721,7 @@
 	}
 
 	.u-form {
+		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
@@ -665,7 +729,7 @@
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
-			font-size: 20rpx;
+			font-size: 26rpx;
 			color: #878C9C;
 		}
 	}
@@ -851,7 +915,7 @@
 	}
 
 	.textarea {
-		margin: 20px auto;
+		margin: 18rpx auto;
 		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
@@ -897,28 +961,28 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
-						background: #22C572;
-						width: 50px;
-						height: 50px;
-						border-radius: 10px;
-						line-height: 50px;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
 						text-align: center;
-						font-size: 18px;
+						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -927,27 +991,27 @@
 						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;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -956,31 +1020,33 @@
 					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;
 						}
@@ -988,10 +1054,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -1004,41 +1070,43 @@
 				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;
+		border-bottom: 1px solid #F5F6FA;
 		padding-bottom: 10px;
+		margin-bottom: 18rpx;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
 	.form_view{
 		margin: 20rpx 0;
 		border-radius: 20rpx;
-		
-		
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
 	}
 	.label_css{
-		font-size: 20rpx;
+		font-size: 26rpx;
 		color: #878C9C;
 	}
 	.input_css{
@@ -1047,4 +1115,99 @@
 	/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: 60%;
+			padding-left: 10px;
+			margin-top: 10px;
+		}
+		.headInfo_right{
+			width: 30%;
+			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: 6px;
+		}
+	}
+	
+	.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/supp_clock_approve.vue

@@ -45,10 +45,10 @@
 			</view>
 			<view class="u-textarea-style1">
 				<view class="right-bottom1">
-					{{auditMind.length}}/100个字
+					{{auditMind.length}}/1000个字
 				</view>
 				<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-					maxlength="100" />
+					maxlength="1000" />
 			</view>
 			<view @click='close()' class="cancel1">取消</view>
 			<view @click='passSubmit()' class="confirm1">确定</view>
@@ -137,7 +137,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -184,7 +184,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

pages/task/audit/tradeServices_audit.vue

@@ -116,10 +116,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -283,7 +283,7 @@
 						this.$api.msg('驳回意见不能为空')
 						return
 					}
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: false,
 						auditMind: this.auditMind,
@@ -312,7 +312,7 @@
 					   this.$api.doRequest('post', '/tradeWarehouseReceiptAppl/api/editTradeWarehouseReceiptAppl', this.tradeList)
 					   .then(res => {
 						   if(res.data.code == 200){
-							   this.$api.doRequest('post', '/workflow/api/handle', {
+							   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							   	taskId: this.tradeList.taskId,
 							   	approved: true,
 							   	auditMind: this.auditMind ? this.auditMind : "审核通过",
@@ -338,7 +338,7 @@
 						   }
 					   })  
 				   }else{
-					   this.$api.doRequest('post', '/workflow/api/handle', {
+					   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: true,
 						auditMind: this.auditMind ? this.auditMind : "审核通过",

pages/task/audit/viewDetail.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="center">
+		<view class="data_css" v-for="(item,index) in dataList">
+			<!-- <view class="data_item"> -->
+				<!-- <view class="data_item_left">货源</view>
+				<view class="data_item_right">{{item.customer}}</view> -->
+				<!-- <u-form ref="uForm" >
+				<u-form-item label-width='260' :borderBottom="false" class="label_css"  label="货源">
+					<u-input v-model="item.customer" input-align="right" placeholder="--" disabled />
+				</u-form-item>
+				</u-form> -->
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="6">
+						<view class="demo-layout title_name">货源</view>
+					</u-col>
+					<u-col span="6">
+						<view class="demo-layout value_css" >{{item.customer}}</view>
+					</u-col>
+				</u-row>
+			<!-- </view> -->
+			<view class="data_top_css">
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="2">
+						<view class="demo-layout title_name">车牌号</view>
+					</u-col>
+					<u-col span="4">
+						<view class="demo-layout value_css" >{{item.carNo?item.carNo:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">水分(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.waterContent?item.waterContent:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">毛重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grossWeight?item.grossWeight:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">容重(g/L)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.bulkDensity?item.bulkDensity:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">皮重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.tare?item.tare:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">杂质(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.impurity?item.impurity:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">净重(吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.netWeight?item.netWeight:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">霉变粒(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.mildewGrain?item.mildewGrain:'--'}}</view>
+					</u-col>
+				</u-row> 
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">单价(元/吨)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.price?item.price:'--'}}</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout title_name">热损伤(%)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item. jiaorenli?item. jiaorenli:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">粮款(元)</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grainFund?item.grainFund:'--'}}</view>
+					</u-col>
+					<u-col span="4">
+						<view class="demo-layout title_name">不完整粒(%)</view>
+					</u-col>
+					<u-col span="2"> 
+						<view class="demo-layout value_css">{{item.imperfectGrain?item.imperfectGrain:'--'}}</view>
+					</u-col>
+				</u-row>
+				<u-row customStyle="margin-bottom: 10px" class="row_css">
+					<u-col span="3">
+						<view class="demo-layout title_name">等级</view>
+					</u-col>
+					<u-col span="3">
+						<view class="demo-layout value_css">{{item.grade?item.grade:'--'}}</view>
+					</u-col>
+				</u-row>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataList: [],
+			}
+		},
+		onLoad(options) {
+			this.dataList = JSON.parse(options.data)
+			console.log(this.dataList)
+		},
+		onShow() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.center {
+		padding: 30rpx 20rpx;
+	}
+	.u-form {
+		// margin-bottom: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 0rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
+		}
+	}
+
+	.data_css {
+		background-color: #ffffff;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		.data_item {
+			display: flex;
+			.data_item_left,
+			.data_item_right {
+				width: 50%;
+			}
+			.data_item_left{
+				margin-left: 10rpx;
+			}
+
+			.data_item_right {
+				text-align: right;
+			}
+		}
+		.data_top_css{
+			margin-top: 10rpx;
+			
+		}
+	}
+	.row_css{
+		margin-bottom: 10rpx;
+	}
+	.title_name{
+		color: #8F8F8F;
+	} 
+	.value_css{
+		color: #333333;
+		text-align: right;
+		margin-right: 40rpx;
+	}
+</style>

pages/task/audit/warehouse_approval.vue

@@ -26,23 +26,36 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row'>
-				<view class="left">基准水分（%）</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
+				<view class="left" >基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮水分（%）</view>
 				<view class="right">{{list.waterMin}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view v-if="list.paramType == '2'" class='row'>
+			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class='row'>
+			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
+				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+				<tr>
+					<td>容重(g/L)</td>
+					<td>价格(元/公斤)</td>
+				</tr>
+				<tr v-for="(item,index) in list.detailPrints">
+					<td>{{item.bulkDensityMax }} ~ {{ item.bulkDensityMin}}</td>
+					<td>{{item.bulkDensityPrice}}</td>
+				</tr>
+				</table>
+				
+			</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
@@ -51,7 +64,7 @@
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2">
+		<view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -76,7 +89,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -126,7 +139,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<view v-if='show1' class="shade">
@@ -139,10 +152,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{rejectInfo.length}}/100个字
+						{{rejectInfo.length}}/1000个字
 					</view>
 					<u-input class="" v-model='rejectInfo' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="1000" />
 				</view>
 				<!-- 	<u-button @click="show1 = false"  class="cancel">取消</u-button>
 				<u-button @click="reject()" class="confirm">确定</u-button> -->
@@ -203,7 +216,7 @@
 				auditList:[],
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
 				switchVal: false,
-				contractNoList: []
+				contractNoList: [],
 			};
 		},
 		computed: {
@@ -242,10 +255,11 @@
 					mask:true
 				})
 				var data = []
+				var that =this
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
-					if (res.data.code == 200) {
+					if (res.data.code == 200) { 
 						this.list = res.data.data
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'PROCUREMENT-PRICE-APPROVE',
@@ -253,7 +267,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -357,7 +372,7 @@
 							// that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
 							// 	.then(res => {
 							// 		if (res.data.code == 200) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											approved: true,
 											auditMind: that.rejectInfo1,
 											needReapply: true,
@@ -398,7 +413,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.list.taskId,
 									approved: false,
 									auditMind: that.rejectInfo,
@@ -650,14 +665,14 @@
 				.item1{
 					position:relative;
 					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
 					.status{
 						position:absolute;
@@ -700,6 +715,7 @@
 					}
 					.item2 {
 						margin-left: 20rpx;
+						margin-top: -7px;
 						
 						.name {
 							font-size: 28rpx;
@@ -749,4 +765,18 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		.table_css td{
+			text-align: center;
+			border: 1rpx solid #DBD9CE;
+			padding: 14rpx 0;
+		}
+		.table_css{
+			border: 1rpx solid #DBD9CE;
+		}
+	}
 </style>

pages/task/audit/warehouse_details.vue

@@ -26,23 +26,35 @@
 				<view class="left">货名</view>
 				<view class="right">{{list.goodsName}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">基准水分（%）</view>
 				<view class="right">{{list.waterBase}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮水分（%）</view>
 				<view class="right">{{list.waterMin}}</view>
 			</view>
-			<view class='row'>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view v-if="list.paramType == '2'" class='row'>
+			<view v-if="list.paramType == '2' && list.bulkDensityStandard !=1" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class='row'>
+			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
+				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
+				<tr>
+					<td>容重(g/L)</td>
+					<td>价格(元/公斤)</td>
+				</tr>
+				<tr v-for="(item,index) in list.detailPrints">
+					<td>{{item.bulkDensityMax }} ~ {{ item.bulkDensityMin}}</td>
+					<td>{{item.bulkDensityPrice}}</td>
+				</tr>
+				</table>
+			</view>
+			<view class='row' v-if="list.bulkDensityStandard !=1">
 				<view class="left">干粮收购价格（元/公斤）</view>
 				<view class="right">{{list.dryGrainPrice}}</view>
 			</view>
@@ -51,7 +63,7 @@
 				<view class="right">{{list.saleLimit}}</view>
 			</view>
 		</view>
-		<view class="content2">
+		<view class="content2" v-if="list.bulkDensityStandard !=1">
 			<view class="title">粮价设置</view>
 			<view v-for="(item,index) in list.details" :key="index">
 				<view class="row">
@@ -74,7 +86,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -124,7 +136,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -179,6 +191,7 @@
 					mask:true
 				})
 				var data = []
+				var that = this
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
@@ -190,7 +203,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								// branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -394,96 +408,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
@@ -496,4 +530,18 @@
 			margin-top: 20rpx;
 		}
 	}
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		.table_css td{
+			text-align: center;
+			border: 1rpx solid #DBD9CE;
+			padding: 14rpx 0;
+		}
+		.table_css{
+			border: 1rpx solid #DBD9CE;
+		}
+	}
 </style>

pages/task/audit/warehouse_warrant.vue

@@ -15,7 +15,7 @@
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
 					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'待付款'}}</view>
 				</view>
-				<view class="infoData">{{updateDate}}</view>
+				<view class="infoData">{{auditInfo.updateDate}}</view>
 			</view>
 		</view>
 
@@ -31,18 +31,32 @@
 				<view class="left">请款人</view>
 				<view class="right">{{auditInfo.requestPerson}}</view>
 			</view>
+			<view class="row">
+				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>货名 </view>
+				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>重量（吨）</view>
+				<view class="right" style='width:33.3333%;text-align:center;'>金额（元）</view>
+			</view>
+			<view class="row" v-for='item in auditInfo.goodNameList'>
+				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.goodsName}}</view>
+				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.inWarehouseWeight}}</view>
+				<view class="right" style='width:33.3333%;text-align:center;'>{{item.requestFunds}}</view>
+			</view>
 			<view class="row">
 				<view class="left">所属仓库 </view>
 				<view class="right">{{auditInfo.warehouseName}}</view>
 			</view>
-			<view class="row">
+			<view @click="detailed('',1)" class="row">
 				<view class="left">合计重量（吨）</view>
 				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
 			</view>
-			<view class="row">
+			<view @click="detailed('',1)" class="row">
 				<view class="left">合计金额（元）</view>
 				<view class="right">{{auditInfo.requestFundsTotal}}</view>
 			</view>
+			<view class="row">
+				<view class="left">收购名头</view>
+				<view class="right">{{auditInfo.purchaser}}</view>
+			</view>
 			<!-- 	<view class="row">
 				<view class="left">仓库名称</view>
 				<view class="right">{{auditInfo.warehouseName}}</view>
@@ -61,7 +75,7 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList" @click="detailed(item,2)">
 				<view class='flex align-center justify-between'>
 					<view class="name">
 						{{item.customer}}
@@ -108,7 +122,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -116,7 +130,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -166,7 +180,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<view v-if='show' class="shade">
@@ -179,17 +193,17 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						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'>
+		<view v-if='auditInfo.taskId' 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>
@@ -248,6 +262,17 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			detailed(data,status){
+				let obj
+				if(status==1){
+					 obj= JSON.stringify(this.auditInfo.warehousingOrderList)
+				}else{
+					obj = JSON.stringify([data])
+				}
+					uni.navigateTo({
+						url: '/pages/task/audit/viewDetail?data='+obj
+					});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -290,6 +315,7 @@
 					title: "加载中...",
 					mask: true
 				})
+				var that =this
 				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
@@ -331,10 +357,47 @@
 				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
 					searchType: 1,
-					batchId: this.id
+					batchId: this.id,
+					compId: uni.getStorageSync('pcUserInfo').compId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						var arr=[]
+						if(res1.data.data.warehousingOrderList){
+							var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
+							for (var i = 0; i < datalist.length; i++) {
+								if(arr.length==0){
+									arr.push(datalist[i])
+								}else{
+									var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
+									if(arr1.length>0){
+										for (var q = 0; q < arr.length; q++) {
+											
+											if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
+												console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
+												arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
+												arr[q].requestFunds+=datalist[i].requestFunds
+											}
+										}
+									}else{
+										arr.push(datalist[i])
+									}
+								}
+								
+							}
+							for (var q = 0; q < arr.length; q++) {
+								arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
+								arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
+							}
+						}
+						console.log(arr,1111111)
+						this.auditInfo.goodNameList=arr
+						if(this.auditInfo.inWarehouseWeightTotal){
+							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(2)
+						}
+						if(this.auditInfo.requestFundsTotal){
+							this.auditInfo.requestFundsTotal = this.auditInfo.requestFundsTotal.toFixed(2)
+						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -343,7 +406,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -497,7 +561,7 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -532,7 +596,7 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// 	var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
@@ -569,7 +633,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -705,96 +769,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/audit/warehouse_warrant_detail.vue

@@ -13,9 +13,9 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'待付款'}}</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'已完成'}}</view>
 				</view>
-				<view class="infoData">{{updateDate}}</view>
+				<view class="infoData">{{auditInfo.updateDate}}</view>
 			</view>
 		</view>
 
@@ -36,12 +36,26 @@
 				<view class="right">{{auditInfo.warehouseName}}</view>
 			</view>
 			<view class="row">
+				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>货名 </view>
+				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>重量（吨）</view>
+				<view class="right" style='width:33.3333%;text-align:center;'>金额（元）</view>
+			</view>
+			<view class="row" v-for='item in auditInfo.goodNameList'>
+				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.goodsName}}</view>
+				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.inWarehouseWeight}}</view>
+				<view class="right" style='width:33.3333%;text-align:center;'>{{item.requestFunds}}</view>
+			</view>
+			<view @click="detailed('',1)" class="row">
 				<view class="left">合计重量（吨）</view>
-				<view class="right">{{auditInfo.inWarehouseWeightTotal}}</view>
+				<view class="right" style='color:red;'>{{auditInfo.inWarehouseWeightTotal}}</view>
 			</view>
-			<view class="row">
+			<view @click="detailed('',1)" class="row">
 				<view class="left">合计金额（元）</view>
-				<view class="right">{{auditInfo.requestFundsTotal}}</view>
+				<view class="right" style='color:red;'>{{auditInfo.requestFundsTotal}}</view>
+			</view>
+			<view class="row">
+				<view class="left">收购名头</view>
+				<view class="right">{{auditInfo.purchaser}}</view>
 			</view>
 			<!-- 	<view class="row">
 				<view class="left">仓库名称</view>
@@ -61,7 +75,7 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList" @click="detailed(item,2)">
 				<view class='flex align-center justify-between'>
 					<view class="name">
 						{{item.customer}}
@@ -108,7 +122,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -116,7 +130,7 @@
 				流程
 			</view>
 			<view v-for="(item,index) in auditList" :key='index' class="audit">
-				<view class="row">
+				<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 					<view class="left">
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
@@ -166,7 +180,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 			</view>
 		</view>
 		<view v-if='show' class="shade">
@@ -247,6 +261,17 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			detailed(data,status){
+				let obj
+				if(status==1){
+					 obj= JSON.stringify(this.auditInfo.warehousingOrderList)
+				}else{
+					obj = JSON.stringify([data])
+				}
+					uni.navigateTo({
+						url: '/pages/task/audit/viewDetail?data='+obj
+					});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -289,6 +314,7 @@
 					title: "加载中...",
 					mask: true
 				})
+				var that =this
 				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
@@ -328,21 +354,59 @@
 						this.url2 = res1.data.data
 					}
 				})
-				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
+				this.$api.doRequest('post', '/warehousingOrder/exportPhoneDataHis', {
 					// searchType: 1,
 					batchId: this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if(res1.data.data.warehousingOrderList){
+							var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
+						}
+						var arr=[]
+						for (var i = 0; i < datalist.length; i++) {
+							if(arr.length==0){
+								arr.push(datalist[i])
+							}else{
+								var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
+								if(arr1.length>0){
+									for (var q = 0; q < arr.length; q++) {
+										
+										if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
+											console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
+											arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
+											arr[q].requestFunds+=datalist[i].requestFunds
+										}
+									}
+								}else{
+									arr.push(datalist[i])
+								}
+							}
+							
+						}
+						for (var q = 0; q < arr.length; q++) {
+							arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
+							arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
+						}
+						console.log(arr,1111111)
+						this.auditInfo.goodNameList=arr
+						if(this.auditInfo.inWarehouseWeightTotal){
+							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(2)
+						}
+						if(this.auditInfo.requestFundsTotal){
+							this.auditInfo.requestFundsTotal = this.auditInfo.requestFundsTotal.toFixed(2)
+						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'WAREHOUSING-ORDER-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
+								businessKey: this.id,
+								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -428,20 +492,20 @@
 						
 					}
 				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'WAREHOUSING-ORDER-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
-
-					})
-				})
+				// this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+				// 	businessCode: 'WAREHOUSING-ORDER-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
+
+				// 	})
+				// })
 			},
 			close() {
 				this.show = false
@@ -495,7 +559,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -631,96 +695,116 @@
 			.left {
 				display: flex;
 				align-items: center;
-				.item1{
-					position:relative;
-					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+	
+				.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;
+	
+					.status {
+						position: absolute;
 						border-radius: 50%;
 						padding: 0px 2px;
 						right: -3px;
 						bottom: -3px;
-						background:#fff;
+						background: #fff;
 					}
-					.status.success{
-						border:1px solid rgb(60, 156, 255);
+	
+					.status.success {
+						border: 1px solid rgb(60, 156, 255);
 					}
-					.status.error{
-						border:1px solid rgb(245, 108, 108);
+	
+					.status.error {
+						border: 1px solid rgb(245, 108, 108);
 					}
-					.status.question{
-						border:1px solid #f9ae3d;
+	
+					.status.question {
+						border: 1px solid #f9ae3d;
 					}
 				}
-				
+	
 			}
 	
 			.right {
-				width:80%;
+				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-				.right-content{
-					background:#F2F3F7;
-					margin-left:10px;
-					margin-top:10px;
-					padding:10px;
-					border-radius:5px;
+	
+				.right-content {
+					background: #F2F3F7;
+					margin-left: 10px;
+					margin-top: 10px;
+					padding: 10px;
+					border-radius: 5px;
 					color: #B0B1B5;
 				}
-				.right-item{
+	
+				.right-item {
 					display: flex;
 					justify-content: space-between;
-					.time{
-						color:#999;
+	
+					.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;
+	
+		.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;
+	
+			.status {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
+	
 		.row-line {
 			width: 1px;
 			height: 30px;

pages/task/my_task.vue

@@ -3,17 +3,18 @@
 		<view class="content1-top">
 			<view class="search-form round">
 				<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
-					placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+					placeholder="请输入任务日期或任务标题" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
 			<view class="top2">
 				<view class="left">
 					<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
 					<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
+					<view @click='tabcarchange(5)' class='line' :class='statusFlag==5?"active":""'>已发起</view>
 				</view>
 				<view class="right">
-					<view class="right-contrent1">逐条审核</view>
-					<u-switch v-model="checked" active-color="#22C572" inactive-color="#eee" size='40'></u-switch>
+				<!-- 	<view class="right-contrent1">逐条审核</view>
+					<u-switch v-model="checked" active-color="#22C572" inactive-color="#eee" size='40'></u-switch> -->
 				</view>
 			</view>
 
@@ -29,11 +30,11 @@
 							<view v-if='statusFlag==3' class="title-row1">已审批
 								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
 							</view>
-
 							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 						</view>
 						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
 						<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
+						<text v-if='statusFlag==5' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 					</view>
 					<view class="flex title_b">
 						<view style='color:#878C9C;' class="title row2">
@@ -92,6 +93,12 @@
 				return true
 			}
 		},
+		onPullDownRefresh() {
+				this.getIndexBuyData(1,this.keyword)
+				setTimeout(function () {
+					uni.stopPullDownRefresh();
+				}, 1000);
+			},
 		watch: {
 			checked(val) {
 				uni.setStorageSync("everyTask", this.checked)
@@ -152,7 +159,7 @@
 								'&compId=' + this
 								.pcUserInfo.compId
 						}
-					} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+					} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/freight_setting_approval?id=` + item.businessId
 						} else {
@@ -202,12 +209,18 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
+			if(this.statusFlag==1){
+				this.getIndexBuyData(1,this.keyword)
+			}
+			// this.warehouseInOutInfo.phone = this.userInfo.phone
+		},
+		onLoad() {
 			if (uni.getStorageSync("everyTask") == true) {
 				this.checked = true
 			} else {
 				this.checked = false
 			}
-
+			this.pages = 1
 			this.warehouseInOutInfo.currentPage = 1
 			this.data.currentPage = 1
 			this.taskInfo = []
@@ -233,10 +246,9 @@
 					this.getIndexBuyData()
 				}
 			})
-			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
-			if (this.statusFlag == 3) {
+			// if (this.statusFlag == 3) {
 				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
 					this.pages += 1
 					if (this.statusFlag == 1) {
@@ -245,9 +257,9 @@
 						this.data.currentPage += 1
 					}
 
-					this.getIndexBuyData()
+					this.getIndexBuyData(1,this.keyword)
 				}
-			}
+			// }
 		},
 		// onLoad(options) {
 		// 	this.getIndexBuyData()
@@ -309,35 +321,37 @@
 				console.log(status);
 			},
 			searchKeyWord() {
+				this.pages=1
 				if (!this.keyword) {
 					this.$api.msg('关键字不能为空')
 				}
-				uni.showLoading({
-					title: "正在加载"
-				})
-				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
-					res => {
-						if (res.data.code == 200) {
-							this.taskInfo = res.data.data
-							uni.hideLoading()
-						} else {
-							uni.showToast({
-								title: res.data.message,
-								icon: 'none',
-								duration: 2000
-							})
-							uni.hideLoading(this.taskInfo, "信息")
-						}
-					}).catch(res => {
-					uni.showToast({
-						title: res.data.message,
-						icon: 'none',
-						duration: 2000
-					})
-					uni.hideLoading()
-				})
+				this.getIndexBuyData(1,this.keyword)
+				// uni.showLoading({
+				// 	title: "正在加载"
+				// })
+				// this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
+				// 	res => {
+				// 		if (res.data.code == 200) {
+				// 			this.taskInfo = res.data.data
+				// 			uni.hideLoading()
+				// 		} else {
+				// 			uni.showToast({
+				// 				title: res.data.message,
+				// 				icon: 'none',
+				// 				duration: 2000
+				// 			})
+				// 			uni.hideLoading(this.taskInfo, "信息")
+				// 		}
+				// 	}).catch(res => {
+				// 	uni.showToast({
+				// 		title: res.data.message,
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// 	uni.hideLoading()
+				// })
 			},
-			getIndexBuyData(status) {
+			getIndexBuyData(status,searchKeyword) {
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
@@ -347,16 +361,26 @@
 				})
 				var data = {}
 				if (this.statusFlag == 1) {
-					// data = this.warehouseInOutInfo
+					data.searchKeyword = searchKeyword
+					data.currentPage = pages
+					data.pageSize = limit
 					url = '/newNoticeTask/query/noticeTasks'
-				} else {
+				} else if (this.statusFlag == 3) {
 					data.currentPage = pages
 					data.pageSize = limit
 					data.roleId = this.userInfo.roleIds
 					data.userId = this.userInfo.id
+					data.searchKeyword = searchKeyword
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
-
+				else if (this.statusFlag == 5) {
+					data.currentPage = pages
+					data.pageSize = limit
+					data.roleId = this.userInfo.roleIds
+					data.createUserId = this.userInfo.id
+					data.searchKeyword = searchKeyword
+					url = '/commonUser/query/findHisPageNoticeTasksMy'
+				}
 
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
@@ -364,7 +388,7 @@
 						let data = res.data.data.records
 						//采购信息
 						if (data.length > 0) {
-							if (status) {
+							if (pages==1) {
 								that.taskInfo = data
 							} else {
 								that.taskInfo = that.taskInfo.concat(data)
@@ -430,7 +454,7 @@
 									this.taskInfo[i].messageTitle = '仓库设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'Tran') {
-								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
+								if (this.taskInfo[i].businessCode == 'YUNJIA-TRAN-APPROVE') {
 									this.taskInfo[i].messageTitle = '运费设置'
 								}
 							} else if (this.taskInfo[i].businessType == 'ACQ') {
@@ -451,7 +475,9 @@
 						if (res.data.data.records.length == 0 && this.data.currentPage == 1 && this.statusFlag ==
 							3 ||
 							res.data.data.records.length == 0 && this.warehouseInOutInfo.currentPage == 1 && this
-							.statusFlag == 1) {
+							.statusFlag == 1 ||
+							res.data.data.records.length == 0 && this.warehouseInOutInfo.currentPage == 1 && this
+							.statusFlag == 5) {
 							console.log()
 							this.taskInfo = []
 						}
@@ -475,7 +501,7 @@
 			},
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
-				this.pageSize = 1
+				this.pages = 1
 				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
@@ -492,7 +518,12 @@
 					uni.navigateTo({
 						url: '/pages/task/audit/salecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
-				} else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
+				}
+				 else if (item.businessCode == 'JIAYOU-SHENHE-APPROVE') {
+				 	uni.navigateTo({
+				 		url: '/pages/task/audit/refuel?id=' + item.businessId + "&isShowbtn=true"
+				 	})
+				 }else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/audit/daishou_details?id=' + item.businessId + "&isShowbtn=true"
 					})
@@ -584,7 +615,7 @@
 								.pcUserInfo.compId + "&isShowbtn=true"
 						})
 					}
-				} else if (item.businessCode == 'TRAN-TASK-APPROVE') {
+				} else if (item.businessCode == 'YUNJIA-TRAN-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +

pages/task/procurement_close_details.vue

@@ -121,7 +121,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: true,
 											auditMind: '34',
@@ -148,7 +148,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: false,
 											auditMind: '已驳回',

pages/task/procurement_details.vue

@@ -136,7 +136,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/purchaseOrder/api/editPurchaseOrder', that.list).then(res1 => {
 								if (res1.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId:that.list.taskId,
 										approved: true,
 										auditMind: '34',

pages/task/procurement_report_details.vue

@@ -154,7 +154,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: true,
 								auditMind: '34',
@@ -181,7 +181,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: false,
 								auditMind: '已驳回',

pages/task/sale_close_details.vue

@@ -121,7 +121,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: true,
 											auditMind: '34',
@@ -148,7 +148,7 @@
 								confirmText: '提交',
 								success: function(res) {
 									if (res.confirm) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											taskId:that.list.taskId,
 											approved: false,
 											auditMind: '已驳回',

pages/task/sale_details.vue

@@ -133,7 +133,7 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/saleOrder/api/editSaleOrder', that.list).then(res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId:that.list.taskId,
 										approved: true,
 										auditMind: '34',

pages/task/sale_report_details.vue

@@ -154,7 +154,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: true,
 								auditMind: '34',
@@ -181,7 +181,7 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								taskId:that.list.taskId,
 								approved: false,
 								auditMind: '已驳回',

pages/universalityAudit/addaduit.vue

@@ -0,0 +1,373 @@
+<template>
+	<view>
+		<view>
+			<u-form :model="dataobj" ref="uForm">
+				<u-form-item class='typeform'  :border-bottom='false' label="类型"><view style='color:#000;width:100%;text-align:right;' @click='typeselect'>{{dataobj.businessType?dataobj.businessType:'请选择类型 >'}}</view></u-form-item>
+			</u-form>
+			<u-form :model="dataobj"  ref="uForm">
+				<u-form-item :border-bottom='false' :label-position='"top"' label="备注">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{dataobj.remark.length}}/2000个字
+						</view>
+						<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+							maxlength="100" /> -->
+							<textarea style='font-size:12px;' maxlength="2000" v-model='dataobj.remark' placeholder="请输入备注信息" name="" id="" cols="30" rows="11"></textarea>
+					</view>
+				</u-form-item>
+			</u-form>
+			<view class='wrap'>
+				<view class="c-row">
+				<view class="title">
+					<view>附件</view><view><text style='color:#617AE0;'>{{imglist2.length}}</text>/20</view></view>
+				</view>
+				<view style="display: flex;flex-wrap: wrap;">
+					<view v-for='(item,index) in imglist2' v-if="imglist2 && imglist2.length > 0"
+						style="position: relative;margin:20rpx 0 20rpx 20rpx;">
+						<view class="delete_img" @click="deleteImg(index)">X</view>
+						<image :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image>
+					</view>
+					<view class="biankuang" @click="uploadClick" v-if="imglist2.length < 20">
+						<view class="tubiao">
+								上传附件
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<u-picker @confirm='typeconfirm' :range="xialaList"  mode="selector" v-model="show" range-key="constValue" :default-selector="[0]"></u-picker>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<view @click="submit()" class="btn">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	import * as config from '../../config'
+	export default {
+		data() {
+			return {
+				xialaList:[],
+				show:false,
+				dataobj:{remark:''},
+				imglist:[],
+				imglist2:[]
+			}
+		},
+		onShow(){
+			this.getList()
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+					})
+				},
+				deep: true
+			}
+		},
+		methods: {
+			async uploadClick() {
+				let baseUrlNew = config.def().baseUrlNew
+				console.log('baseUrlNew',baseUrlNew)
+				uni.chooseImage({
+					count:10,
+					success: (chooseImageRes) => {
+						console.log('chooseImageRes',chooseImageRes)
+						let files = []
+						for (let item of chooseImageRes.tempFiles) {
+							files.push({
+								name: 'fileName',
+								uri : item.path
+							});
+						}
+						uni.uploadFile({
+							url: baseUrlNew + 'appendix/api/uploadFiles',
+							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
+							files: files,
+							formData: {
+								// fileName: chooseImageRes.tempFiles[0],
+								companyId: "2710b21efc1e4393930c5dc800010dc4",
+								modelId: '',
+								vesselId: '',
+							},
+							success: (uploadFileRes) => {
+								console.log(JSON.parse(uploadFileRes.data))
+								var data = JSON.parse(uploadFileRes.data).data
+								this.$api.doRequest('post', '/appendix/api/saveFiles', {
+									newAppendixs: [data],
+									oldAppendixIds: ""
+								}).then(res => {
+									this.imglist.push(res.data.data[0])
+									console.log(res)
+								})
+								console.log(uploadFileRes.data);
+							},
+							fail(res) {
+								
+								console.log(res);
+							}
+						});
+					}
+				});
+			},
+			deleteImg(index) {
+				this.imglist.splice(index, 1)
+			},
+			getList(){
+				this.$api.doRequest('get', '/commonSysParameter/getInfo', {
+					constId:'EXA1'
+				}).then(res => {
+					this.xialaList=res.data.data
+				})
+			},
+			typeselect(){
+				this.show=true
+			},
+			typeconfirm(e){
+				console.log(this.xialaList[e[0]])
+				this.dataobj.businessType=this.xialaList[e[0]].constValue
+			},
+			submit() {
+				if (!this.dataobj.businessType) {
+					this.$api.msg('类型不能为空')
+					return
+				}
+				
+				var that = this
+				this.dataobj.compId=uni.getStorageSync('pcUserInfo').compId
+				this.dataobj.sponsor=this.userInfo.userName
+				
+				uni.showModal({
+					content: '确定发起申请？',
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							if (that.imglist.length > 0) {
+								that.dataobj.addressUrl = that.imglist.toString()
+							}
+							uni.showLoading({
+								title: "加载中",
+								mask: true
+							})
+							that.$api.doRequest('post', '/generalAuditInfo/api/insertGeneralAuditInfo', that.dataobj)
+								.then(res => {
+									if (res.data.code == 200) {
+										uni.hideLoading()
+										that.$api.msg('提交成功')
+										uni.navigateBack({
+											delta: 1
+										});
+									} else {
+										that.$api.msg('提交失败')
+									}
+								})
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+page {
+		background: #F5F6FA;
+	}
+.u-form {
+		margin: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+			color: #878C9C;
+		}
+	}
+	.delete_img {
+		position: absolute;
+		z-index: 100;
+		left: 84px;
+		color: #ffffff;
+		font-size: 24rpx;
+		border: 1px;
+		border-radius: 5rpx 5rpx 5rpx 20rpx;
+		width: 32rpx;
+		height: 32rpx;
+		background-color: rgba(17, 26, 52, 0.5000);
+		padding:0 3px 0 5px;
+		text-align: center;
+	}
+
+	.title_b {
+		margin: 20rpx 20rpx 0rpx 20rpx;
+		padding: 20rpx 10rpx 20rpx 10rpx;
+		font-size: 18px;
+		font-weight: 550;
+	}
+
+	.xinxi {
+		padding: 20rpx 30rpx;
+	}
+
+	.tubiao {
+		margin: 0 auto;
+		text-align: center;
+		margin-top: 35rpx;
+	}
+
+	.biankuang {
+
+		width: 100%;
+		height: 120rpx;
+		border-radius: 30px;
+		margin:0 20rpx;
+		background:#F5F9FC;
+		color:#617AE0;
+	}
+
+	.upload {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.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;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		flex: 1;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		flex-direction: column;
+		color: #303133;
+		line-height: 20px;
+		text-align: right;
+		padding-right: 10px;
+		justify-content: space-between;
+	}
+
+	.title {
+		width:100%;
+		display:flex;
+		justify-content: space-between;
+	}
+
+	.buns_item {
+		display: flex;
+		padding: 80rpx 0 50rpx 0;
+		justify-content: space-around;
+	}
+
+	.but_css {
+		background: #22C572;
+		width: 40%;
+		padding: 20rpx;
+		color: #fff;
+		text-align: center;
+		border-radius: 20rpx;
+	}
+
+	/deep/.u-radio-group {
+		flex-direction: row-reverse;
+	}
+
+	.no-boder {
+		border: 0;
+	}
+
+	.textarea {
+		background: #F9F9FA;
+		border: 1px solid #EEEEEE;
+	}
+
+	.remark {
+		position: absolute;
+		right: 10px;
+		bottom: 20px;
+		color: #AFB3BF;
+	}
+
+	.submit {
+		width: 100%;
+		background: #2c8ac5;
+		border-radius: 10rpx;
+	}
+
+	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
+		width: 100%;
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		z-index: 9999;
+	}
+
+	.content {
+		overflow: hidden;
+	}
+
+	.btn {
+		border-radius: 50rpx;
+		padding: 20rpx 0;
+		background: #22C572;
+		color: #fff;
+		font-size: 32rpx;
+		width: 100%;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: center;
+	}
+	.margin-bottom{
+		margin-bottom:84px;
+	}
+	.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;
+		}
+	}
+	.wrap{
+		border-radius:10px;
+		background:#fff;
+		margin:10px 10px 80px 10px;
+		padding:0 0 10px 0;
+	}
+</style>

pages/universalityAudit/list.vue

@@ -0,0 +1,77 @@
+<template>
+	<view>
+		<view class='wrap' v-for='item in datalist' @click='lookdetails(item)'>
+			<view style='display:flex;justify-content: space-between;'>
+				<view class='title'>
+					{{item.businessType}}
+				</view>
+				<view v-if='item.approveStatus' style='color:#FD714F;'>
+					{{item.approveStatus?item.approveStatus:item.status}}
+				</view>
+				<view v-if='item.status=="已驳回"' style='color:#FF4E4E;'>
+					{{item.approveStatus?item.approveStatus:item.status}}
+				</view>
+				<view v-if='item.status=="已通过"' style='color:#22C572;'>
+					{{item.approveStatus?item.approveStatus:item.status}}
+				</view>
+			</view>
+			<view>{{item.createDate}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				datalist:[],
+				currentPage:1,
+				pageSize:10
+			}
+		},
+		onShow(){
+			this.getList()
+		},
+		methods: {
+			lookdetails(row){
+				uni.navigateTo({
+					url:'/pages/universalityAudit/look?id='+row.id
+				})
+			},
+			onNavigationBarButtonTap() {
+			    uni.navigateTo({
+			    	url:'/pages/universalityAudit/addaduit'
+			    })
+			  },
+			getList(){
+				this.$api.doRequest('get', '/generalAuditInfo/selectGeneralAuditInfo', {
+					startDate: '',
+					endDate: '',
+					searchKeyWord: '',
+					currentPage: this.currentPage,
+					pageSize:this.pageSize,
+					searchType: '',
+					businessType: ''
+				}).then(res => {
+					this.datalist=res.data.data.records
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+.wrap{
+	background:#fff;
+	margin:10px;
+	padding:20px;
+	border-radius:10px;
+	font-size:28rpx;
+	line-height:36rpx;
+	.title{
+		font-size:36rpx;
+		margin-bottom:10rpx;
+	}
+}
+</style>

pages/universalityAudit/look.vue

@@ -0,0 +1,518 @@
+<template>
+	<view>
+		<view>
+			<u-form :model="dataobj" ref="uForm">
+				<u-form-item label="类型"><view style='text-align:right;width:100%;color:#AFB3BF;'>{{dataobj.businessType}}</view></u-form-item>
+				<u-form-item :border-bottom='false' :label-position='"top"' label="备注">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{dataobj.remark.length}}/2000个字
+						</view>
+						<textarea style='font-size:12px;' disabled maxlength="2000" v-model='dataobj.remark' placeholder="请输入备注信息" name="" id="" cols="30" rows="11"></textarea>
+					</view>
+				</u-form-item>
+			</u-form>
+			<u-form :label-position='"top"' ref="uForm">
+				<u-form-item :border-bottom='false' :label="'共'+imglist.length+'个附件'">
+				<view style='width:100%;border-top:1px solid #EEEEEE;' v-if='imglist.length>0'>
+					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									class="imgsign" src="../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									class="imgsign" src="../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									class="imgsign" src="../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else class="imgsign" :src="item.appendixPath" mode="">
+								</image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="img_size">{{item.appendixSize}}</view>
+							</view>
+							<view style="color: #22C572;" class="img_dowload" @click="openDocument(item)">
+								下载
+							</view>
+						</view>
+						
+						<!-- <u-icon name="attach" ></u-icon> -->
+						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+					</view>
+				</view>
+				</u-form-item>
+			</u-form>
+			<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="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="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>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id:'',
+				dataobj:{},
+				imglist:[],
+				auditList:[]
+			}
+		},
+		onLoad(options){
+			this.id=options.id
+			console.log(options.id)
+		},
+		onShow(){
+			// this.$nextTick(()=>{
+				this.getList()
+			// })
+			
+		},
+		methods: {
+			getList(){
+				var that =this
+				this.$api.doRequest('get', '/generalAuditInfo/getGeneralAuditInfo', {
+					id:this.id
+				}).then(res => {
+					this.dataobj=res.data.data
+					this.$api.doRequest('get', '/appendix/query/getFileList', {
+						appendixIds: that.dataobj.addressUrl
+					}).then(res1 => {
+						that.imglist = res1.data.data
+						for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+							if (that.imglist[i].appendixName) {
+								let index = that.imglist[i].appendixName.lastIndexOf(".") 
+								that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+							}
+						}
+					})
+					// 查流程
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'GENERAL-AUDIT-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.dataobj.businessType?that.dataobj.businessType:'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.createDate).getTime()
+							var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle: this.list.creater.substring(0, 2),
+								operatorName: this.list.creater,
+								updateDate: time3,
+								auditMind: '',
+								desc: '发起申请',
+								showflow: false,
+								commonStaffs1: null,
+								commonStaffs: null,
+								workflowHistoricTasks: [],
+								status: 'success'
+							})
+						})
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.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;
+					}
+				}
+	
+			}
+	
+			.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;
+		}
+	}
+.u-form {
+		margin: 20rpx;
+		background: #fff;
+		border-radius: 10px;
+		padding: 30rpx 10px;
+	
+		.u-form-item {
+			line-height: 30px;
+			padding: 0px 0;
+			font-size: 26rpx;
+		}
+	}
+	.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;
+		}
+	}
+.form_top {
+		border-bottom: 1px solid #F5F6FA;
+		padding-bottom: 10px;
+		margin-bottom: 18rpx;
+		font-size: 30rpx;
+		font-weight: 600;
+	}
+
+	.form_view{
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		background: #F9F9FA;
+		padding: 30rpx 20rpx;
+		margin-top: 30rpx;
+	}
+
+	.label_css {
+		font-size: 26rpx;
+		color: #878C9C;
+	}
+
+	.input_css {
+		font-size: 20rpx;
+	}
+	.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/user/contractLook/inventoryCost.vue

@@ -83,10 +83,13 @@
 				// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
 				value: '入库记录',
 				costList: [],
-				isShowDetailBtn: false
+				isShowDetailBtn: false,
+				searchMonth:'2022-10-10'
 			}
 		},
 		onLoad: function(option) {
+			console.log(option)
+			this.searchMonth = option.searchMonth
 			this.init()
 		},
 		computed: {
@@ -168,7 +171,8 @@
 					})
 					this.$api.doRequest('get', '/costManagementInfo/selectCostManagementInfo', {
 						compId: uni.getStorageSync('pcUserInfo').compId,
-						warehouseType: 1
+						warehouseType: 1,
+						searchMoth:this.searchMonth
 					}).then(res => {
 						uni.hideLoading()
 						if (res.data.data) {

pages/user/depotAcquisition/depotAcquisition.vue

@@ -112,16 +112,20 @@
 		onShow() {
 			let _city = uni.getStorageSync("depotAcquisition_selectCity")
 			this.currentCityName = _city ? _city.positionName.cityName : ''
-			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession", res)
-				if (res.data.data == "INVALID") {
-					this.isShowAlert = true;
-				}
-				this.currentPage = 1
-				this.isLoadMore = false
-				this.loadStatus = 'more'
-				this.getListData()
-			})
+			// this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
+			// 	console.log("checkSession", res)
+			// 	if (res.data.data == "INVALID") {
+			// 		this.isShowAlert = true;
+			// 	}
+			// 	this.currentPage = 1
+			// 	this.isLoadMore = false
+			// 	this.loadStatus = 'more'
+			// 	this.getListData()
+			// })
+			this.currentPage = 1
+			this.isLoadMore = false
+			this.loadStatus = 'more'
+			this.getListData()
 			console.log("hasLogin", this.hasLogin)
 		},
 		methods: {

pages/user/depotMonitoring.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="wrap">
-		<view class='title'>库点监控管理</view>
+		<!-- <view class='title'>库点监控管理</view>
 		<view class="dropdown">
 			<view class="left">仓库名称</view>
 			<view class="right" @click='show1=true'>
@@ -9,21 +9,22 @@
 				<u-picker @confirm="warehousechange" range-key='warehouseName' mode="selector" v-model="show1"
 					:range="warehouseList"></u-picker>
 			</view>
-		</view>
-		<view class="content no-content" v-if="warehouseName!='山东诸城迈饶库'">暂无视频</view>
-		<view class="content" v-if="warehouseName=='山东诸城迈饶库'">
+		</view> -->
+		<view class="content">
 			<view class='title'>监控视频</view>
 			<view class="video-list">
-				<view class=" cu-list grid col-4 no-border">
+				<view class=" cu-list grid col-3 no-border">
 					<view class="cu-item" style='text-align:center;' v-for="(item,index) in videoList"
 						@click="gridClick(item)">
+						<view style='height:40px;'>{{item.Name}}</view>
+						
 						<view v-if="item.Status == 'ON'">
 							<image v-if="item.SnapURL" :src="'https://live.eliangeyun.com'+item.SnapURL" class="sign1">
 							</image>
-							<view v-else style="background-color: #008000;" class="sign1">
-								<image src="../../static/img/play-btn.png"
-									style="width: 80rpx;height: 80rpx;margin-top: 40rpx;"></image>
-							</view>
+						</view>
+						<view v-if="item.Status=='OFF'" style="background-color: #008000;margin:0 auto;" class="sign1">
+							<image src="../../static/img/play-btn.png"
+								style="width: 80rpx;height: 80rpx;margin-top: 40rpx;"></image>
 						</view>
 					</view>
 				</view>

pages/user/report.vue

@@ -5,11 +5,18 @@
 				title-color='white'>
 			</u-navbar>
 			<view class="row2">
-				<view class="left" @click="dateClick">
+				<!-- <view class="left" @click="dateClick">
 					{{nowDate}}
 					<u-icon name="arrow-down-fill" size="16" class="icon"></u-icon>
-				</view>
+				</view> -->
+				<!-- <view class="left">
+					<div :class="btnIndex==1?'activeBtn':''" @click="selectData(1)" class="type-style">新季</div>
+					<div :class="btnIndex==2?'activeBtn':''" @click="selectData(2)" class="type-style">历史</div>  
+				</view> -->
 				<view class="right">
+					<div :class="btnIndex==1?'activeBtn':''" @click="selectData(1)" class="btn-style">新季</div>
+					<div :class="btnIndex==2?'activeBtn':''" @click="selectData(2)" class="btn-style">历史</div>  
+					
 					<view :class="typeSelect==index?'type-bgc':''" class="type-style" v-for="(item,index) in moneyList"
 						@click="typeClick(index)">
 						{{item.name}}
@@ -26,7 +33,7 @@
 			</view>
 		</view>
 		<view class="move-content">
-			
+
 			<view class="content2 content-wrap">
 				<view class="row1">
 					<view class="left title">
@@ -213,7 +220,7 @@
 				<qiun-data-charts type="column" class='line-chart' :chartData="carChartData" :opts='ringoptions'
 					background="none" />
 			</view>
-			
+
 			<!-- <view class="content6 content-wrap">
 				<view class="title">库点流向分布</view>
 				<u-line color="#EEEEEE" class="u-line" />
@@ -266,6 +273,7 @@
 		},
 		data() {
 			return {
+				btnIndex:1,
 				scrollTop: 0,
 				carInterval: null,
 				inventoryAct: 0,
@@ -326,14 +334,11 @@
 					percentage: ''
 				},
 				dateList: [
-					[
-						{
-							value: '2',
-							label: '2022年'
-						}
-					],
-					[
-						{
+					[{
+						value: '2',
+						label: '2022年'
+					}],
+					[{
 							value: '01',
 							label: '1月'
 						},
@@ -395,13 +400,14 @@
 			}
 		},
 		onLoad: function(option) {
-			uni.showLoading({
-				title: "数据加载中...",
-				mask: true
-			})
-			if (this.nowDate == '2022年1月') {
-				this.seachMoth = '2022-01'
-			}
+			// uni.showLoading({
+			// 	title: "数据加载中...",
+			// 	mask: true
+			// })
+			// if (this.nowDate == '2022年1月') {
+			// 	this.seachMoth = '2022-10-10'  
+			// }
+			this.seachMoth = '2022-10-10'  
 			this.init()
 		},
 		destroyed() {
@@ -411,6 +417,16 @@
 			clearInterval(this.carInterval)
 		},
 		methods: {
+			 selectData(type){
+			      this.seachMoth = ''
+			      this.btnIndex = type
+			      if(type==2){
+			        this.seachMoth = '2021-10-10'  
+			      }else{
+			        this.seachMoth = '2022-10-10'  
+			      }
+			      this.init()
+			},
 			goToPage(index) {
 				// console.log(index)
 				if (index == 4) {
@@ -420,7 +436,7 @@
 					return true
 				} else if (index == 5) {
 					uni.navigateTo({
-						url: '/pages/user/contractLook/inventoryCost'
+						url: '/pages/user/contractLook/inventoryCost?searchMonth=' + this.seachMoth
 					})
 					return true
 				}
@@ -437,9 +453,13 @@
 			init() {
 				this.url = "https://liangxin.zthymaoyi.com/map_0105.html?id=" + uni.getStorageSync('pcUserInfo').compId +
 					'&seachMoth=' + this.seachMoth
-				this.$api.doRequest('get', '/biInfoController/selectBiInfo?compId=' + uni.getStorageSync('pcUserInfo')
+				uni.showLoading({
+					title: "加载中",
+					mask: true
+				})
+				this.$api.doRequest('get', '/biInfoController//selectBiInfoNew?compId=' + uni.getStorageSync('pcUserInfo')
 					.compId + '&seachMoth=' + this.seachMoth).then(res => {
-					// console.log(res)
+					console.log("数据报表", res)
 					uni.hideLoading()
 					let _list = []
 					this.dataList = res.data.data
@@ -451,43 +471,323 @@
 						let _name = ''
 						let _count = ''
 						let _data = []
+						let _x = []
+						let _y = []
 						if (i < 6) {
-							res.data.data[i].biViewInfoList[0].percent = Number(res.data.data[i].biViewInfoList[0]
-								.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage.length -
-									1)).toFixed(2)
-							res.data.data[i].biViewInfoList[0].percentage = Number(res.data.data[i].biViewInfoList[
-									0]
-								.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage.length -
-									1)).toFixed(2) + '%'
+							if (res.data.data[i].biViewInfoList[0].percentage) {
+								res.data.data[i].biViewInfoList[0].percent = Number(res.data.data[i]
+									.biViewInfoList[0]
+									.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage
+										.length -
+										1)).toFixed(2)
+								res.data.data[i].biViewInfoList[0].percentage = Number(res.data.data[i]
+									.biViewInfoList[
+										0]
+									.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage
+										.length -
+										1)).toFixed(2) + '%'
+
+							}
 							res.data.data[i].total = Number(res.data.data[i].total).toFixed(2)
 							switch (i) {
 								case 0:
-									this.dataObj0 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: res.data.data[i].total,
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// this.dataObj0 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: res.data.data[i].total,
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									this.carCount1 = res.data.data[i].biViewInfoList[0] ? res.data.data[i]
+										.biViewInfoList[0].count : ""
+									this.carCount2 = res.data.data[i].biViewInfoList[1] ? res.data.data[i]
+										.biViewInfoList[1].count : ""
+									this.carCount3 = res.data.data[i].biViewInfoList[2] ? res.data.data[i]
+										.biViewInfoList[2].count : ""
+
+									
+									for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
+										_x.push(res.data.data[i].biViewInfoList[k].name)
+										_y.push(Number(res.data.data[i].biViewInfoList[k].count))
+									}
+									this.carChartData = {
+										categories: _x,
+										series: [{
+											"name": '车辆',
+											"data": _y
+										}]
+									}
+									this.ringoptions = {
+										"type": "column",
+										"canvasId": "",
+										"canvas2d": false,
+										"background": "none",
+										"animation": true,
+										"timing": "easeOut",
+										"duration": 1000,
+										"color": [
+											"#22C572"
+										],
+										"padding": [
+											15,
+											15,
+											0,
+											5
+										],
+										"rotate": false,
+										"errorReload": true,
+										"fontSize": 13,
+										"fontColor": "#666666",
+										"enableScroll": false,
+										"touchMoveLimit": 60,
+										"enableMarkLine": false,
+										"dataLabel": true,
+										"dataPointShape": true,
+										"dataPointShapeType": "solid",
+										"tapLegend": true,
+										"xAxis": {
+											"disabled": false,
+											"axisLine": false,
+											"axisLineColor": "#CCCCCC",
+											"calibration": false,
+											"fontColor": "#666666",
+											"fontSize": 13,
+											"rotateLabel": false,
+											"itemCount": 5,
+											"boundaryGap": "center",
+											"disableGrid": true,
+											"gridColor": "#CCCCCC",
+											"gridType": "solid",
+											"dashLength": 4,
+											"gridEval": 1,
+											"scrollShow": false,
+											"scrollAlign": "left",
+											"scrollColor": "#A6A6A6",
+											"scrollBackgroundColor": "#EFEBEF",
+											"format": ""
+										},
+										"yAxis": {
+											"disabled": true,
+											"disableGrid": true,
+											"splitNumber": 5,
+											"gridType": "solid",
+											"dashLength": 8,
+											"gridColor": "#CCCCCC",
+											"padding": 10,
+											"showTitle": false,
+											"data": []
+										},
+										"legend": {
+											"show": false,
+											"position": "bottom",
+											"float": "center",
+											"padding": 5,
+											"margin": 5,
+											"backgroundColor": "rgba(0,0,0,0)",
+											"borderColor": "rgba(0,0,0,0)",
+											"borderWidth": 0,
+											"fontSize": 13,
+											"fontColor": "#666666",
+											"lineHeight": 11,
+											"hiddenColor": "#CECECE",
+											"itemGap": 10
+										},
+										"extra": {
+											"column": {
+												"type": "group",
+												"width": 30,
+												"seriesGap": 2,
+												"categoryGap": 3,
+												"barBorderCircle": true,
+												"linearType": "none",
+												"linearOpacity": 1,
+												"colorStop": 0,
+												"meterBorder": 1,
+												"meterFillColor": "#FFFFFF",
+												"activeBgColor": "#000000",
+												"activeBgOpacity": 0.08,
+												"meterBorde": 1
+											},
+											"tooltip": {
+												"showBox": true,
+												"showArrow": true,
+												"showCategory": false,
+												"borderWidth": 0,
+												"borderRadius": 0,
+												"borderColor": "#000000",
+												"borderOpacity": 0.7,
+												"bgColor": "#000000",
+												"bgOpacity": 0.7,
+												"gridType": "solid",
+												"dashLength": 4,
+												"gridColor": "#CCCCCC",
+												"fontColor": "#FFFFFF",
+												"splitLine": true,
+												"horizentalLine": false,
+												"xAxisLabel": false,
+												"yAxisLabel": false,
+												"labelBgColor": "#FFFFFF",
+												"labelBgOpacity": 0.7,
+												"labelFontColor": "#666666"
+											},
+											"markLine": {
+												"type": "solid",
+												"dashLength": 4,
+												"data": []
+											}
+										}
 									}
 									break;
 								case 1:
-									this.dataObj1 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
-									}
+									// this.dataObj1 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									this.inventoryAct = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
+									this.inventoryBuy = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
+									this.inventorySale = Number(res.data.data[i].biViewInfoList[2].count).toFixed(2)
+									this.inventoryTC = Number(Number(this.inventoryAct) + Number(this.inventoryBuy) -
+										Number(this.inventorySale)).toFixed(2)
 									break;
 								case 2:
-									this.dataObj2 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// this.dataObj2 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									// let _x = []
+									// let _y = []
+									if (res.data.data[i].biViewInfoList) {
+										for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
+											if (Number(res.data.data[i].biViewInfoList[k].count).toFixed(2) != 0) {
+												_x.push(res.data.data[i].biViewInfoList[k].name)
+												_y.push(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2))
+											}
+										}
+									}
+									this.chartData = {
+										categories: _x,
+										series: [{
+											"name": '储量',
+											"data": _y
+										}]
 									}
+									this.zringoptions = {
+										"type": "line",
+										"canvasId": "",
+										"canvas2d": false,
+										"background": "none",
+										"animation": true,
+										"timing": "easeOut",
+										"duration": 1000,
+										"color": [
+											"#91CB74",
+										],
+										"padding": [
+											15,
+											10,
+											0,
+											15
+										],
+										"rotate": false,
+										"errorReload": true,
+										"fontSize": 13,
+										"fontColor": "#666666",
+										"enableScroll": true,
+										"touchMoveLimit": 60,
+										"enableMarkLine": true,
+										"dataLabel": true,
+										"dataPointShape": true,
+										"dataPointShapeType": "hollow",
+										"tapLegend": true,
+										"xAxis": {
+											"disabled": false,
+											"axisLine": false,
+											"axisLineColor": "#CCCCCC",
+											"calibration": false,
+											"fontColor": "#666666",
+											"fontSize": 13,
+											"rotateLabel": false,
+											"itemCount": 4,
+											"boundaryGap": "center",
+											"disableGrid": false,
+											"gridColor": "#CCCCCC",
+											"gridType": "dash",
+											"dashLength": 4,
+											"gridEval": 1,
+											"scrollShow": false,
+											"scrollAlign": "left",
+											"scrollColor": "#A6A6A6",
+											"scrollBackgroundColor": "#EFEBEF",
+											"format": ""
+										},
+										"yAxis": {
+											"disabled": true,
+											"disableGrid": true,
+											"splitNumber": 5,
+											"gridType": "dash",
+											"dashLength": 2,
+											"gridColor": "#CCCCCC",
+											"padding": 10,
+											"showTitle": false,
+											"data": []
+										},
+										"legend": {
+											"show": false,
+											"position": "bottom",
+											"float": "center",
+											"padding": 5,
+											"margin": 5,
+											"backgroundColor": "rgba(0,0,0,0)",
+											"borderColor": "rgba(0,0,0,0)",
+											"borderWidth": 0,
+											"fontSize": 13,
+											"fontColor": "#666666",
+											"lineHeight": 11,
+											"hiddenColor": "#CECECE",
+											"itemGap": 10
+										},
+										"extra": {
+											"line": {
+												"type": "straight",
+												"width": 2
+											},
+											"tooltip": {
+												"showBox": true,
+												"showArrow": true,
+												"showCategory": false,
+												"borderWidth": 0,
+												"borderRadius": 0,
+												"borderColor": "#000000",
+												"borderOpacity": 0.7,
+												"bgColor": "#000000",
+												"bgOpacity": 0.7,
+												"gridType": "dash",
+												"dashLength": 4,
+												"gridColor": "#22C572",
+												"fontColor": "#FFFFFF",
+												"splitLine": true,
+												"horizentalLine": false,
+												"xAxisLabel": false,
+												"yAxisLabel": false,
+												"labelBgColor": "#FFFFFF",
+												"labelBgOpacity": 0.7,
+												"labelFontColor": "#666666"
+											},
+											"markLine": {
+												"type": "solid",
+												"dashLength": 4,
+												"data": []
+											}
+										}
+									}
+									
 									break;
 								case 3:
-									this.dataObj3 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
-									}
+									// this.dataObj3 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
 									break;
 								case 4:
 									this.dataObj4 = {
@@ -504,291 +804,56 @@
 									}
 									break;
 							}
-						} else if (i == 6) {
-							this.carCount1 = res.data.data[i].biViewInfoList[0].count
-							this.carCount2 = res.data.data[i].biViewInfoList[1].count
-							this.carCount3 = res.data.data[i].biViewInfoList[2].count
-
-							let _x = []
-							let _y = []
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								_x.push(res.data.data[i].biViewInfoList[k].name)
-								_y.push(Number(res.data.data[i].biViewInfoList[k].count))
-							}
-							this.carChartData = {
-								categories: _x,
-								series: [{
-									"name": '车辆',
-									"data": _y
-								}]
+						} else if (i == 10) { //销售已完成
+							uni.hideLoading()
+							this.dataObj0 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.ringoptions = {
-								"type": "column",
-								"canvasId": "",
-								"canvas2d": false,
-								"background": "none",
-								"animation": true,
-								"timing": "easeOut",
-								"duration": 1000,
-								"color": [
-									"#22C572"
-								],
-								"padding": [
-									15,
-									15,
-									0,
-									5
-								],
-								"rotate": false,
-								"errorReload": true,
-								"fontSize": 13,
-								"fontColor": "#666666",
-								"enableScroll": false,
-								"touchMoveLimit": 60,
-								"enableMarkLine": false,
-								"dataLabel": true,
-								"dataPointShape": true,
-								"dataPointShapeType": "solid",
-								"tapLegend": true,
-								"xAxis": {
-									"disabled": false,
-									"axisLine": false,
-									"axisLineColor": "#CCCCCC",
-									"calibration": false,
-									"fontColor": "#666666",
-									"fontSize": 13,
-									"rotateLabel": false,
-									"itemCount": 5,
-									"boundaryGap": "center",
-									"disableGrid": true,
-									"gridColor": "#CCCCCC",
-									"gridType": "solid",
-									"dashLength": 4,
-									"gridEval": 1,
-									"scrollShow": false,
-									"scrollAlign": "left",
-									"scrollColor": "#A6A6A6",
-									"scrollBackgroundColor": "#EFEBEF",
-									"format": ""
-								},
-								"yAxis": {
-									"disabled": true,
-									"disableGrid": true,
-									"splitNumber": 5,
-									"gridType": "solid",
-									"dashLength": 8,
-									"gridColor": "#CCCCCC",
-									"padding": 10,
-									"showTitle": false,
-									"data": []
-								},
-								"legend": {
-									"show": false,
-									"position": "bottom",
-									"float": "center",
-									"padding": 5,
-									"margin": 5,
-									"backgroundColor": "rgba(0,0,0,0)",
-									"borderColor": "rgba(0,0,0,0)",
-									"borderWidth": 0,
-									"fontSize": 13,
-									"fontColor": "#666666",
-									"lineHeight": 11,
-									"hiddenColor": "#CECECE",
-									"itemGap": 10
-								},
-								"extra": {
-									"column": {
-										"type": "group",
-										"width": 30,
-										"seriesGap": 2,
-										"categoryGap": 3,
-										"barBorderCircle": true,
-										"linearType": "none",
-										"linearOpacity": 1,
-										"colorStop": 0,
-										"meterBorder": 1,
-										"meterFillColor": "#FFFFFF",
-										"activeBgColor": "#000000",
-										"activeBgOpacity": 0.08,
-										"meterBorde": 1
-									},
-									"tooltip": {
-										"showBox": true,
-										"showArrow": true,
-										"showCategory": false,
-										"borderWidth": 0,
-										"borderRadius": 0,
-										"borderColor": "#000000",
-										"borderOpacity": 0.7,
-										"bgColor": "#000000",
-										"bgOpacity": 0.7,
-										"gridType": "solid",
-										"dashLength": 4,
-										"gridColor": "#CCCCCC",
-										"fontColor": "#FFFFFF",
-										"splitLine": true,
-										"horizentalLine": false,
-										"xAxisLabel": false,
-										"yAxisLabel": false,
-										"labelBgColor": "#FFFFFF",
-										"labelBgOpacity": 0.7,
-										"labelFontColor": "#666666"
-									},
-									"markLine": {
-										"type": "solid",
-										"dashLength": 4,
-										"data": []
-									}
-								}
+							
+						}else if (i == 11) { //销售已开票
+							uni.hideLoading()
+							this.dataObj1 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(),
+								percent:Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-
-						} else if (i == 7) {
-							this.inventoryAct = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
-							this.inventoryBuy = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
-							this.inventorySale = Number(res.data.data[i].biViewInfoList[2].count).toFixed(2)
-							this.inventoryTC =  Number(Number(this.inventoryAct)+Number(this.inventoryBuy)-Number(this.inventorySale)).toFixed(2)
-
-						} else if (i == 8) {
-							let _x = []
-							let _y = []
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								if(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2) != 0){
-									_x.push(res.data.data[i].biViewInfoList[k].name)
-									_y.push(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2))
-								}
+							
+						}else if (i == 12) { //销售已结算
+							uni.hideLoading()
+							this.dataObj2 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2) ,
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.chartData = {
-								categories: _x,
-								series: [{
-									"name": '储量',
-									"data": _y
-								}]
+						}else if(i == 13){//采购已完成
+							uni.hideLoading()
+							this.dataObj3 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.zringoptions = {
-								"type": "line",
-								"canvasId": "",
-								"canvas2d": false,
-								"background": "none",
-								"animation": true,
-								"timing": "easeOut",
-								"duration": 1000,
-								"color": [
-									"#91CB74",
-								],
-								"padding": [
-									15,
-									10,
-									0,
-									15
-								],
-								"rotate": false,
-								"errorReload": true,
-								"fontSize": 13,
-								"fontColor": "#666666",
-								"enableScroll": true,
-								"touchMoveLimit": 60,
-								"enableMarkLine": true,
-								"dataLabel": true,
-								"dataPointShape": true,
-								"dataPointShapeType": "hollow",
-								"tapLegend": true,
-								"xAxis": {
-									"disabled": false,
-									"axisLine": false,
-									"axisLineColor": "#CCCCCC",
-									"calibration": false,
-									"fontColor": "#666666",
-									"fontSize": 13,
-									"rotateLabel": false,
-									"itemCount": 4,
-									"boundaryGap": "center",
-									"disableGrid": false,
-									"gridColor": "#CCCCCC",
-									"gridType": "dash",
-									"dashLength": 4,
-									"gridEval": 1,
-									"scrollShow": false,
-									"scrollAlign": "left",
-									"scrollColor": "#A6A6A6",
-									"scrollBackgroundColor": "#EFEBEF",
-									"format": ""
-								},
-								"yAxis": {
-									"disabled": true,
-									"disableGrid": true,
-									"splitNumber": 5,
-									"gridType": "dash",
-									"dashLength": 2,
-									"gridColor": "#CCCCCC",
-									"padding": 10,
-									"showTitle": false,
-									"data": []
-								},
-								"legend": {
-									"show": false,
-									"position": "bottom",
-									"float": "center",
-									"padding": 5,
-									"margin": 5,
-									"backgroundColor": "rgba(0,0,0,0)",
-									"borderColor": "rgba(0,0,0,0)",
-									"borderWidth": 0,
-									"fontSize": 13,
-									"fontColor": "#666666",
-									"lineHeight": 11,
-									"hiddenColor": "#CECECE",
-									"itemGap": 10
-								},
-								"extra": {
-									"line": {
-										"type": "straight",
-										"width": 2
-									},
-									"tooltip": {
-										"showBox": true,
-										"showArrow": true,
-										"showCategory": false,
-										"borderWidth": 0,
-										"borderRadius": 0,
-										"borderColor": "#000000",
-										"borderOpacity": 0.7,
-										"bgColor": "#000000",
-										"bgOpacity": 0.7,
-										"gridType": "dash",
-										"dashLength": 4,
-										"gridColor": "#22C572",
-										"fontColor": "#FFFFFF",
-										"splitLine": true,
-										"horizentalLine": false,
-										"xAxisLabel": false,
-										"yAxisLabel": false,
-										"labelBgColor": "#FFFFFF",
-										"labelBgOpacity": 0.7,
-										"labelFontColor": "#666666"
-									},
-									"markLine": {
-										"type": "solid",
-										"dashLength": 4,
-										"data": []
-									}
-								}
+						}else if(i == 14){//采购已开票
+							uni.hideLoading()
+							this.dataObj4 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-
-						} else if (i == 9) {
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								var obj = res.data.data[i].biViewInfoList[k]
-								// obj.startName = obj.name.split('→')[0].substring(0, 5) + '...'
-								obj.startName = obj.name.split('→')[0]
-								obj.endName = obj.name.split('→')[1]
+						}else if(i == 15){//采购已结算
+							uni.hideLoading()
+							this.dataObj5 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2) ,
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.ztList = res.data.data[i].biViewInfoList
-						}
-						else if (i == 10) {
+						}else if (i == 16) {
 							uni.hideLoading()
 							this.moneyList = res.data.data[i].biViewInfoList
-							console.log('收入',this.moneyList)
-						}
+							console.log('收入', this.moneyList)
+						} 
+						this.$forceUpdate()
 					}
 					this.chartlist = _list
 					// this.scroll()
@@ -826,10 +891,7 @@
 				}, 10)
 			},
 			confirm(e) {
-				uni.showLoading({
-					title:"加载中",
-					mask:true
-				})
+				
 				console.log(e)
 				this.nowDate = e[0].label + e[1].label
 				let _year = e[0].label.substring(0, 4)
@@ -851,7 +913,7 @@
 			htClick(index) {
 				// this.itemSelect = index
 				this.contractSelect = index
-				
+
 			}
 		}
 	}
@@ -939,7 +1001,8 @@
 			display: flex;
 			justify-content: space-between;
 
-			.left {}
+			.left {
+			}
 
 			.right {
 				display: flex;
@@ -1057,7 +1120,21 @@
 			}
 		}
 	}
-
+	.btn-style{
+		//   width: 70px;
+		// height: 28px;
+		background: rgba(47,108,233,0.2);
+		border-radius: 4px;
+		border: 1px solid rgba(0,220,255,0.2);
+		padding: 5px 20px;
+		box-sizing: border-box;
+		// font-size: 16px;
+		margin-right: 10px;
+		cursor:pointer
+	}
+	.activeBtn{
+	  color:#06DBF1
+	}
 	.content6 {
 		.map {
 			border: 0;

pages/user/setUp.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click="nickname(username)">
 				<view>
-					<text>昵称</text>
+					<text>用户名</text>
 				</view>
 				<view style='align-items: center;' class="flex">
 					<view class="username">
@@ -23,6 +23,17 @@
 					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
+			<view class='cu-item' style='margin-bottom:10px;' @click="nickname1(wechatNo)">
+				<view>
+					<text>昵称</text>
+				</view>
+				<view style='align-items: center;' class="flex">
+					<view class="username">
+						{{wechatNo}}
+					</view>
+					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
+			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click='fankui'>
 				<view>
 					<text>意见反馈</text>
@@ -63,6 +74,16 @@
 				</view>
 			</view>
 		</view>
+		<view class="agreement">
+			<view class="text">
+				<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
+					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
+			</view>
+
+		</view>
 		<view class='exitloginwrap'>
 			<button @click='logout()' class='exitlogin'>退出登录</button>
 		</view>
@@ -90,6 +111,7 @@
 				content: '您确定要退出吗?',
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				username: "",
+				wechatNo: '',
 				gridList: [{
 					num: 0,
 					name: '退出登录',
@@ -138,7 +160,7 @@
 					url: baseUrlNew + '/appVersion/selectInfo',
 					data: {
 						appid: plus.runtime.appid,
-						version: plus.runtime.version,
+						version: this.version,
 						imei: "1",
 					},
 					method: 'GET',
@@ -159,7 +181,7 @@
 						url: 'https://api2.eliangeyun.com/appVersion/selectInfo',
 						data: {
 							appid: plus.runtime.appid,
-							version: plus.runtime.version,
+							version: this.version,
 							imei: "1"
 						},
 						method: 'GET',
@@ -326,6 +348,12 @@
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				}
 				this.username = this.userInfo.userName
+				if (!uni.getStorageSync('userInfo').wechatNo) {
+					this.wechatNo = this.userInfo.userName
+				} else {
+					this.wechatNo = this.userInfo.wechatNo
+				}
+
 			},
 			switchPicture() {
 				uni.navigateTo({
@@ -337,6 +365,11 @@
 					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			},
+			nickname1(username) {
+				uni.navigateTo({
+					url: `/pages/user/set_wechatNo?nickname=${username}`
+				})
+			},
 			exitlogin() {
 
 			},
@@ -483,4 +516,21 @@
 		font-size: 32rpx;
 		text-align: center;
 	}
+
+	.agreement {
+		display: flex;
+		margin: 0 auto;
+		text-align: center;
+
+		.text {
+			margin: 0 auto;
+			text-align: center;
+			display: flex;
+		}
+
+		.path {
+			color: #22C572;
+			text-align: center;
+		}
+	}
 </style>

pages/user/set_nickname.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="explain">
-			昵称长度限制在2-24个字符内
+			用户名长度限制在2-24个字符内
 		</view>
 		<view class="editText">
 			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>

pages/user/set_wechatNo.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="container">
+		<view class="explain">
+			昵称长度限制在2-24个字符内
+		</view>
+		<view class="editText">
+			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>
+		</view>
+		<view class="btn" :class="nickname.length==0?'':'btn-active'" @click="commit">
+			保存
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				nickname: "",
+				deptListurl: {},
+			}
+		},
+		onLoad(param) {
+			this.nickname = param.nickname
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+
+			commit() {
+				if (this.nickname == null || this.nickname == "") {
+					this.$api.msg('请输入昵称！')
+					return
+				}
+				if (this.nickname.length < 2 || this.nickname.length > 24) {
+					this.$api.msg('请正确输入昵称！')
+					return
+				}
+				var that = this
+				that.deptListurl.wechatNo = that.nickname
+				that.deptListurl.id = that.userInfo.id
+				that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
+						res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '修改成功！',
+									icon: 'success',
+									duration: 2000,
+									success() {
+										setTimeout(()=>{
+											var _student = uni.getStorageSync('userInfo');
+											_student.wechatNo = that.nickname;
+											uni.setStorageSync('userInfo', _student);
+											var name = 'userInfo';
+											var value = _student;
+											that.$store.commit('$uStore', {
+												name,
+												value
+											});
+											uni.navigateBack()
+										},2000)
+									}
+								})
+							}
+						})
+					.catch(res => {
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+
+
+
+			},
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 10px 0px;
+		background-color: #F5F6FA;
+	}
+
+	.explain {
+		margin-left: 16px;
+		font-size: 16px;
+		color: #6D6D72;
+		margin-top: 20px;
+	}
+
+	.editText {
+		width: 100%;
+		height: 50px;
+		background-color: #FFFFFF;
+		line-height: 50px;
+		padding-left: 20px;
+		margin-top: 10px;
+		padding-top: 12px;
+		border-top: 1px solid #C9C9CB;
+		border-bottom:1px solid #C9C9CB;
+	}
+
+	.texts {
+		line-height: 50px;
+		/* color: #C6C6C8; */
+		font-size: 16px;
+		/* placeholder-style="font-size:18px" */
+	}
+	.btn{
+		width: 90%;
+		height: 46px;
+		font-size: 17px;
+		margin:0 auto;
+		margin-top: 16px;
+		border-radius: 20px;
+		line-height: 46px;
+		font-weight: 500;
+		text-align: center;
+		background-color: #D8DAE0;
+		color: #fff;
+	}
+	.btn-active {
+		background-color: #FFFFFF;
+		color: #22C572;
+		
+	}
+</style>

pages/user/user.vue

@@ -34,7 +34,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cover-container">
+		<view v-if="hasLogin" class="cover-container">
 			<view class='cover-container-item'>
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
@@ -246,7 +246,7 @@
 						src: '../../static/img/myimg/erp.png',
 						tips: 0,
 						url: `/pages/erp/index`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 1,
@@ -256,7 +256,7 @@
 						src: '../../static/img/myimg/sg.png',
 						tips: 0,
 						url: `/pages/erpbusiness/index`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 2,
@@ -274,7 +274,7 @@
 						src: '../../static/img/sign/myTask@2x.png',
 						tips: 0,
 						url: '/pages/task/my_task',
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 4,
@@ -301,7 +301,7 @@
 						src: '../../static/img/sign/shujubaobiao@2x.png',
 						tips: 0,
 						url: `/pages/user/report`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 7,
@@ -310,7 +310,7 @@
 						src: '../../static/img/sign/kudianjiankong@2x.png',
 						tips: 0,
 						url: `/pages/user/depotMonitoring`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					{
 						num: 8,
@@ -319,7 +319,7 @@
 						src: '../../static/img/oa_office/oaOffice.png',
 						tips: 0,
 						url: `/pages/oa_office/the_oaOffice`,
-						show: true
+						show: uni.getStorageSync('pcUserInfo')?true:false
 					},
 					// {
 					// 	num: 9,
@@ -397,9 +397,24 @@
 			this.scrollTop = e.scrollTop;
 		},
 		onShow() {
-			console.log("uni.getStorageSync('compName1')")
+			// console.log(111111111)
+			if(uni.getStorageSync('pcUserInfo')){
+				// console.log(2222222)
+				for (var i = 0; i < this.gridList1.length; i++) {
+					if(this.gridList1[i].num==0||this.gridList1[i].num==1||this.gridList1[i].num==3||this.gridList1[i].num==6||this.gridList1[i].num==7||this.gridList1[i].num==8){
+						this.gridList1[i].show=true
+					}
+				}
+			}else{
+				// console.log(33333333)
+				for (var i = 0; i < this.gridList1.length; i++) {
+					if(this.gridList1[i].num==0||this.gridList1[i].num==1||this.gridList1[i].num==3||this.gridList1[i].num==6||this.gridList1[i].num==7||this.gridList1[i].num==8){
+						this.gridList1[i].show=false
+					}
+				}
+			}
+			// console.log("uni.getStorageSync('compName1')")
 			// console.log(uni.getStorageSync("compName1"))
-			
 			// if (uni.getStorageSync("compName1")) {
 			// 	this.haveCompany = true
 			// } else {