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

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// 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/',

manifest.json

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

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

@@ -126,6 +126,7 @@
 				clockDistance: "",
 				warehouseType: '1',
 				warehouseBaseInfoList: [],
+				clockDay:'',
 
 			}
 		},
@@ -151,6 +152,7 @@
 			let _day = new Date();
 			_day.setTime(_day.getTime());
 			this.createDate = _day.getFullYear() + "-" + (_day.getMonth() + 1);
+			this.clockDay = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 		},
 		methods: {
 			supp(item) {
@@ -251,6 +253,7 @@
 							that.detailData.phone = uni.getStorageSync('pcUserInfo').userMobilePhone
 							that.detailData.empName = uni.getStorageSync('userInfo').userName
 							that.detailData.clockType = that.typevalue
+							that.detailData.clockDay = that.clockDay
 							if (that.clockDistance.indexOf("km") > -1) {
 								that.detailData.clockDistance = that.clockDistance.replace("km", "") * 1000
 							} else {

pages/erpbusiness/add_quality_testing.vue

@@ -252,6 +252,30 @@
 				</view>
 				<view  v-show="edit" class="con-list">{{gridList.type?gridList.type:'请选择类型'}}</view>
 			</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">箱号-1</view>
+				<view class="con-list">
+					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">封号-1</view>
+				<view class="con-list">
+					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">箱号-2</view>
+				<view class="con-list">
+					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
+				</view>
+			</view>
+			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
+				<view class="title">封号-2</view>
+				<view class="con-list">
+					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
+				</view>
+			</view>
 			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 				class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
@@ -270,46 +294,65 @@
 				</view>
 				<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 			</view>
+			<!-- <view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+				class="c-row">
+				<view class="title">水分增价（元/公斤）</view>
+				<view class="con-list">
+					<input v-model='gridList.waterPriceIncrease' :disabled='disabled1' @input='deductionchange'
+						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
+				</view>
+			</view>
 			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
-				<view class="title">净重单价（元/公斤）</view>
+				<view class="title">水分扣价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
+					<input v-model='gridList.waterPriceDeduction' :disabled='disabled1' @input='deductionchange'
 						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 				class="c-row">
-				<view class="title">干粮单价（元/公斤）</view>
+				<view class="title">质量增价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.dryGrainPrice' :disabled='disabled1' @blur='inputprice'
-						placeholder="请输入干粮单价" name="input" type="digit"></input>
+					<input v-model='gridList.qualityPriceIncrease' :disabled='disabled1' @input='deductionchange'
+						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
-				<view class="title">箱号-1</view>
+			
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+				class="c-row">
+				<view class="title">质量扣价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNo' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input v-model='gridList.qualityPriceDeduction' :disabled='disabled1' @input='deductionchange'
+						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
-				<view class="title">封号-1</view>
+			 -->
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+				class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNo' placeholder="请输入封号" name="input" type="digit"></input>
+					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
+						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
-				<view class="title">箱号-2</view>
+			<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+				class="c-row">
+				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.boxNoOther' placeholder="请输入箱号" name="input" type="digit"></input>
+					<input v-model='gridList.tidalGrainPrice' :disabled='disabled1' @blur='inputprice'
+						placeholder="自动获取，不可编辑" name="input" type="digit"></input>
 				</view>
 			</view>
-			<view v-show="typevalue==3&&utils.getCurrectRoles('acquisitionQuality.qview')" class="c-row">
-				<view class="title">封号-2</view>
+			<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
+				class="c-row">
+				<view class="title">干粮单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.titleNoOther' placeholder="请输入封号" name="input" type="digit"></input>
+					<input v-model='gridList.dryGrainPrice' :disabled='disabled1' @blur='inputprice'
+						placeholder="请输入干粮单价" name="input" type="digit"></input>
 				</view>
 			</view>
+			
 		</view>
 		<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')" style='padding-bottom:300rpx;'>
 			<view class='wrap'>
@@ -464,6 +507,8 @@
 				username: "请更改昵称",
 				contractFlag: 10,
 				gridList: {
+					
+					outType: '汽运',
 					natureOfGrainPurchase: '贸易粮',
 					type: '',
 					tidalGrainPrice: '',
@@ -474,6 +519,10 @@
 					customerPhone: '',
 					bulkDensity: "",
 					imperfectGrain: "",
+					waterPriceIncrease:0,
+					waterPriceDeduction:0,
+					qualityPriceIncrease:0,
+					qualityPriceDeduction:0,
 					waterContent: "",
 					jiaorenli: "",
 					impurity: "",
@@ -507,7 +556,7 @@
 					grossWeight: 0,
 					tare: 0,
 					grade: '',
-					// inOutDate: new Date().toISOString().slice(0, 10),
+					inOutDate: new Date().toISOString().slice(0, 10),
 					netWeight: 0,
 					pureWeight: 0,
 					deductionWeight: 0,
@@ -576,6 +625,7 @@
 					grossWeight: 0,
 					tare: 0,
 					grade: '',
+					
 					// inOutDate: new Date().toISOString().slice(0, 10),
 					netWeight: 0,
 					pureWeight: 0,
@@ -685,6 +735,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log( this.cangid)
 			this.commonWarehouseNo = options.commonWarehouseNo
 			this.warehouseCount = Number(options.warehouseCount) + 1
 			this.warehouseTradeCount = Number(options.warehouseTradeCount) + 1
@@ -693,6 +744,12 @@
 			this.gridList.warehouseName = options.warehouseName
 			// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
+			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+				id: this.cangid
+			}).then(res => {
+				console.log(res)
+				this.warehouseList = res.data.data.warehousePositionInfoList
+			})
 			this.gridList.compName = uni.getStorageSync('compName1')
 			this.gridList.person = options.personCharge
 			this.gridList.personPhone = options.personPhone
@@ -727,11 +784,7 @@
 			// }
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
-			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-				id: this.cangid
-			}).then(res => {
-				this.warehouseList = res.data.data.warehousePositionInfoList
-			})
+			
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
 			}).then(res => {
@@ -836,6 +889,11 @@
 			}
 		},
 		methods: {
+			deductionchange(){
+			    if(this.gridList.tidalGrainPrice&&this.gridList.waterPriceIncreas&&this.gridList.waterPriceDeduction&&this.gridList.qualityPriceIncrease&&this.gridList.qualityPriceDeduction){
+			        this.gridList.tidalGrainPrice=this.gridList.tidalGrainPrice-this.gridList.waterPriceIncrease-this.gridList.waterPriceDeduction-this.gridList.qualityPriceIncrease-this.gridList.qualityPriceDeduction
+			    }
+			},
 			carNopicker(e){
 				this.gridList.carNumber=this.tranCarInfoList[e[0]].carNo
 				 for (let i = 0; i < this.tranCarInfoList.length; i++) {
@@ -1198,7 +1256,7 @@
 						}
 					}
 				}
-				if(this.inType == "收购入库"){ //收购入库  价格取自合同
+				if(this.inType != "收购入库"){ //收购入库  价格取自合同
 					return
 				}
 				if (this.gridList.goodsName && this.cangid) {
@@ -1214,14 +1272,11 @@
 				}
 
 				
-				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.gridList.grade 
 				) {
 					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
 						warehouseId: this.cangid,
@@ -1306,11 +1361,26 @@
 							return
 						}
 					}
+					// if (this.gridList.waterPriceIncrease>10||this.gridList.waterPriceIncrease<0) {
+					// 	this.$api.msg('水分增价输入错误')
+					// 	return
+					// }
+					// if (this.gridList.waterPriceDeduction>10||this.gridList.waterPriceDeduction<0) {
+					// 	this.$api.msg('水分扣价输入错误')
+					// 	return
+					// }
+					// if (this.gridList.qualityPriceIncrease>10||this.gridList.qualityPriceIncrease<0) {
+					// 	this.$api.msg('质量增价输入错误')
+					// 	return
+					// }
+					// if (this.gridList.qualityPriceDeduction>10||this.gridList.qualityPriceDeduction<0) {
+					// 	this.$api.msg('质量扣价输入错误')
+					// 	return
+					// }
 					if (!this.gridList.type) {
 						this.$api.msg('类型不能为空')
 						return
 					}
-
 					if (this.value == false) {
 						if (!this.gridList.grade) {
 							this.$api.msg('等级不能为空')
@@ -1439,6 +1509,7 @@
 															count + '吨', )
 
 													} else {
+														that.gridList.inOutFlag = 2
 														that.$api.doRequest('post',
 																'/warehouseInOutInfo/InOutWarehouse',
 																that.gridList)
@@ -1496,6 +1567,8 @@
 										}
 									})
 							} else {
+								
+								that.gridList.inOutFlag = 2
 								that.$api.doRequest('post',
 										'/warehouseInOutInfo/InOutWarehouse',
 										that.gridList)

pages/erpbusiness/edit_quality_testing.vue

@@ -531,6 +531,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', {
@@ -588,8 +589,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
@@ -807,7 +814,8 @@
 						}
 					}
 				}
-				if(this.gridList.serviceManagementType == 3){ //收购入库 不需在获取价格
+				console.log(this.gridList.serviceManagementType)
+				if(this.gridList.serviceManagementType != 3){ //非收购入库 不需在获取价格
 					return
 				}
 				if (this.gridList.goodsName && this.cangid) {
@@ -821,15 +829,13 @@
 					}
 				}
 				
-				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.gridList.grade 
 				) {
+				console.log('123123')
 					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
 						warehouseId: this.cangid,
 						goodsName: this.gridList.goodsName,

pages/leave/the_leave.vue

@@ -38,8 +38,8 @@
 				</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" maxlength="100"/>
-					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;' >
+						:height="height" :auto-height="autoHeight" maxlength="100" />
+					<view style='position:absolute;right:10px;bottom:20px;color:#AFB3BF;'>
 						{{detailData.reasonForLeave.length}}/100个字
 					</view>
 				</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,18 +259,124 @@
 					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 || this.detailData.leaveType == '选择请假类型') {

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -320,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>

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>

pages/task/audit/acquisitioncontract.vue

@@ -307,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>

pages/task/audit/charge_against_revenue.vue

@@ -261,10 +261,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/1000个字
 					</view>
 					<u-input :clearable='false' 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>

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'
+									})
+								})
+							})
 					}
 				})
 			},
@@ -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'>
 				驳回
@@ -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'
+									})
+								})
+							})
 					}
 				})
 			},
@@ -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/freight_settlement_approval.vue

@@ -171,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>

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>

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>

pages/task/audit/purchasecontract.vue

@@ -329,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>

pages/task/audit/salecontract.vue

@@ -347,9 +347,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>
 		
 				</view>
 				<view @click='close()' class="cancel">取消</view>

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>

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>

pages/task/audit/warehouse_approval.vue

@@ -152,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> -->

pages/task/audit/warehouse_warrant.vue

@@ -189,10 +189,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>