前端

common/helper.js

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

config/index.js

@@ -4,12 +4,12 @@ const dev = {
 	// 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.138:8090/',
-	// baseUrlNew: 'http://192.168.110.82:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

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

pageA/product/detail.vue

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

pageA/product/sales_detail.vue

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

pages.json

@@ -1165,6 +1165,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/task/audit/viewDetail",
+			"style": {
+				"navigationBarTitleText": "入库详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/task/audit/warehouse_warrant_detail",
 			"style": {

pages/erp/contactCustomerService/contactCustomerService.vue

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

pages/erp/exWarehousing/exWarehousing.vue

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

pages/erpbusiness/edit_quality_testing.vue

@@ -184,7 +184,7 @@
 				<view class="con-list">
 					<view v-if='flag==4||flag==0' @click='show6=true'>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
 					<view v-else>{{gridList.fleet?ridList.fleet:'非车队车辆'}}</view>
-					<u-picker  @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show5"
+					<u-picker  @confirm='fleetpicker($event)' :range="fleetNameList" range-key="fleetName" v-model="show6"
 						mode="selector">
 					</u-picker>
 				</view>
@@ -311,9 +311,9 @@
 					<view v-else class="title">蛋白</view>
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
-							name="input"></input>
-							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重"
-								name="input"></input>
+							name="input"  @input="obtainPrice"></input>
+							<input  v-if='flag==1||flag==2' type="digit" v-model='gridList.reBulkDensity' placeholder="请输入容重" 
+								name="input"  @input="obtainPrice"></input>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -640,6 +640,21 @@
 			}
 		},
 		methods: {
+			obtainPrice(){//根据容重获取价格
+				if (this.gridList.goodsName && this.cangid && this.gridList.bulkDensity) {
+					// if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
+						this.$api.doRequest('get', '/purchasePrice/tidalGrainPrice', {            
+							warehouseId: this.cangid,
+							goodsName: this.gridList.goodsName,
+							bulkDensity:this.gridList.bulkDensity
+						}).then(res => {
+							if(res.data.data != 0){
+								this.gridList.dryGrainPrice = res.data.data
+							}
+						})
+					// }
+				}
+			},
 			changeprice(){
 				if(this.pricetext=='解锁'){
 					this.pricedisabled=false
@@ -784,6 +799,17 @@
 			},
 			waterContentChange() {
 				var that = this
+				if (this.gridList.goodsName) {
+					for (var i = 0; i < this.purchasePriceList.length; i++) {
+						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
+							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
+							this.gridList.paramType = this.purchasePriceList[i].paramType
+						}
+					}
+				}
+				if(this.gridList.serviceManagementType == 3){ //收购入库 不需在获取价格
+					return
+				}
 				if (this.gridList.goodsName && this.cangid) {
 					if (!this.gridList.dryGrainPrice || this.gridList.dryGrainPrice == 0) {
 						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
@@ -794,14 +820,7 @@
 						})
 					}
 				}
-				if (this.gridList.goodsName) {
-					for (var i = 0; i < this.purchasePriceList.length; i++) {
-						if (this.purchasePriceList[i].goodsName == this.gridList.goodsName) {
-							this.gridList.buckleWeightRatio = this.purchasePriceList[i].deductWeight
-							this.gridList.paramType = this.purchasePriceList[i].paramType
-						}
-					}
-				}
+				
 				var numReg = /^[0-9]*$/
 				var numRe = new RegExp(numReg)
 				//潮粮单价改变事件

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'
+									})
 								})
-							})
+							})	
 						})
 					}
 				})
@@ -660,7 +661,7 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
 										auditMind: that.auditMind,
@@ -738,7 +739,7 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
+						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
 							auditMind: this.auditMind,

pages/task/audit/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/acquisition_settlement_approval.vue

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

pages/task/audit/acquisition_settlement_details.vue

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

pages/task/audit/acquisitioncontract.vue

@@ -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') {
@@ -583,7 +580,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -622,7 +619,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -646,7 +643,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

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]
 							}
 						}
@@ -643,7 +644,7 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -679,7 +680,7 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
@@ -717,7 +718,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -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]
 							}
 						}
@@ -581,7 +584,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",
@@ -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/collection_business_approval.vue

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

pages/task/audit/daichu_details.vue

@@ -269,7 +269,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -308,7 +308,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -332,7 +332,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

pages/task/audit/daishou_details.vue

@@ -246,7 +246,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -285,7 +285,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -309,7 +309,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

pages/task/audit/expense_allocation.vue

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

pages/task/audit/freight_settlement_approval.vue

@@ -445,7 +445,7 @@
 				})
 				let that = this
 				if (this.list) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
 						auditMind: this.auditMind ,

pages/task/audit/leave_approve.vue

@@ -153,7 +153,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -200,7 +200,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

pages/task/audit/purchase_settlement_approval.vue

@@ -203,7 +203,7 @@
 					title: "审核中"
 				})
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,

pages/task/audit/purchasecontract.vue

@@ -444,104 +444,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'
+									})
 								})
 							})
 						})
@@ -567,7 +566,7 @@
 					mask: true
 				});
 				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -606,7 +605,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -630,7 +629,7 @@
 			audit(item, index, status, status2, reason) {
 
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',

pages/task/audit/salecontract.vue

@@ -462,134 +462,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'
+									})
 								})
 							})
 						})
@@ -630,7 +629,7 @@
 					title: '加载中',
 					mask: true
 				});
-				that.$api.doRequest('post', '/workflow/api/handle', {
+				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
 					auditMind: this.auditMind,
@@ -667,7 +666,7 @@
 						title: '加载中',
 						mask: true
 					});
-					that.$api.doRequest('post', '/workflow/api/handle', {
+					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
 						auditMind: this.auditMind,
@@ -692,7 +691,7 @@
 			//审核方法
 			audit(item, index, status, status2, reason) {
 				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
 						auditMind: reason != undefined ? '已驳回' : '34',
@@ -960,17 +959,17 @@
 		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;
@@ -981,7 +980,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -990,27 +989,27 @@
 						bottom: -3px;
 						background: #fff;
 					}
-
+	
 					.status.success {
 						border: 1px solid rgb(60, 156, 255);
 					}
-
+	
 					.status.error {
 						border: 1px solid rgb(245, 108, 108);
 					}
-
+	
 					.status.question {
 						border: 1px solid #f9ae3d;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -1019,33 +1018,33 @@
 					border-radius: 5px;
 					color: #B0B1B5;
 				}
-
+	
 				.right-item {
 					display: flex;
 					justify-content: space-between;
-
+	
 					.time {
 						color: #999;
 					}
-
+	
 					.item2 {
 						margin-left: 20rpx;
 						margin-top: -7px;
-
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
 							margin-bottom: 4px;
 						}
-
+	
 						.status.success {
 							color: #6CC48C;
 						}
-
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
-
+	
 						.status.question {
 							color: #f9ae3d;
 						}
@@ -1053,10 +1052,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -1069,22 +1068,22 @@
 				padding: 0 2px;
 				margin: 0 auto;
 			}
-
+	
 			.status {
 				position: absolute;
 				top: 0;
 				right: 0;
 			}
 		}
-
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

pages/task/audit/supp_clock_approve.vue

@@ -137,7 +137,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
@@ -184,7 +184,7 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
+							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,

pages/task/audit/tradeServices_audit.vue

@@ -283,7 +283,7 @@
 						this.$api.msg('驳回意见不能为空')
 						return
 					}
-					this.$api.doRequest('post', '/workflow/api/handle', {
+					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: false,
 						auditMind: this.auditMind,
@@ -312,7 +312,7 @@
 					   this.$api.doRequest('post', '/tradeWarehouseReceiptAppl/api/editTradeWarehouseReceiptAppl', this.tradeList)
 					   .then(res => {
 						   if(res.data.code == 200){
-							   this.$api.doRequest('post', '/workflow/api/handle', {
+							   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							   	taskId: this.tradeList.taskId,
 							   	approved: true,
 							   	auditMind: this.auditMind ? this.auditMind : "审核通过",
@@ -338,7 +338,7 @@
 						   }
 					   })  
 				   }else{
-					   this.$api.doRequest('post', '/workflow/api/handle', {
+					   this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: true,
 						auditMind: this.auditMind ? this.auditMind : "审核通过",

pages/task/audit/viewDetail.vue

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

pages/task/audit/warehouse_approval.vue

@@ -42,7 +42,7 @@
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class="form_view" style="background: #F9F9FA;">
+			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
 					<td>容重(g/L)</td>
@@ -370,7 +370,7 @@
 							// that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
 							// 	.then(res => {
 							// 		if (res.data.code == 200) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
+										that.$api.doRequest('post', '/newWorkflow/api/handle', {
 											approved: true,
 											auditMind: that.rejectInfo1,
 											needReapply: true,
@@ -411,7 +411,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.list.taskId,
 									approved: false,
 									auditMind: that.rejectInfo,
@@ -663,14 +663,14 @@
 				.item1{
 					position:relative;
 					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
 					.status{
 						position:absolute;
@@ -713,6 +713,7 @@
 					}
 					.item2 {
 						margin-left: 20rpx;
+						margin-top: -7px;
 						
 						.name {
 							font-size: 28rpx;

pages/task/audit/warehouse_warrant.vue

@@ -61,7 +61,7 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList" @click="detailed">
 				<view class='flex align-center justify-between'>
 					<view class="name">
 						{{item.customer}}
@@ -108,7 +108,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -248,6 +248,12 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			detailed(){
+				let obj = JSON.stringify(this.auditInfo.warehousingOrderList)
+					uni.navigateTo({
+						url: '/pages/task/audit/viewDetail?data='+obj
+					});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -331,7 +337,8 @@
 				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
 					searchType: 1,
-					batchId: this.id
+					batchId: this.id,
+					compId: uni.getStorageSync('pcUserInfo').compId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
@@ -503,7 +510,7 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
+									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
 										auditMind: that.auditMind ? that.auditMind : "",
@@ -538,7 +545,7 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// 	var tmp = 0
-								that.$api.doRequest('post', '/workflow/api/handle', {
+								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
 									auditMind: that.auditMind ? that.auditMind : "",
@@ -575,7 +582,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

pages/task/audit/warehouse_warrant_detail.vue

@@ -108,7 +108,7 @@
 			</view>
 			<view class="file" @click="openXls2">
 				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
-				<text class="text_css">车辆指标.xls</text>
+				<text class="text_css">粮食指标.xls</text>
 			</view>
 		</view>
 		<view class="content2">
@@ -501,7 +501,7 @@
 			// 			})
 			// 		} else {
 			// 			for (var i = 0; i < this.List.length; i++) {
-			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 				this.$api.doRequest('post', '/newWorkflow/api/handle', {
 			// 					taskId: this.List[i].taskId,
 			// 					approved: status,
 			// 					auditMind: this.auditMind ? this.auditMind : "",

pages/task/procurement_close_details.vue

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

pages/task/procurement_details.vue

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

pages/task/procurement_report_details.vue

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

pages/task/sale_close_details.vue

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

pages/task/sale_details.vue

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

pages/task/sale_report_details.vue

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

pages/user/user.vue

@@ -34,7 +34,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="cover-container">
+		<view v-if="hasLogin && compName" class="cover-container">
 			<view class='cover-container-item'>
 				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
 				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">