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

config/index.js

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

pageD/identity/companyIdentity.vue

@@ -226,15 +226,15 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				this.identityAuthenticationInfo.businessLicenseAddressUrl = res
+				this.identityAuthenticationInfo.businessLicenseAddressUrl = res.data.appendixPath
 			},
 			// 身份证正面
 			getImgUrl1(res) {
 				console.log(res)
 				let that = this
-				that.id[0] = res
-				that.id1 = res
-				that.identityImgs1.personImg = res
+				that.id[0] = res.data.appendixPath
+				that.id1 = res.data.appendixPath
+				that.identityImgs1.personImg = res.data.appendixPath
 				that.$api.doRequest('get', '/driverViewInfo/personShibie', that
 					.identityImgs1).then(res => {
 					if (res.data.data.recPerson != null) {
@@ -269,9 +269,9 @@
 			getImgUrl2(res) {
 				console.log(res)
 				let that = this
-				that.id[1] = res
-				that.id2 = res
-				that.identityImgs1.personImg = res
+				that.id[1] = res.data.appendixPath
+				that.id2 = res.data.appendixPath
+				that.identityImgs1.personImg = res.data.appendixPath
 				// that.$api.doRequest('get', '/driverViewInfo/personShibie', that
 				// 	.identityImgs1).then(res => {
 				// 	if (res.data.data.recPerson != null) {

pageD/identity/companyIdentityEdit.vue

@@ -276,36 +276,36 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				this.deptList.businessLicenseAddressUrl = res
-				this.license1 = res
+				this.deptList.businessLicenseAddressUrl = res.data.appendixPath
+				this.license1 = res.data.appendixPath
 
 			},
 			getImgUrl1(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				that.id[0] = res
-				that.idup = res
+				that.id[0] = rres.data.appendixPath
+				that.idup = res.data.appendixPath
 
 			},
 			getImgUrl2(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				that.id[1] = res
-				that.idlow = res
+				that.id[1] = res.data.appendixPath
+				that.idlow = res.data.appendixPath
 
 			},
 			getImgUrl3(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				that.bankid[0] = res
-				that.bank1 = res
+				that.bankid[0] = res.data.appendixPath
+				that.bank1 = res.data.appendixPath
 
 			},
 			getImgUrl4(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				that.bankid[1] = res
-				that.bank2 = res
+				that.bankid[1] = res.data.appendixPath
+				that.bank2 = res.data.appendixPath
 
 			},
 			commitEdit(item) {

pageD/identity/companyIdentityThree.vue

@@ -175,10 +175,10 @@
 				console.log(res)
 				console.log('------------res-----------')
 				let that = this
-				that.bankid[0] = res
-				that.bank1 = res
+				that.bankid[0] = res.data.appendixPath
+				that.bank1 = res.data.appendixPath
 				that.certificates = false
-				that.bankImgs1.bankImg = res
+				that.bankImgs1.bankImg = res.data.appendixPath
 				that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
 					.bankImgs1).then(res => {
 					if (res.data.data.bankNo != null) {
@@ -208,10 +208,10 @@
 				console.log(res)
 				console.log('------------res-----------')
 				let that = this
-				that.bankid[1] = res
-				that.bank2 = res
+				that.bankid[1] = res.data.appendixPath
+				that.bank2 = res.data.appendixPath
 				that.certificatesTwo = false
-				that.bankImgs1.bankImg = res
+				that.bankImgs1.bankImg = res.data.appendixPath
 				// that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
 				// 	.bankImgs1).then(res => {
 				// 	if (res.data.data.bankNo != null) {

pageD/identity/companyIdentityTwo.vue

@@ -106,8 +106,8 @@
 				console.log(res)
 				console.log('------------res-----------')
 				let that = this;
-				that.id[0] = res
-				that.id1 = res
+				that.id[0] = res.data.appendixPath
+				that.id1 = res.data.appendixPath
 				that.certificates = false
 				that.identityImgs1.personImg = res
 				that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {
@@ -140,8 +140,8 @@
 				console.log(res)
 				console.log('------------res-----------')
 				let that = this;
-				that.id[1] = res
-				that.id2 = res
+				that.id[1] = res.data.appendixPath
+				that.id2 = res.data.appendixPath
 				that.certificatesTwo = false
 				that.identityImgs1.personImg = res
 				// that.$api.doRequest('get', '/driverViewInfo/personShibie', that.identityImgs1).then(res => {

pageD/identity/driverIdentity.vue

@@ -148,8 +148,8 @@
 				console.log(src)
 				console.log('------------res-----------')
 				let that = this;
-				that.id[0] = src
-				that.id1 = src
+				that.id[0] = src.data.appendixPath
+				that.id1 = src.data.appendixPath
 				that.certificates = false
 				that.personImgs.personImg = that.id[0]
 				that.$api.doRequest('get', '/driverViewInfo/personShibie', that
@@ -179,8 +179,8 @@
 				console.log(res)
 				console.log('------------res-----------')
 				let that = this;
-				that.id[1] = res
-				that.id2 = res
+				that.id[1] = res.data.appendixPath
+				that.id2 = res.data.appendixPath
 				that.certificatesTwo = false
 				that.personImgs.personImg = that.id[1]
 				that.$api.doRequest('get', '/driverViewInfo/personShibie', that

pageD/identity/driverIdentityThree.vue

@@ -136,24 +136,24 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res1-----------')
-				this.travels = res
-				this.addressUrl[0] = res
+				this.travels = res.data.appendixPath
+				this.addressUrl[0] = res.data.appendixPath
 				this.certificates = false
 
 			},
 			getImgUrl1(res) {
 				console.log(res)
 				console.log('------------res2-----------')
-				this.drives = res
-				this.addressUrl[1] = res
+				this.drives = res.data.appendixPath
+				this.addressUrl[1] = res.data.appendixPath
 				this.certificatesTwo = false
 			
 			},
 			getImgUrl2(res) {
 				console.log(res)
 				console.log('------------res3-----------')
-				this.practices = res
-				this.addressUrl[2] = res
+				this.practices = res.data.appendixPath
+				this.addressUrl[2] = res.data.appendixPath
 				this.certificatesThree = false
 				
 			
@@ -162,8 +162,8 @@
 				console.log(res)
 				console.log('------------res4-----------')
 				
-				this.operates =res
-				this.addressUrl[3] =res
+				this.operates =res.data.appendixPath
+				this.addressUrl[3] =res.data.appendixPath
 				this.certificatesFour = false
 			
 			},

pages/erpbusiness/add_quality_testing.vue

@@ -156,13 +156,15 @@
 
 			<view v-show='typevalue==1' class="c-row ">
 				<view class="title">车牌号</view>
-				<view class="con-list" v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
+				<view class="con-list"
+					v-show='(gridList.inOutType!="移库入库"||gridList.outType!="汽运")&&gridList.tranTaskFlag!="1"'>
 					<input v-model='gridList.carNumber' @click.stop="handleShowKeyboard" :disabled="true"
 						placeholder="请输入车牌号" name="input"></input>
 					<master-keyboard ref="keyboard" keyboardtype="car" :randomNumber="true" :newCar="false"
 						:defaultValue="gridList.carNumber" @keyboardClick="handleClick"></master-keyboard>
 				</view>
-				<view class="con-list" v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
+				<view class="con-list"
+					v-show='gridList.inOutType=="移库入库"&&gridList.outType=="汽运"||gridList.tranTaskFlag=="1"'>
 					<view @click='show9=true'>{{gridList.carNumber?gridList.carNumber:'请选择车牌号'}}</view>
 					<u-picker :range="tranCarInfoList" range-key="carNo1" @confirm='carNopicker($event,1)'
 						v-model="show9" mode="selector">
@@ -332,11 +334,11 @@
 						<MyNumberInput :myvalue="gridList.protein" :Isedit="Isedit" :IsShow="MykeywordShow"
 							:myevent="'protein'" @setValue="mykeywordset" v-if="InputEvent=='protein'"
 							@Cancelword="Cancelword" @goNext="goNext('protein')"></MyNumberInput>
-						<input v-else v-model='gridList.protein' placeholder="请输入蛋白"
-							@click="SetInputKey('protein')" name="input" type="digit" @input="obtainPrice"></input>
+						<input v-else v-model='gridList.protein' placeholder="请输入蛋白" @click="SetInputKey('protein')"
+							name="input" type="digit" @input="obtainPrice"></input>
 					</view>
 				</view>
-				
+
 				<view class="c-row " v-if="gridList.goodsName != '大豆'">
 					<view class="title">不完善粒（%）</view>
 					<view class="con-list">
@@ -353,8 +355,8 @@
 						<MyNumberInput :myvalue="gridList.completeGrain" :Isedit="Isedit" :IsShow="MykeywordShow"
 							:myevent="'completeGrain'" @setValue="mykeywordset" v-if="InputEvent=='completeGrain'"
 							@Cancelword="Cancelword" @goNext="goNext('impurity')"></MyNumberInput>
-						<input v-else v-model='gridList.completeGrain' 
-							placeholder="请输入完善粒率占比" name="input" type="digit"></input>
+						<input v-else v-model='gridList.completeGrain' placeholder="请输入完善粒率占比" name="input"
+							type="digit"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -393,13 +395,13 @@
 						<MyNumberInput :myvalue="gridList.transgene" :Isedit="Isedit" :IsShow="MykeywordShow"
 							:myevent="'transgene'" @setValue="mykeywordset" v-if="InputEvent=='transgene'"
 							@Cancelword="Cancelword" @goNext="goNext('transgene')"></MyNumberInput>
-							<view @click="transgeneShow=true">
-								{{gridList.transgene}}
-							</view>
-							<!-- 转基因 -->
-							<u-picker :range="transgeneList" range-key="value" @confirm='transgeneClick($event)' v-model="transgeneShow"
-								mode="selector">
-							</u-picker>
+						<view @click="transgeneShow=true">
+							{{gridList.transgene}}
+						</view>
+						<!-- 转基因 -->
+						<u-picker :range="transgeneList" range-key="value" @confirm='transgeneClick($event)'
+							v-model="transgeneShow" mode="selector">
+						</u-picker>
 					</view>
 				</view>
 				<view class="c-row" v-if="gridList.goodsName == '大豆'">
@@ -410,12 +412,12 @@
 							@Cancelword="Cancelword" @goNext="goNext('colorLustre')"></MyNumberInput>
 						<!-- <input v-else v-model='gridList.colorLustre' @click="SetInputKey('colorLustre')"
 							placeholder="请选择色泽/气味是否正常" name="input" type="digit"></input> -->
-							<div @click="colorLustreShow = true">{{gridList.colorLustre}}</div>
-							
-							<!-- 转基因 -->
-							<u-picker :range="colorLustreList" range-key="value" @confirm='colorLustreClick($event)' v-model="colorLustreShow"
-								mode="selector">
-							</u-picker>
+						<div @click="colorLustreShow = true">{{gridList.colorLustre}}</div>
+
+						<!-- 转基因 -->
+						<u-picker :range="colorLustreList" range-key="value" @confirm='colorLustreClick($event)'
+							v-model="colorLustreShow" mode="selector">
+						</u-picker>
 					</view>
 				</view>
 				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3" class="c-row">
@@ -506,13 +508,15 @@
 				<view class="but_css" @click="close">返回</view>
 			</view>
 		</u-popup>
-		
+
 	</view>
 </template>
 
 <script>
 	var that;
-	const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli','protein','completeGrain'];
+	const Equ_List = ['waterContent', 'bulkDensity', 'imperfectGrain', 'impurity', 'mildewGrain', 'jiaorenli', 'protein',
+		'completeGrain'
+	];
 	import dragButton from "@/components/drag-button/drag-button.vue";
 	import keyboard from "@/components/master-keyboard/master-keyboard.vue";
 	import MyNumberInput from "@/components/MyNumberInput.vue";
@@ -549,7 +553,7 @@
 				Isedit: false,
 				MykeywordShow: false,
 				InputEvent: '',
-				tranTaskFlag:0,
+				tranTaskFlag: 0,
 				dryGrainPrice: 0,
 				tidalGrainPrice: 0,
 				modalName: '',
@@ -797,11 +801,19 @@
 				],
 				cangid: '',
 
-				inType: "" ,//入库类型
-				transgeneShow:false,
-				transgeneList:[{value:'非转基因'},{value:'转基因'}],
-				colorLustreShow : false,
-				colorLustreList:[{value:'正常'},{value:'异常'}]
+				inType: "", //入库类型
+				transgeneShow: false,
+				transgeneList: [{
+					value: '非转基因'
+				}, {
+					value: '转基因'
+				}],
+				colorLustreShow: false,
+				colorLustreList: [{
+					value: '正常'
+				}, {
+					value: '异常'
+				}]
 			}
 		},
 		// #ifndef MP
@@ -938,9 +950,10 @@
 				console.log(1)
 				console.log(res)
 				for (let i = 0; i < res.data.data.length; i++) {
-					this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'（'+res.data.data[i].taskFlag+'）':''))
+					this.$set(res.data.data[i], 'inOutTaskNo1', res.data.data[i].inOutTaskNo + (res.data.data[
+						i].taskFlag ? '（' + res.data.data[i].taskFlag + '）' : ''))
 				}
-				console.log(res.data.data,22222)
+				console.log(res.data.data, 22222)
 				this.taskNolist = res.data.data
 			})
 			this.multiSelector1 = [{
@@ -1019,10 +1032,10 @@
 			}
 		},
 		methods: {
-			colorLustreClick(e){
+			colorLustreClick(e) {
 				this.gridList.colorLustre = this.colorLustreList[e[0]].value
 			},
-			transgeneClick(e){
+			transgeneClick(e) {
 				this.gridList.transgene = this.transgeneList[e[0]].value
 			},
 			Cancelword() {
@@ -1146,7 +1159,7 @@
 			obtainPrice() { //根据容重获取价格
 				if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
 					// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
-						let quality = this.gridList.goodsName=='大豆'?this.gridList.protein:this.gridList.bulkDensity
+					let quality = this.gridList.goodsName == '大豆' ? this.gridList.protein : this.gridList.bulkDensity
 					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
 						warehouseId: this.cangid,
 						goodsName: this.gridList.goodsName,
@@ -1230,7 +1243,8 @@
 				}).then(res => {
 					console.log(res)
 					for (let i = 0; i < res.data.data.length; i++) {
-						this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'（'+res.data.data[i].taskFlag+'）':''))
+						this.$set(res.data.data[i], 'inOutTaskNo1', res.data.data[i].inOutTaskNo + (res.data.data[
+							i].taskFlag ? '（' + res.data.data[i].taskFlag + '）' : ''))
 					}
 					this.taskNolist = res.data.data
 				})
@@ -1350,7 +1364,7 @@
 								}
 							}
 						} else {
-							if (this.inType != "收购入库") { //收购入库不校验仓库设置中的货名
+							if (this.inType == "收购入库") {
 								uni.showModal({
 									title: '提示',
 									content: '仓库设置中无该合同货名',
@@ -1410,12 +1424,12 @@
 					this.gridList.gradeKey = this.gradeList[1].key
 					// this.gridList.grade = this.contractNolist.grade
 					this.gridList.inOutType = this.contractNolist.inOutType
-					if(this.gridList.goodsName == "大豆"){ //货名为大豆是设置默认
-						this.gridList.transgene= "非转基因"
-						this.gridList.reTransgene= "非转基因"
+					if (this.gridList.goodsName == "大豆") { //货名为大豆是设置默认
+						this.gridList.transgene = "非转基因"
+						this.gridList.reTransgene = "非转基因"
 						this.gridList.colorLustre = "正常"
 						this.gridList.reColorLustre = "正常"
-					}else{
+					} else {
 						delete this.gridList.transgene
 						delete this.gridList.reTransgene
 						delete this.gridList.colorLustre
@@ -1451,7 +1465,7 @@
 						this.gridList.inOutTypeKey = 5
 					} else if (this.contractNolist.inOutType == '退库') {
 						//退库有无运输任务标识
-						this.gridList.tranTaskFlag=this.contractNolist.tranTaskFlag
+						this.gridList.tranTaskFlag = this.contractNolist.tranTaskFlag
 						this.warehouseTradeCount = '000' + this.warehouseTradeCount
 						// this.gridList.qualityNo = 'CGRK' + this.getdate() + this.commonWarehouseNo + this
 						// .warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)
@@ -1541,10 +1555,10 @@
 			},
 			print() {
 				console.log(this.printId)
-				if(this.printId){
+				if (this.printId) {
 					uni.showLoading({
-						title:"加载中",
-						mask:true
+						title: "加载中",
+						mask: true
 					})
 					this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
 						id: this.printId
@@ -1625,7 +1639,7 @@
 
 					uni.showLoading({
 						title: "加载中",
-						mask:true
+						mask: true
 					})
 					this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {
 						warehouseId: this.cangid,
@@ -1693,24 +1707,33 @@
 							console.log(res)
 							this.printId = res.data.data
 							uni.hideLoading()
-							if (res.data.code == 200) {
-								console.log("addQualityInspection")
-								this.$api.msg('提交成功')
-								this.gridList.warehouseId = this.cangid
-								this.gridList.compId = uni.getStorageSync(
-									'pcUserInfo').compId
-								uni.setStorageSync("quality_print", this.gridList)
-								if (this.isZJ) {
-									this.isShowPrint = true
-								} else {
-									uni.navigateBack({})
+							// if ((this.gridList.goodsName.indexOf("潮粮") != -1 && this.gridList.type.indexOf("潮") !=
+							// 		-1) ||
+							// 	(this.gridList.goodsName.indexOf("潮粮") == -1 && this.gridList.type.indexOf("干") !=
+							// 		-1)) {
+								if (res.data.code == 200) {
+									console.log("addQualityInspection")
+									this.$api.msg('提交成功')
+									this.gridList.warehouseId = this.cangid
+									this.gridList.compId = uni.getStorageSync(
+										'pcUserInfo').compId
+									uni.setStorageSync("quality_print", this.gridList)
+									if (this.isZJ) {
+										this.isShowPrint = true
+									} else {
+										uni.navigateBack({})
+									}
+									console.log('that.gridList', this.gridList)
+									// uni.navigateBack({})
+								} 
+								else if(res.data.message == '货物种类与类型不符，请确认！'){
+									this.$api.msg(res.data.message)
+								}else {
+									this.$api.msg('提交失败')
 								}
-
-								console.log('that.gridList', this.gridList)
-								// uni.navigateBack({})
-							} else {
-								this.$api.msg('提交失败')
-							}
+							// } else {
+							// 	this.$api.msg('货物种类与类型不符,请确认')
+							// }
 						})
 					return
 				}
@@ -1721,27 +1744,36 @@
 							console.log("addQualityInspection")
 							this.printId = res.data.data
 							uni.hideLoading()
-							if (res.data.code == 200) {
-								this.$api.msg('提交成功')
-								this.gridList.warehouseId = this.cangid
-								this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
-								uni.setStorageSync("quality_print", this.gridList)
-								if (this.isZJ) {
-									this.isShowPrint = true
-								} else {
-									uni.navigateBack({})
+							// if ((this.gridList.goodsName.indexOf("潮粮") != -1 && this.gridList.type.indexOf("潮") !=
+							// 		-1) ||
+							// 	(this.gridList.goodsName.indexOf("潮粮") == -1 && this.gridList.type.indexOf("干") !=
+							// 		-1)) {
+								if (res.data.code == 200) {
+									this.$api.msg('提交成功')
+									this.gridList.warehouseId = this.cangid
+									this.gridList.compId = uni.getStorageSync('pcUserInfo').compId
+									uni.setStorageSync("quality_print", this.gridList)
+									if (this.isZJ) {
+										this.isShowPrint = true
+									} else {
+										uni.navigateBack({})
+									}
+									uni.setStorageSync(
+										'checkcustomer', {}
+									)
+									console.log('that.gridList', this.gridList)
+									// uni.navigateBack({})
+								} else if(res.data.message == '货物种类与类型不符，请确认！'){
+									this.$api.msg(res.data.message)
 								}
-								uni.setStorageSync(
-									'checkcustomer', {}
-								)
-								console.log('that.gridList', this.gridList)
-								// uni.navigateBack({})
-							} else {
-								this.$api.msg('提交失败')
-							}
+								else {
+									this.$api.msg('提交失败')
+								}
+							// } else {
+							// 	this.$api.msg('货物种类与类型不符,请确认')
+							// }
 						})
 				}
-
 			},
 			async inOutWarehouse(type) {
 				if (type == 1) {
@@ -1749,7 +1781,7 @@
 						.then(res => {
 							console.log("InOutWarehouse")
 							this.gridList.warehouseInOutId = res.data.data
-							if(this.gridList.warehouseInOutId){
+							if (this.gridList.warehouseInOutId) {
 								this.addQualityInspection(1)
 							}
 						})
@@ -1761,14 +1793,14 @@
 							console.log("InOutWarehouse")
 							if (this.isQY) {
 								if (!this.isZJ) {
-									this.gridList.brazer=1
+									this.gridList.brazer = 1
 									this.gridList.statusFlag = 7
 								} else {
 									this.gridList.statusFlag = 0
 								}
 							}
 							this.gridList.warehouseInOutId = res.data.data
-							if(this.gridList.warehouseInOutId){
+							if (this.gridList.warehouseInOutId) {
 								this.addQualityInspection(2)
 							}
 						})
@@ -1804,7 +1836,7 @@
 
 										this.gridList.inOutFlag = 2
 										this.inOutWarehouse(2)
-										
+
 									}
 								}
 							}
@@ -1912,8 +1944,8 @@
 								this.$api.msg('容重不能为空')
 								return
 							}
-						} 
-						if(this.gridList.goodsName == "大豆"){
+						}
+						if (this.gridList.goodsName == "大豆") {
 							if (!this.gridList.protein) {
 								this.$api.msg('蛋白不能为空')
 								return
@@ -1963,14 +1995,14 @@
 								if (that.typevalue == 3) {
 									uni.showLoading({
 										title: "加载中",
-										mask:true
+										mask: true
 									})
 									that.cumulant(1)
 									return
 								}
 								uni.showLoading({
 									title: "加载中",
-									mask:true
+									mask: true
 								})
 								that.gridList.inOutFlag = 2
 								that.inOutWarehouse(1)

pages/reimbursement/request_funds.vue

@@ -173,7 +173,7 @@
 					identification: '1',
 					costType: '3',
 					agent: '',
-					storageFeeFlag:'',
+					storageFeeFlag: '',
 					totalDistribution: '0',
 				},
 				fileList1: [],
@@ -509,13 +509,21 @@
 						return
 					}
 				}
-				if (!this.detailData.amountMoney||this.detailData.amountMoney==0) {
+				if (!this.detailData.expenseName) {
+					this.$api.msg('费用名称不能为空')
+					return
+				}
+				if (this.detailData.expenseName.length < 1 || this.detailData.expenseName.length > 15) {
+					this.$api.msg('费用名称输入错误')
+					return
+				}
+				if (!this.detailData.amountMoney || this.detailData.amountMoney == 0) {
 					this.$api.msg('金额不能为空')
 					return
 				}
 				if (this.detailData.amountMoney < 0.01 || this.detailData.amountMoney > 100000000) {
-				    this.$api.msg('金额输入错误')
-				    return
+					this.$api.msg('金额输入错误')
+					return
 				}
 				var that = this
 				var title
@@ -545,7 +553,7 @@
 							that.detailData.expensesType = that.reType
 							that.detailData.fieldName = uni.getStorageSync('userInfo').userName
 							// that.detailData.totalDistribution = that.detailData.totalDistribution
-							if(that.detailData.wareExpenseType == '仓储费'){
+							if (that.detailData.wareExpenseType == '仓储费') {
 								that.detailData.storageFeeFlag = 1
 							}
 							if (that.imglist.length > 0) {

pages/task/audit/leave_approve.vue

@@ -65,6 +65,73 @@
 				<view @click='passSubmit()' class="confirm1">确定</view>
 			</view>
 		</view>
+		<view class="content3">
+			<view class="titlez rowz">
+				流程
+			</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>
+					<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-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
@@ -97,11 +164,15 @@
 				leaveType: '',
 				approveStatus: '',
 				status: '',
+				auditList: [],
 				leaveInfo: {
-					id:'',
+					id: '',
 				},
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				updateDate: '',
-				dataList: {},
+				dataList: {
+					srcList:[]
+				},
 			}
 		},
 		onBackPress(e) {
@@ -127,17 +198,127 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data
+						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,
+								// 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)
+								this.auditList = response.data.data
+								var time2 = new Date(this.dataList.createDate).getTime()
+								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle: this.dataList.empName.substring(0, 2),
+									operatorName: this.dataList.empName,
+									updateDate: time3,
+									auditMind: '',
+									desc: '发起申请',
+									showflow: false,
+									commonStaffs1: null,
+									commonStaffs: null,
+									workflowHistoricTasks: [],
+									status: 'success'
+								})
+							})
+						})
 					}
 				})
-				// 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
@@ -173,24 +354,32 @@
 								needReapply: false
 							}).then(res => {
 								if (res.data.code == 200) {
-									uni.hideLoading()
-									that.$api.msg('审核成功！')
-									that.leaveInfo.id = that.id 
-									that.$api.doRequest('post', '/leaveInfo/api/generateClock', that.leaveInfo
-									).then(res => {
-											if (res.data.code == 200) {
-												that.$api.msg('审核成功！')
-												uni.navigateTo({
-													url: "/pages/task/my_task"
-												})
-											} else {
+									//最后一级审核通过后,添加打卡记录
+									if (that.dataList.approveStatus == '待杜大光审批') {
+										that.leaveInfo.id = that.id
+										that.$api.doRequest('post', '/leaveInfo/api/generateClock',
+											that.leaveInfo
+										).then(res => {
+											if (res.data.code != 200) {
 												that.$api.msg('提交失败')
+												return
 											}
 										})
+										uni.hideLoading()
+										that.$api.msg('审核成功！')
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 2000);
+									}else{
+										uni.hideLoading()
+										that.$api.msg('审核成功！')
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 2000);
+									}
 								} else {
 									that.$api.msg('审核失败！')
 								}
-
 							}).catch(res => {
 								uni.hideLoading()
 								if (res.message) {
@@ -251,9 +440,13 @@
 </script>
 
 <style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
+	}
+
 	.content1 {
 		margin: 10rpx;
-		padding-bottom: 224rpx;
 
 		.title {
 			height: 70rpx;
@@ -325,7 +518,6 @@
 			color: #333333;
 		}
 	}
-
 	//弹出框
 	// .popup {
 	// 	padding: 30rpx;
@@ -344,8 +536,9 @@
 	.uForm_item {
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		margin: 20rpx;
+		margin: 20rpx 0rpx 0rpx 0rpx;
 		border-radius: 20rpx;
+		width: 100%;
 	}
 
 	.rejectText {
@@ -497,7 +690,156 @@
 		}
 	}
 
+	.content3 {
+		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;
+						}
+
+						.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: 40rpx;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+
+		}
+
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	.titlez {
+		font-size: 17px;
+		font-weight: 700;
+		height: 35px;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.rowz{
+		display: flex;
+		justify-content: space-between;
+
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 	/deep/.u-input__textarea {
-		height: 300rpx !important;
+		height: 200rpx !important;
 	}
 </style>

pages/task/audit/leave_details.vue

@@ -46,6 +46,69 @@
 					</view>
 			</u-form>
 		</view>
+		<view class="content3">
+			<view class="titlez rowz">
+				流程
+			</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>
+					</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 class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode='aspectFill' class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</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"></view>
+			</view>
+		</view>
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='fanHui' type="success" class="btn1" hover-class='none'>返回</u-button>
 		</view>
@@ -72,9 +135,14 @@
 				leaveDuration:'',
 				leaveType:'',
 				approveStatus:'',
+				auditList: [],
 				status:'',
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				updateDate:'',
-				dataList:{},
+				auditMind: '',
+				dataList:{
+					srcList: []
+				},
 			}
 		},
 		// onReady() {
@@ -94,7 +162,124 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data
+					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,
+							// 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 = ''
+									}
+								}
 					
+							}
+							this.auditList = response.data.data
+							var time2 = new Date(this.dataList.createDate).getTime()
+							var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle: this.dataList.empName.substring(0, 2),
+								operatorName: this.dataList.empName,
+								updateDate: time3,
+								auditMind: '',
+								desc: '发起申请',
+								showflow: false,
+								commonStaffs1: null,
+								commonStaffs: null,
+								workflowHistoricTasks: [],
+								status: 'success'
+							})
+						})
+					})
 					}
 				})
 			},
@@ -106,9 +291,12 @@
 </script>
 
 <style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
+	}
 	.content1 {
 		margin: 10rpx;
-		padding-bottom: 120rpx;
 
 		.title {
 			height: 70rpx;
@@ -122,8 +310,8 @@
 
 	.uForm {
 		padding: 0 40rpx;
+		
 	}
-
 	.u-form-item {
 		padding: 0;
 	}
@@ -197,8 +385,9 @@
 	.uForm_item {
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		margin: 20rpx;
+		margin: 20rpx 0rpx 0rpx 0rpx;
 		border-radius: 20rpx;
+		width: 100%;
 	}
 
 	.rejectText {
@@ -236,7 +425,155 @@
 		}
 
 	}
+	.content3 {
+		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;
+						}
+
+						.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: 40rpx;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+
+		}
+
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	.titlez {
+		font-size: 17px;
+		font-weight: 700;
+		height: 35px;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.rowz{
+		display: flex;
+		justify-content: space-between;
+
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 	.deleteText {
 		text-align: center;
 		color: #AFB3BF;

pages/task/audit/supp_clock_approve.vue

@@ -60,6 +60,73 @@
 			<view @click='passSubmit()' class="confirm1">确定</view>
 		</view>
 	</view>
+	<view class="content3">
+		<view class="titlez rowz">
+			流程
+		</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>
+				<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-toast ref="uToast" />
 	<view style='padding:10px;' class='flex bottom-btn'>
 		<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
@@ -83,13 +150,18 @@
 				border: false,
 				id: "",
 				show: false,
+				auditList: [],
 				auditMind: '',
 				reasonForApplication:'',
 				supplementClockType:'',
 				approveStatus:'',
 				status:'',
 				updateDate:'',
-				dataList:{},
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
+				auditMind: '',
+				dataList:{
+					srcList:[]
+				},
 			}
 		},
 		onBackPress(e) {
@@ -115,7 +187,125 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'BUKA-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)
+							this.auditList = response.data.data
+							var time2 = new Date(this.dataList.createDate).getTime()
+							var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle: this.dataList.empName.substring(0, 2),
+								operatorName: this.dataList.empName,
+								updateDate: time3,
+								auditMind: '',
+								desc: '发起申请',
+								showflow: false,
+								commonStaffs1: null,
+								commonStaffs: null,
+								workflowHistoricTasks: [],
+								status: 'success'
+							})
+						})
+					})
 					}
 				})
 			},
@@ -155,9 +345,9 @@
 								uni.hideLoading()
 								if (res.data.code == 200) {
 									that.$api.msg('审核成功！')
-									uni.navigateTo({
-										url: "/pages/task/my_task"
-									})
+									setTimeout(function() {
+										uni.navigateBack();
+									}, 2000);
 								} else {
 									that.$api.msg('审核失败！')
 								}
@@ -205,9 +395,9 @@
 							}).then(res => {
 								if (res.data.code == 200) {
 									this.$api.msg('驳回成功！')
-									uni.navigateTo({
-										url: "/pages/task/my_task"
-									})
+									setTimeout(function() {
+										uni.navigateBack();
+									}, 2000);
 									uni.hideLoading()
 								} else {
 									this.$api.msg('驳回失败！')
@@ -223,9 +413,12 @@
 </script>
 
 <style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
+	}
 	.content1 {
 		margin: 10rpx;
-		padding-bottom: 224rpx;
 
 		.title {
 			height: 70rpx;
@@ -316,8 +509,9 @@
 	.uForm_item {
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		margin: 20rpx;
+		margin: 20rpx 0rpx 0rpx 0rpx;
 		border-radius: 20rpx;
+		width: 100%;
 	}
 
 	.rejectText {
@@ -468,8 +662,156 @@
 				}
 			}
 	}
+	.content3 {
+		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;
+						}
+
+						.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: 40rpx;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+
+		}
+
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	.titlez {
+		font-size: 17px;
+		font-weight: 700;
+		height: 35px;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.rowz{
+		display: flex;
+		justify-content: space-between;
+
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 	/deep/.u-input__textarea {
-		height: 300rpx !important;
+		height: 200rpx !important;
 	}
 </style>

pages/task/audit/supp_clock_details.vue

@@ -35,6 +35,73 @@
 					</view>
 			</u-form>
 		</view>
+		<view class="content3">
+			<view class="titlez rowz">
+				流程
+			</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>
+					<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>
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='fanHui' type="success" class="btn1" hover-class='none'>返回</u-button>
 		</view>
@@ -59,7 +126,13 @@
 				approveStatus:'',
 				status:'',
 				updateDate:'',
-				dataList:{},
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
+				auditMind: '',
+				dataList:{
+					srcList:[]
+				},
+				auditList: [],
+				auditMind: '',
 			}
 		},
 		// onReady() {
@@ -79,7 +152,125 @@
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'BUKA-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)
+							this.auditList = response.data.data
+							var time2 = new Date(this.dataList.createDate).getTime()
+							var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle: this.dataList.empName.substring(0, 2),
+								operatorName: this.dataList.empName,
+								updateDate: time3,
+								auditMind: '',
+								desc: '发起申请',
+								showflow: false,
+								commonStaffs1: null,
+								commonStaffs: null,
+								workflowHistoricTasks: [],
+								status: 'success'
+							})
+						})
+					})
 					}
 				})
 			},
@@ -91,9 +282,12 @@
 </script>
 
 <style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
+	}
 	.content1 {
 		margin: 10rpx;
-		padding-bottom: 120rpx;
 
 		.title {
 			height: 70rpx;
@@ -182,10 +376,12 @@
 	.uForm_item {
 		padding: 20rpx;
 		background-color: #FFFFFF;
-		margin: 20rpx;
+		margin: 20rpx 0rpx 0rpx 0rpx;
 		border-radius: 20rpx;
+		width: 100%;
 	}
 
+
 	.rejectText {
 		text-align: center;
 	}
@@ -221,7 +417,155 @@
 		}
 
 	}
+.content3 {
+		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;
+						}
+
+						.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: 40rpx;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+
+		}
+
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
+	.titlez {
+		font-size: 17px;
+		font-weight: 700;
+		height: 35px;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.rowz{
+		display: flex;
+		justify-content: space-between;
 
+		.right,
+		input {
+			font-size: 28rpx;
+			color: #333333;
+		}
+	}
 	.deleteText {
 		text-align: center;
 		color: #AFB3BF;

pages/user/contractLook/inventoryCost.vue

@@ -21,6 +21,24 @@
 					</view>
 					<view class="font">{{item1.cost}}</view>
 				</view>
+				<view v-show="(item1.cargoWeight && item1.cargoWeight != 0)" class="goods-table-content"
+					v-for="(item1,index1) in item.goodList">
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.goodsName}}(转入)
+					</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.cargoWeight}}
+					</view>
+				</view>
+				<view v-show="(item1.redemptionWeight && item1.redemptionWeight != 0)" class="goods-table-content"
+					v-for="(item1,index1) in item.goodList">
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.goodsName}}(待赎回)
+					</view>
+					<view class="font" :class="item.goodList.length>1&&index1==item.goodList.length-1?'active':''">
+						{{item1.redemptionWeight}}
+					</view>
+				</view>
 			</view>
 		</view>
 		<u-modal class="record" v-model="isShowDetailBtn" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -43,7 +61,8 @@
 					<view class="">仓库名称</view>
 					<view>{{parameter.warehouseName}}</view>
 				</view>
-				<u-picker mode="selector" v-model="show1" @confirm='warehouseConfirm' range-key='warehouseName' :default-selector="[0]" :range="warehouseList"></u-picker>
+				<u-picker mode="selector" v-model="show1" @confirm='warehouseConfirm' range-key='warehouseName'
+					:default-selector="[0]" :range="warehouseList"></u-picker>
 			</view>
 		</u-modal>
 		<u-calendar v-model="show" :mode="mode" @change="change" range-color='#22C572' btn-type='success'
@@ -63,9 +82,9 @@
 		data() {
 			return {
 				isShowAlert: false,
-				show1:false,
+				show1: false,
 				content: '当前登录身份已失效，请重新登录！',
-				warehouseList:[],
+				warehouseList: [],
 				parameter: {
 					startDate: "",
 					endDate: '',
@@ -93,28 +112,28 @@
 		onLoad: function(option) {
 			console.log(option)
 			this.searchMonth = option.searchMonth
-			 this.init()
+			this.init()
 		},
 		onNavigationBarButtonTap() {
 			this.parameter.warehouseName = this.costList[0].warehouseName
-		   this.parameter.startDate = helper.getNowNumFormatDate(-1)
-		   console.log(this.parameter.startDate)
-		   this.parameter.endDate = helper.getNowFormatDate()
-		   uni.showLoading({
-		   	title: '正在加载'
-		   })
-		   this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
-		   	compId: uni.getStorageSync('pcUserInfo').compId,
-		   }).then(res => {
-				this.warehouseList=res.data.data
+			this.parameter.startDate = helper.getNowNumFormatDate(-1)
+			console.log(this.parameter.startDate)
+			this.parameter.endDate = helper.getNowFormatDate()
+			uni.showLoading({
+				title: '正在加载'
+			})
+			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelfApp', {
+				compId: uni.getStorageSync('pcUserInfo').compId,
+			}).then(res => {
+				this.warehouseList = res.data.data
 				this.isShowDetailBtn = true
-		   })
+			})
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			warehouseConfirm(e){
+			warehouseConfirm(e) {
 				console.log(e)
 				this.parameter.warehouseName = this.warehouseList[e[0]].warehouseName
 			},
@@ -153,8 +172,8 @@
 					title: '正在加载'
 				})
 				this.$api.doRequest('post', _url, {
-					startDate: this.parameter.startDate+' 00:00:00',
-					endDate: this.parameter.endDate+' 00:00:00',
+					startDate: this.parameter.startDate + ' 00:00:00',
+					endDate: this.parameter.endDate + ' 00:00:00',
 					warehouseName: this.parameter.warehouseName
 				}).then(res => {
 					uni.hideLoading()
@@ -181,7 +200,7 @@
 			},
 			toDetail(warehouseName) {
 				// this.parameter.warehouseName = warehouseName
-				
+
 			},
 			init() {
 				if (!this.hasLogin) {
@@ -317,6 +336,7 @@
 
 			}
 
+
 			.font:nth-of-type(1) {
 				width: 40%;
 			}
@@ -350,7 +370,6 @@
 				width: 30%;
 				text-align: right;
 			}
-
 		}
 	}
 </style>