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

config/index.js

@@ -3,7 +3,7 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.55:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',

pages/erp/exWarehousing/exWarehousing.vue

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

pages/grain_pulse/enter.vue

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

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -398,7 +398,7 @@
 			getList() {
 				uni.showLoading({
 					title:'加载中',
-					mask:true
+					mask:true,
 				})
 				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
 					id: this.id
@@ -448,95 +448,96 @@
 								}
 								})
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'INOUTTASK-TASK-APPROVE',
-							tmpCompId: uni.getStorageSync('pcUserInfo').compId
-						}).then(res1 => {
-							this.$api.doRequest('get', '/commonUser/getHis', {
-								workflowId: res1.data.data[0].id,
-								businessKey: this.id
-							}).then(response => {
-								uni.hideLoading()
-								for (let i = 0; i < response.data.data.length; i++) {
-									this.$set(response.data.data[i],'status','question')
-									console.log(response.data.data[i].workflowHistoricTasks,i)
-									if(response.data.data[i].commonStaffs){
-										response.data.data[i].showflow=false
-										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
-										response.data.data[i].operatorName=response.data.data[i].desc
-										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-												// response.data.data[i].status='question'
-												this.$set(response.data.data[i],'status','question')
-											}else{
-												this.$set(response.data.data[i],'status','success')
-												// response.data.data[i].status='success'
-											}
-											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-											var workflowdata=response.data.data[i].workflowHistoricTasks
-											var staffsdata=response.data.data[i].commonStaffs
-											for (let q = 0; q < staffsdata.length; q++) {
-												staffsdata[q].status=false
-												staffsdata[q].staffTitle=staffsdata[q].staffName
-												for (let k = 0; k < workflowdata.length; k++) {
-													if(staffsdata[q].staffId==workflowdata[k].operatorId){
-														staffsdata[q].status=true
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'INOUTTASK-TASK-APPROVE',
+								tmpCompId: uni.getStorageSync('pcUserInfo').compId
+							}).then(res1 => {
+								this.$api.doRequest('get', '/commonUser/getHis', {
+									workflowId: res1.data.data[0].id,
+									businessKey: this.id
+								}).then(response => {
+									uni.hideLoading()
+									for (let i = 0; i < response.data.data.length; i++) {
+										this.$set(response.data.data[i],'status','question')
+										console.log(response.data.data[i].workflowHistoricTasks,i)
+										if(response.data.data[i].commonStaffs){
+											response.data.data[i].showflow=false
+											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											response.data.data[i].operatorName=response.data.data[i].desc
+											response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+													// response.data.data[i].status='question'
+													this.$set(response.data.data[i],'status','question')
+												}else{
+													this.$set(response.data.data[i],'status','success')
+													// response.data.data[i].status='success'
+												}
+												response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+												var workflowdata=response.data.data[i].workflowHistoricTasks
+												var staffsdata=response.data.data[i].commonStaffs
+												for (let q = 0; q < staffsdata.length; q++) {
+													staffsdata[q].status=false
+													staffsdata[q].staffTitle=staffsdata[q].staffName
+													for (let k = 0; k < workflowdata.length; k++) {
+														if(staffsdata[q].staffId==workflowdata[k].operatorId){
+															staffsdata[q].status=true
+														}
 													}
 												}
 											}
-										}
-										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-									}else{
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											var len =response.data.data[i].workflowHistoricTasks.length-1
-											if(response.data.data[i].workflowHistoricTasks[len].approved){
-												this.$set(response.data.data[i],'status','success')
-											}else{
-												this.$set(response.data.data[i],'status','error')
-											}
-											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
-											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
-											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}else{
-											this.$set(response.data.data[i],'status','question')
-											// response.data.data[i].status='question'
-											if(response.data.data[i].desc=='总经理助理审核'){
-												response.data.data[i].operatorTitle='总助'
-											}else if(response.data.data[i].desc=='杜大光审核'){
-												response.data.data[i].operatorTitle='大光'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												var len =response.data.data[i].workflowHistoricTasks.length-1
+												if(response.data.data[i].workflowHistoricTasks[len].approved){
+													this.$set(response.data.data[i],'status','success')
+												}else{
+													this.$set(response.data.data[i],'status','error')
+												}
+												response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+												response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+												var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
 											}else{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												this.$set(response.data.data[i],'status','question')
+												// response.data.data[i].status='question'
+												if(response.data.data[i].desc=='总经理助理审核'){
+													response.data.data[i].operatorTitle='总助'
+												}else if(response.data.data[i].desc=='杜大光审核'){
+													response.data.data[i].operatorTitle='大光'
+												}else{
+													response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												}
+												
+												response.data.data[i].operatorName=response.data.data[i].desc
+												var time1=new Date(response.data.data[i].updateDate).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=''
 											}
-											
-											response.data.data[i].operatorName=response.data.data[i].desc
-											var time1=new Date(response.data.data[i].updateDate).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=''
 										}
+										
 									}
-									
-								}
-								console.log(response.data.data)
-								this.auditList = response.data.data
-								var time2=new Date(this.list.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle:this.list.creater.substring(0,2),
-									operatorName:this.list.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									console.log(response.data.data)
+									this.auditList = response.data.data
+									var time2=new Date(this.list.createDate).getTime()
+									var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle:this.list.creater.substring(0,2),
+										operatorName:this.list.creater,
+										updateDate:time3,
+										auditMind:'',
+										desc:'发起申请',
+										showflow:false,
+										commonStaffs1:null,
+										commonStaffs:null,
+										workflowHistoricTasks:[],
+										status:'success'
+									})
 								})
-							})
+							})	
 						})
 					}
 				})

pages/task/audit/Issueandreceipt_task_details.vue

@@ -386,96 +386,98 @@
 									}
 								}
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'INOUTTASK-TASK-APPROVE',
-							tmpCompId: uni.getStorageSync('pcUserInfo').compId
-						}).then(res1 => {
-							this.$api.doRequest('get', '/commonUser/getHis', {
-								workflowId: res1.data.data[0].id,
-								businessKey: this.id
-							}).then(response => {
-								uni.hideLoading()
-								for (let i = 0; i < response.data.data.length; i++) {
-									this.$set(response.data.data[i],'status','question')
-									console.log(response.data.data[i].workflowHistoricTasks,i)
-									if(response.data.data[i].commonStaffs){
-										response.data.data[i].showflow=false
-										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
-										response.data.data[i].operatorName=response.data.data[i].desc
-										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-												// response.data.data[i].status='question'
-												this.$set(response.data.data[i],'status','question')
-											}else{
-												this.$set(response.data.data[i],'status','success')
-												// response.data.data[i].status='success'
-											}
-											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-											var workflowdata=response.data.data[i].workflowHistoricTasks
-											var staffsdata=response.data.data[i].commonStaffs
-											for (let q = 0; q < staffsdata.length; q++) {
-												staffsdata[q].status=false
-												staffsdata[q].staffTitle=staffsdata[q].staffName
-												for (let k = 0; k < workflowdata.length; k++) {
-													if(staffsdata[q].staffId==workflowdata[k].operatorId){
-														staffsdata[q].status=true
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'INOUTTASK-TASK-APPROVE',
+								tmpCompId: uni.getStorageSync('pcUserInfo').compId
+							}).then(res1 => {
+								this.$api.doRequest('get', '/commonUser/getHis', {
+									workflowId: res1.data.data[0].id,
+									businessKey: this.id
+								}).then(response => {
+									uni.hideLoading()
+									for (let i = 0; i < response.data.data.length; i++) {
+										this.$set(response.data.data[i],'status','question')
+										console.log(response.data.data[i].workflowHistoricTasks,i)
+										if(response.data.data[i].commonStaffs){
+											response.data.data[i].showflow=false
+											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											response.data.data[i].operatorName=response.data.data[i].desc
+											response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+													// response.data.data[i].status='question'
+													this.$set(response.data.data[i],'status','question')
+												}else{
+													this.$set(response.data.data[i],'status','success')
+													// response.data.data[i].status='success'
+												}
+												response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+												var workflowdata=response.data.data[i].workflowHistoricTasks
+												var staffsdata=response.data.data[i].commonStaffs
+												for (let q = 0; q < staffsdata.length; q++) {
+													staffsdata[q].status=false
+													staffsdata[q].staffTitle=staffsdata[q].staffName
+													for (let k = 0; k < workflowdata.length; k++) {
+														if(staffsdata[q].staffId==workflowdata[k].operatorId){
+															staffsdata[q].status=true
+														}
 													}
 												}
 											}
-										}
-										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-									}else{
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											var len =response.data.data[i].workflowHistoricTasks.length-1
-											if(response.data.data[i].workflowHistoricTasks[len].approved){
-												this.$set(response.data.data[i],'status','success')
-											}else{
-												this.$set(response.data.data[i],'status','error')
-											}
-											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
-											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
-											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}else{
-											this.$set(response.data.data[i],'status','question')
-											// response.data.data[i].status='question'
-											if(response.data.data[i].desc=='总经理助理审核'){
-												response.data.data[i].operatorTitle='总助'
-											}else if(response.data.data[i].desc=='杜大光审核'){
-												response.data.data[i].operatorTitle='大光'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												var len =response.data.data[i].workflowHistoricTasks.length-1
+												if(response.data.data[i].workflowHistoricTasks[len].approved){
+													this.$set(response.data.data[i],'status','success')
+												}else{
+													this.$set(response.data.data[i],'status','error')
+												}
+												response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+												response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+												var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
 											}else{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												this.$set(response.data.data[i],'status','question')
+												// response.data.data[i].status='question'
+												if(response.data.data[i].desc=='总经理助理审核'){
+													response.data.data[i].operatorTitle='总助'
+												}else if(response.data.data[i].desc=='杜大光审核'){
+													response.data.data[i].operatorTitle='大光'
+												}else{
+													response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												}
+												
+												response.data.data[i].operatorName=response.data.data[i].desc
+												var time1=new Date(response.data.data[i].updateDate).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=''
 											}
-											
-											response.data.data[i].operatorName=response.data.data[i].desc
-											var time1=new Date(response.data.data[i].updateDate).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=''
 										}
+										
 									}
-									
-								}
-								console.log(response.data.data)
-								this.auditList = response.data.data
-								var time2=new Date(this.list.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
-								this.auditList.unshift({
-									operatorTitle:this.list.creater.substring(0,2),
-									operatorName:this.list.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									console.log(response.data.data)
+									this.auditList = response.data.data
+									var time2=new Date(this.list.createDate).getTime()
+									var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle:this.list.creater.substring(0,2),
+										operatorName:this.list.creater,
+										updateDate:time3,
+										auditMind:'',
+										desc:'发起申请',
+										showflow:false,
+										commonStaffs1:null,
+										commonStaffs:null,
+										workflowHistoricTasks:[],
+										status:'success'
+									})
 								})
 							})
 						})
+						
 					}
 				})
 				

pages/task/audit/acquisitioncontract.vue

@@ -368,10 +368,8 @@
 		},
 		onLoad(options) {
 			this.id = options.id
-
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
-
 		},
 		onShow() {
 			this.getList()
@@ -428,141 +426,140 @@
 									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
 								}
 							}
-						})
-						// 查流程
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'SHOU-CONTRACT-APPROVE',
-							tmpCompId: uni.getStorageSync('pcUserInfo').compId
-						}).then(res1 => {
-							this.$api.doRequest('get', '/commonUser/getHis', {
-								workflowId: res1.data.data[0].id,
-								businessKey: this.id
-							}).then(response => {
-								uni.hideLoading()
-								for (let i = 0; i < response.data.data.length; i++) {
-									this.$set(response.data.data[i], 'status', 'question')
-									console.log(response.data.data[i].workflowHistoricTasks, i)
-									if (response.data.data[i].commonStaffs) {
-										response.data.data[i].showflow = false
-										response.data.data[i].operatorTitle = response.data.data[i]
-											.desc.substring(0, 2)
-										response.data.data[i].operatorName = response.data.data[i]
-											.desc
-										response.data.data[i].staffscontent = '共' + response.data
-											.data[i].commonStaffs.length + '人，当前审核' + response.data
-											.data[i].workflowHistoricTasks.length + '人'
-										if (response.data.data[i].workflowHistoricTasks && response
-											.data.data[i].workflowHistoricTasks.length > 0) {
-											if (response.data.data[i].workflowHistoricTasks
-												.length != response.data.data[i].commonStaffs
-												.length) {
-												// response.data.data[i].status='question'
-												this.$set(response.data.data[i], 'status',
-													'question')
-											} else {
-												this.$set(response.data.data[i], 'status',
-													'success')
-												// response.data.data[i].status='success'
-											}
-											response.data.data[i].workflowlen = response.data.data[
-												i].workflowHistoricTasks.length
-											var workflowdata = response.data.data[i]
-												.workflowHistoricTasks
-											var staffsdata = response.data.data[i].commonStaffs
-											for (let q = 0; q < staffsdata.length; q++) {
-												staffsdata[q].status = false
-												staffsdata[q].staffTitle = staffsdata[q].staffName
-												for (let k = 0; k < workflowdata.length; k++) {
-													if (staffsdata[q].staffId == workflowdata[k]
-														.operatorId) {
-														staffsdata[q].status = true
+							// 查流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'SHOU-CONTRACT-APPROVE',
+								tmpCompId: uni.getStorageSync('pcUserInfo').compId
+							}).then(res1 => {
+								this.$api.doRequest('get', '/commonUser/getHis', {
+									workflowId: res1.data.data[0].id,
+									businessKey: this.id
+								}).then(response => {
+									uni.hideLoading()
+									for (let i = 0; i < response.data.data.length; i++) {
+										this.$set(response.data.data[i], 'status', 'question')
+										console.log(response.data.data[i].workflowHistoricTasks, i)
+										if (response.data.data[i].commonStaffs) {
+											response.data.data[i].showflow = false
+											response.data.data[i].operatorTitle = response.data.data[i]
+												.desc.substring(0, 2)
+											response.data.data[i].operatorName = response.data.data[i]
+												.desc
+											response.data.data[i].staffscontent = '共' + response.data
+												.data[i].commonStaffs.length + '人，当前审核' + response.data
+												.data[i].workflowHistoricTasks.length + '人'
+											if (response.data.data[i].workflowHistoricTasks && response
+												.data.data[i].workflowHistoricTasks.length > 0) {
+												if (response.data.data[i].workflowHistoricTasks
+													.length != response.data.data[i].commonStaffs
+													.length) {
+													// response.data.data[i].status='question'
+													this.$set(response.data.data[i], 'status',
+														'question')
+												} else {
+													this.$set(response.data.data[i], 'status',
+														'success')
+													// response.data.data[i].status='success'
+												}
+												response.data.data[i].workflowlen = response.data.data[
+													i].workflowHistoricTasks.length
+												var workflowdata = response.data.data[i]
+													.workflowHistoricTasks
+												var staffsdata = response.data.data[i].commonStaffs
+												for (let q = 0; q < staffsdata.length; q++) {
+													staffsdata[q].status = false
+													staffsdata[q].staffTitle = staffsdata[q].staffName
+													for (let k = 0; k < workflowdata.length; k++) {
+														if (staffsdata[q].staffId == workflowdata[k]
+															.operatorId) {
+															staffsdata[q].status = true
+														}
 													}
 												}
 											}
-										}
-										response.data.data[i].commonStaffs1 = response.data.data[i]
-											.commonStaffs
-									} else {
-										if (response.data.data[i].workflowHistoricTasks && response
-											.data.data[i].workflowHistoricTasks.length > 0) {
-											var len = response.data.data[i].workflowHistoricTasks
-												.length - 1
-											if (response.data.data[i].workflowHistoricTasks[len]
-												.approved) {
-												this.$set(response.data.data[i], 'status',
-													'success')
-											} else {
-												this.$set(response.data.data[i], 'status', 'error')
-											}
-											response.data.data[i].operatorTitle = response.data
-												.data[i].workflowHistoricTasks[len].operatorName
-												.substring(response.data.data[i]
-													.workflowHistoricTasks[0].operatorName.length -
-													2)
-											response.data.data[i].operatorName = response.data
-												.data[i].workflowHistoricTasks[len].operatorName
-											var time = new Date(response.data.data[i]
-												.workflowHistoricTasks[len].claimTime)
-											.getTime()
-											response.data.data[i].updateDate = this.$u.timeFormat(
-												time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind = response.data.data[i]
-												.workflowHistoricTasks[len].auditMind
+											response.data.data[i].commonStaffs1 = response.data.data[i]
+												.commonStaffs
 										} else {
-											this.$set(response.data.data[i], 'status', 'question')
-											// response.data.data[i].status='question'
-											if (response.data.data[i].desc == '总经理助理审核') {
-												response.data.data[i].operatorTitle = '总助'
-											} else if (response.data.data[i].desc == '杜大光审核') {
-												response.data.data[i].operatorTitle = '大光'
-											} else {
+											if (response.data.data[i].workflowHistoricTasks && response
+												.data.data[i].workflowHistoricTasks.length > 0) {
+												var len = response.data.data[i].workflowHistoricTasks
+													.length - 1
+												if (response.data.data[i].workflowHistoricTasks[len]
+													.approved) {
+													this.$set(response.data.data[i], 'status',
+														'success')
+												} else {
+													this.$set(response.data.data[i], 'status', 'error')
+												}
 												response.data.data[i].operatorTitle = response.data
-													.data[i].desc.substring(0, 2)
-											}
-
-											response.data.data[i].operatorName = response.data
-												.data[i].desc
-											var time1 = new Date(response.data.data[i].updateDate)
+													.data[i].workflowHistoricTasks[len].operatorName
+													.substring(response.data.data[i]
+														.workflowHistoricTasks[0].operatorName.length -
+														2)
+												response.data.data[i].operatorName = response.data
+													.data[i].workflowHistoricTasks[len].operatorName
+												var time = new Date(response.data.data[i]
+													.workflowHistoricTasks[len].claimTime)
 												.getTime()
-											response.data.data[i].updateDate = this.$u.timeFormat(
-												time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind = ''
+												response.data.data[i].updateDate = this.$u.timeFormat(
+													time, 'mm.dd hh:MM')
+												response.data.data[i].auditMind = response.data.data[i]
+													.workflowHistoricTasks[len].auditMind
+											} else {
+												this.$set(response.data.data[i], 'status', 'question')
+												// response.data.data[i].status='question'
+												if (response.data.data[i].desc == '总经理助理审核') {
+													response.data.data[i].operatorTitle = '总助'
+												} else if (response.data.data[i].desc == '杜大光审核') {
+													response.data.data[i].operatorTitle = '大光'
+												} else {
+													response.data.data[i].operatorTitle = response.data
+														.data[i].desc.substring(0, 2)
+												}
+							
+												response.data.data[i].operatorName = response.data
+													.data[i].desc
+												var time1 = new Date(response.data.data[i].updateDate)
+													.getTime()
+												response.data.data[i].updateDate = this.$u.timeFormat(
+													time1, 'mm.dd hh:MM')
+												response.data.data[i].auditMind = ''
+											}
 										}
+							
 									}
-
-								}
-								console.log(response.data.data)
-								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"
+									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'
+									this.auditList = response.data.data
+									var time2 = new Date(this.list.createDate).getTime()
+									var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
+									this.auditList.unshift({
+										operatorTitle: this.list.creater.substring(0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
+									})
 								})
-							})
+							})	
 						})
 					}
 				})
-
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {

pages/task/audit/charge_against_revenue.vue

@@ -306,14 +306,15 @@
 		watch: {
 			imglist: {
 				handler: function() {
+					let that = this
 					this.$api.doRequest('get', 'appendix/query/getFileList', {
 						appendixIds: this.imglist.toString()
 					}).then(res => {
 						this.imglist2 = res.data.data
 						for (let i = 0; i < this.imglist2.length; i++) {
 							if (this.imglist2[i].appendixName) {//获取文件的后缀名
-								let index = that.imglist[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
-								that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								let index = that.imglist2[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								that.imglist2[i].type = that.imglist2[i].appendixName.substring(index+1)
 								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
@@ -1126,20 +1127,20 @@
 		margin: 5px;
 	}
 
-	.char_css {
-		// text-align: center;
-		// width: 90px;
-		font-size: 30rpx;
-		font-weight: 600;
-		display: -webkit-box;
-		overflow: hidden;
-		/*! autoprefixer: off; */
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-		text-overflow: ellipsis;
-		word-break: break-all;
-	}
+	// .char_css {
+	// 	// text-align: center;
+	// 	// width: 90px;
+	// 	font-size: 30rpx;
+	// 	font-weight: 600;
+	// 	display: -webkit-box;
+	// 	overflow: hidden;
+	// 	/*! autoprefixer: off; */
+	// 	-webkit-box-orient: vertical;
+	// 	-webkit-line-clamp: 1;
+	// 	-webkit-box-orient: vertical;
+	// 	text-overflow: ellipsis;
+	// 	word-break: break-all;
+	// }
 
 	.img_item {
 		display: flex;

pages/task/audit/charge_against_revenue_detail.vue

@@ -120,22 +120,25 @@
 							<view class="" style="width: 16%;">
 								<image
 									v-if="item.type == 'pdf'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									class="imgsign" src="../../../static/img/oa_office/pdf3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									class="imgsign" src="../../../static/img/oa_office/excle3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									class="imgsign" src="../../../static/img/oa_office/word3.png"
 									mode=""></image>
-								<image v-else style="width: 40px; height: 40px;"
+								<image v-else class="imgsign"
 									src="../../../static/img/oa_office/img.png" mode=""></image>
 							</view>
-							<view class="" style="width: 70%;">
-								<view class="char_css">{{item.appendixName}}</view>
-								<view class="">{{item.appendixSize}}</view>
+							<view style='justify-content: space-between;width: 81%;' class="flex">
+								<view>
+									<view class="char_css">{{item.appendixName}}</view>
+									<view class="img_size">{{item.appendixSize}}</view>
+								</view>
+								<view class="img_dowload" @click="openDocument(item)">下载</view>
 							</view>
-							<view class="img_dowload" @click="openDocument(item)">下载</view>
+							
 						</view>
 					</view>
 				</view>
@@ -281,8 +284,8 @@
 						this.imglist2 = res.data.data
 						for (let i = 0; i < this.imglist2.length; i++) {
 							if (this.imglist2[i].appendixName) {
-								let index = that.imglist[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
-								that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								let index = this.imglist2[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								this.imglist2[i].type = this.imglist2[i].appendixName.substring(index+1)
 								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
@@ -991,25 +994,48 @@
 		margin: 5px;
 	}
 	
-	.char_css {
-		// text-align: center;
-		// width: 90px;
-		font-size: 30rpx;
-		font-weight: 600;
-		display: -webkit-box;
-		overflow: hidden;
-		/*! autoprefixer: off; */
-		-webkit-box-orient: vertical;
-		-webkit-line-clamp: 1;
-		-webkit-box-orient: vertical;
-		text-overflow: ellipsis;
-		word-break: break-all;
-	}
+	// .char_css {
+	// 	// text-align: center;
+	// 	// width: 90px;
+	// 	font-size: 30rpx;
+	// 	font-weight: 600;
+	// 	display: -webkit-box;
+	// 	overflow: hidden;
+	// 	/*! autoprefixer: off; */
+	// 	-webkit-box-orient: vertical;
+	// 	-webkit-line-clamp: 1;
+	// 	-webkit-box-orient: vertical;
+	// 	text-overflow: ellipsis;
+	// 	word-break: break-all;
+	// }
 	
 	.img_item {
 		display: flex;
-		width: 100%;
+		width: 85vw;
 		margin: 10px 0;
+		padding: 0 10rpx;
+		.imgsign{
+			width: 25px;
+			height: 25px;
+			margin-top: 6px;
+		}
+		.char_css {
+			font-size: 28rpx;
+			font-weight: 600;
+			display: -webkit-box;
+			overflow: hidden;
+			/*! autoprefixer: off; */
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			-webkit-box-orient: vertical;
+			text-overflow: ellipsis;
+			word-break: break-all;
+		}
+		.img_size{
+			color: #B0B3BF;
+			font-size: 12px;
+			margin-top: 5px;
+		}
 	
 		.img_dowload {
 			width: 14%;

pages/task/audit/purchasecontract.vue

@@ -438,104 +438,103 @@
 									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
 								}
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'BUY-CONTRACT-APPROVE',
-							tmpCompId: uni.getStorageSync('pcUserInfo').compId
-						}).then(res1 => {
-							this.$api.doRequest('get', '/commonUser/getHis', {
-								workflowId: res1.data.data[0].id,
-								businessKey: this.id
-							}).then(response => {
-								uni.hideLoading()
-								for (let i = 0; i < response.data.data.length; i++) {
-									this.$set(response.data.data[i],'status','question')
-									// console.log(response.data.data[i].workflowHistoricTasks,i)
-									if(response.data.data[i].commonStaffs){
-										response.data.data[i].showflow=false
-										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
-										response.data.data[i].operatorName=response.data.data[i].desc
-										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-												// response.data.data[i].status='question'
-												this.$set(response.data.data[i],'status','question')
-											}else{
-												this.$set(response.data.data[i],'status','success')
-												// response.data.data[i].status='success'
-											}
-											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-											var workflowdata=response.data.data[i].workflowHistoricTasks
-											var staffsdata=response.data.data[i].commonStaffs
-											for (let q = 0; q < staffsdata.length; q++) {
-												staffsdata[q].status=false
-												staffsdata[q].staffTitle=staffsdata[q].staffName
-												for (let k = 0; k < workflowdata.length; k++) {
-													if(staffsdata[q].staffId==workflowdata[k].operatorId){
-														staffsdata[q].status=true
+							//审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'BUY-CONTRACT-APPROVE',
+								tmpCompId: uni.getStorageSync('pcUserInfo').compId
+							}).then(res1 => {
+								this.$api.doRequest('get', '/commonUser/getHis', {
+									workflowId: res1.data.data[0].id,
+									businessKey: this.id
+								}).then(response => {
+									uni.hideLoading()
+									for (let i = 0; i < response.data.data.length; i++) {
+										this.$set(response.data.data[i],'status','question')
+										// console.log(response.data.data[i].workflowHistoricTasks,i)
+										if(response.data.data[i].commonStaffs){
+											response.data.data[i].showflow=false
+											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											response.data.data[i].operatorName=response.data.data[i].desc
+											response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+													// response.data.data[i].status='question'
+													this.$set(response.data.data[i],'status','question')
+												}else{
+													this.$set(response.data.data[i],'status','success')
+													// response.data.data[i].status='success'
+												}
+												response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+												var workflowdata=response.data.data[i].workflowHistoricTasks
+												var staffsdata=response.data.data[i].commonStaffs
+												for (let q = 0; q < staffsdata.length; q++) {
+													staffsdata[q].status=false
+													staffsdata[q].staffTitle=staffsdata[q].staffName
+													for (let k = 0; k < workflowdata.length; k++) {
+														if(staffsdata[q].staffId==workflowdata[k].operatorId){
+															staffsdata[q].status=true
+														}
 													}
 												}
 											}
-										}
-										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-									}else{
-										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-											var len =response.data.data[i].workflowHistoricTasks.length-1
-											if(response.data.data[i].workflowHistoricTasks[len].approved){
-												this.$set(response.data.data[i],'status','success')
-											}else{
-												this.$set(response.data.data[i],'status','error')
-											}
-											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
-											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
-											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+											response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 										}else{
-											this.$set(response.data.data[i],'status','question')
-											// response.data.data[i].status='question'
-											if(response.data.data[i].desc=='总经理助理审核'){
-												response.data.data[i].operatorTitle='总助'
-											}else if(response.data.data[i].desc=='杜大光审核'){
-												response.data.data[i].operatorTitle='大光'
+											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+												var len =response.data.data[i].workflowHistoricTasks.length-1
+												if(response.data.data[i].workflowHistoricTasks[len].approved){
+													this.$set(response.data.data[i],'status','success')
+												}else{
+													this.$set(response.data.data[i],'status','error')
+												}
+												response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+												response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+												var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
 											}else{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												this.$set(response.data.data[i],'status','question')
+												// response.data.data[i].status='question'
+												if(response.data.data[i].desc=='总经理助理审核'){
+													response.data.data[i].operatorTitle='总助'
+												}else if(response.data.data[i].desc=='杜大光审核'){
+													response.data.data[i].operatorTitle='大光'
+												}else{
+													response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+												}
+												response.data.data[i].operatorName=response.data.data[i].desc
+												var time1=new Date(response.data.data[i].updateDate).getTime()
+												response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+												response.data.data[i].auditMind=''
 											}
-											
-											response.data.data[i].operatorName=response.data.data[i].desc
-											var time1=new Date(response.data.data[i].updateDate).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=''
 										}
 									}
-									
-								}
-								console.log(response.data.data)
-								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"
+									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'
+									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'
+									})
 								})
 							})
 						})

pages/task/audit/salecontract.vue

@@ -456,134 +456,133 @@
 									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
 								}
 							}
-						})
-						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-							businessCode: 'SALE-CONTRACT-APPROVE',
-							tmpCompId: uni.getStorageSync('pcUserInfo').compId
-						}).then(res1 => {
-							this.$api.doRequest('get', '/commonUser/getHis', {
-								workflowId: res1.data.data[0].id,
-								businessKey: this.id
-							}).then(response => {
-								uni.hideLoading()
-								for (let i = 0; i < response.data.data.length; i++) {
-									this.$set(response.data.data[i], 'status', 'question')
-									// console.log(response.data.data[i].workflowHistoricTasks,i)
-									if (response.data.data[i].commonStaffs) {
-										response.data.data[i].showflow = false
-										response.data.data[i].operatorTitle = response.data.data[i]
-											.desc.substring(0, 2)
-										response.data.data[i].operatorName = response.data.data[i]
-											.desc
-										response.data.data[i].staffscontent = '共' + response.data
-											.data[i].commonStaffs.length + '人，当前审核' + response.data
-											.data[i].workflowHistoricTasks.length + '人'
-										if (response.data.data[i].workflowHistoricTasks && response
-											.data.data[i].workflowHistoricTasks.length > 0) {
-											if (response.data.data[i].workflowHistoricTasks
-												.length != response.data.data[i].commonStaffs
-												.length) {
-												// response.data.data[i].status='question'
-												this.$set(response.data.data[i], 'status',
-													'question')
-											} else {
-												this.$set(response.data.data[i], 'status',
-													'success')
-												// response.data.data[i].status='success'
-											}
-											response.data.data[i].workflowlen = response.data.data[
-												i].workflowHistoricTasks.length
-											var workflowdata = response.data.data[i]
-												.workflowHistoricTasks
-											var staffsdata = response.data.data[i].commonStaffs
-											for (let q = 0; q < staffsdata.length; q++) {
-												staffsdata[q].status = false
-												staffsdata[q].staffTitle = staffsdata[q].staffName
-												for (let k = 0; k < workflowdata.length; k++) {
-													if (staffsdata[q].staffId == workflowdata[k]
-														.operatorId) {
-														staffsdata[q].status = true
+							// 审核流程
+							this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+								businessCode: 'SALE-CONTRACT-APPROVE',
+								tmpCompId: uni.getStorageSync('pcUserInfo').compId
+							}).then(res1 => {
+								this.$api.doRequest('get', '/commonUser/getHis', {
+									workflowId: res1.data.data[0].id,
+									businessKey: this.id
+								}).then(response => {
+									uni.hideLoading()
+									for (let i = 0; i < response.data.data.length; i++) {
+										this.$set(response.data.data[i], 'status', 'question')
+										// console.log(response.data.data[i].workflowHistoricTasks,i)
+										if (response.data.data[i].commonStaffs) {
+											response.data.data[i].showflow = false
+											response.data.data[i].operatorTitle = response.data.data[i]
+												.desc.substring(0, 2)
+											response.data.data[i].operatorName = response.data.data[i]
+												.desc
+											response.data.data[i].staffscontent = '共' + response.data
+												.data[i].commonStaffs.length + '人，当前审核' + response.data
+												.data[i].workflowHistoricTasks.length + '人'
+											if (response.data.data[i].workflowHistoricTasks && response
+												.data.data[i].workflowHistoricTasks.length > 0) {
+												if (response.data.data[i].workflowHistoricTasks
+													.length != response.data.data[i].commonStaffs
+													.length) {
+													// response.data.data[i].status='question'
+													this.$set(response.data.data[i], 'status',
+														'question')
+												} else {
+													this.$set(response.data.data[i], 'status',
+														'success')
+													// response.data.data[i].status='success'
+												}
+												response.data.data[i].workflowlen = response.data.data[
+													i].workflowHistoricTasks.length
+												var workflowdata = response.data.data[i]
+													.workflowHistoricTasks
+												var staffsdata = response.data.data[i].commonStaffs
+												for (let q = 0; q < staffsdata.length; q++) {
+													staffsdata[q].status = false
+													staffsdata[q].staffTitle = staffsdata[q].staffName
+													for (let k = 0; k < workflowdata.length; k++) {
+														if (staffsdata[q].staffId == workflowdata[k]
+															.operatorId) {
+															staffsdata[q].status = true
+														}
 													}
 												}
 											}
-										}
-										response.data.data[i].commonStaffs1 = response.data.data[i]
-											.commonStaffs
-									} else {
-										if (response.data.data[i].workflowHistoricTasks && response
-											.data.data[i].workflowHistoricTasks.length > 0) {
-											var len = response.data.data[i].workflowHistoricTasks
-												.length - 1
-											if (response.data.data[i].workflowHistoricTasks[len]
-												.approved) {
-												this.$set(response.data.data[i], 'status',
-													'success')
-											} else {
-												this.$set(response.data.data[i], 'status', 'error')
-											}
-											response.data.data[i].operatorTitle = response.data
-												.data[i].workflowHistoricTasks[len].operatorName
-												.substring(response.data.data[i]
-													.workflowHistoricTasks[0].operatorName.length -
-													2)
-											response.data.data[i].operatorName = response.data
-												.data[i].workflowHistoricTasks[len].operatorName
-											var time = new Date(response.data.data[i]
-													.workflowHistoricTasks[len].claimTime)
-												.getTime()
-											response.data.data[i].updateDate = this.$u.timeFormat(
-												time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind = response.data.data[i]
-												.workflowHistoricTasks[len].auditMind
+											response.data.data[i].commonStaffs1 = response.data.data[i]
+												.commonStaffs
 										} else {
-											this.$set(response.data.data[i], 'status', 'question')
-											// response.data.data[i].status='question'
-											if (response.data.data[i].desc == '总经理助理审核') {
-												response.data.data[i].operatorTitle = '总助'
-											} else if (response.data.data[i].desc == '杜大光审核') {
-												response.data.data[i].operatorTitle = '大光'
-											} else {
+											if (response.data.data[i].workflowHistoricTasks && response
+												.data.data[i].workflowHistoricTasks.length > 0) {
+												var len = response.data.data[i].workflowHistoricTasks
+													.length - 1
+												if (response.data.data[i].workflowHistoricTasks[len]
+													.approved) {
+													this.$set(response.data.data[i], 'status',
+														'success')
+												} else {
+													this.$set(response.data.data[i], 'status', 'error')
+												}
 												response.data.data[i].operatorTitle = response.data
-													.data[i].desc.substring(0, 2)
+													.data[i].workflowHistoricTasks[len].operatorName
+													.substring(response.data.data[i]
+														.workflowHistoricTasks[0].operatorName.length -
+														2)
+												response.data.data[i].operatorName = response.data
+													.data[i].workflowHistoricTasks[len].operatorName
+												var time = new Date(response.data.data[i]
+														.workflowHistoricTasks[len].claimTime)
+													.getTime()
+												response.data.data[i].updateDate = this.$u.timeFormat(
+													time, 'mm.dd hh:MM')
+												response.data.data[i].auditMind = response.data.data[i]
+													.workflowHistoricTasks[len].auditMind
+											} else {
+												this.$set(response.data.data[i], 'status', 'question')
+												// response.data.data[i].status='question'
+												if (response.data.data[i].desc == '总经理助理审核') {
+													response.data.data[i].operatorTitle = '总助'
+												} else if (response.data.data[i].desc == '杜大光审核') {
+													response.data.data[i].operatorTitle = '大光'
+												} else {
+													response.data.data[i].operatorTitle = response.data
+														.data[i].desc.substring(0, 2)
+												}
+												response.data.data[i].operatorName = response.data
+													.data[i].desc
+												var time1 = new Date(response.data.data[i].updateDate)
+													.getTime()
+												response.data.data[i].updateDate = this.$u.timeFormat(
+													time1, 'mm.dd hh:MM')
+												response.data.data[i].auditMind = ''
 											}
-
-											response.data.data[i].operatorName = response.data
-												.data[i].desc
-											var time1 = new Date(response.data.data[i].updateDate)
-												.getTime()
-											response.data.data[i].updateDate = this.$u.timeFormat(
-												time1, 'mm.dd hh:MM')
-											response.data.data[i].auditMind = ''
 										}
 									}
-
-								}
-								console.log(response.data.data)
-								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"
+									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'
+									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'
+									})
 								})
 							})
 						})