更新

config/componentConfig.js

@@ -29,39 +29,51 @@ export default {
 		/****************以下是示例*******************/
 		// 可以用自己项目的请求方法（接口自己找后台要，插件不提供
 		const baseUrlNew = config.def().baseUrlNew
-		uni.request({
-			url: baseUrlNew + '/appVersion/selectInfo',
-			data: {
-				appid: plus.runtime.appid,
-				version: plus.runtime.version,
-				imei: "1",
-			},
-			method: 'GET',
-			success: (res) => {
-				console.log(res.data)
-				if (res.data.data && res.data.data.wgtUrl) {
-					res.data.data.versionName = res.data.data.version
-					res.data.data.versionInfo = res.data.data.note
-					res.data.data.downloadUrl = res.data.data.wgtUrl
-					// 兼容之前的版本（updateType是新版才有的参数）
-					if (res.data.data.updateType) {
-						callback && callback(res.data.data);
-					} else {
-						if (res.forceUpdate) {
-							res.updateType = "forcibly";
-						} else {
-							res.updateType = "solicit";
-						}
-						callback && callback(res.data.data);
-					}
-				} else if (isPrompt) {
-					uni.showToast({
-						title: "暂无新版本",
-						icon: "none"
-					});
-				}
-			}
-		})
+		// #ifdef APP-PLUS
+			plus.runtime.getProperty(plus.runtime.appid, (info) => {
+						//版本号
+						
+						uni.request({
+							url: baseUrlNew + '/appVersion/selectInfo',
+							data: {
+								appid: plus.runtime.appid,
+								version: info.version,
+								imei: "1",
+							},
+							method: 'GET',
+							success: (res) => {
+								console.log(res.data)
+								if (res.data.data && res.data.data.wgtUrl) {
+									res.data.data.versionName = res.data.data.version
+									res.data.data.versionInfo = res.data.data.note
+									res.data.data.downloadUrl = res.data.data.wgtUrl
+									// 兼容之前的版本（updateType是新版才有的参数）
+									if (res.data.data.updateType) {
+										callback && callback(res.data.data);
+									} else {
+										if (res.forceUpdate) {
+											res.updateType = "forcibly";
+										} else {
+											res.updateType = "solicit";
+										}
+										callback && callback(res.data.data);
+									}
+								} else if (isPrompt) {
+									uni.showToast({
+										title: "暂无新版本",
+										icon: "none"
+									});
+								}
+							}
+						})
+					})
+		
+		// #endif
+		
+		
+		
+		
+		
 		//      $http.get("api/common/v1/app_version", httpData,{
 		//          isPrompt: isPrompt
 		//      }).then(res => {

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -14,8 +14,12 @@
 							v-else-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'||EnterList.taskStatus == '待审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText" v-if="OutList.taskStatus">{{OutList.approveStatus?OutList.approveStatus:OutList.taskStatus}}</view>
-					<view class="infoText" v-else>{{EnterList.approveStatus?EnterList.approveStatus:EnterList.taskStatus}}</view>
+					<view class="infoText" v-if="OutList.taskStatus">
+						{{OutList.approveStatus?OutList.approveStatus:OutList.taskStatus}}
+					</view>
+					<view class="infoText" v-else>
+						{{EnterList.approveStatus?EnterList.approveStatus:EnterList.taskStatus}}
+					</view>
 				</view>
 				<view class="infoData" v-if="OutList.updateDate">{{OutList.updateDate}}</view>
 				<view class="infoData" v-else>{{EnterList.updateDate}}</view>
@@ -25,7 +29,8 @@
 			<u-form :model="OutList" ref="uForm">
 				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
 					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
-					<u-input v-model="retreatList.inOutType" input-align="right" disabled v-else-if="retreatList.inOutType" />
+					<u-input v-model="retreatList.inOutType" input-align="right" disabled
+						v-else-if="retreatList.inOutType" />
 					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
 				<view v-if="retreatList.judge == 3">
@@ -36,8 +41,8 @@
 							<view class="left">编号</view>
 							<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
 						</view>
-						
-						
+
+
 						<view class='row'>
 							<view class="left">仓库</view>
 							<view class="right">{{retreatList.warehouseName}}</view>
@@ -160,7 +165,8 @@
 							v-if="retreatList.inOutType != '退库'">
 							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
 						</u-form-item>
-						<u-form-item v-if='!retreatList.status&&retreatList.inOutType != "退库"' label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-form-item v-if='!retreatList.status&&retreatList.inOutType != "退库"' label="单价(元/吨)"
+							prop="unitPrice" label-width="160">
 							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
@@ -237,7 +243,8 @@
 							v-if="EnterList.inOutType != '移库入库'">
 							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
 						</u-form-item>
-						<u-form-item v-if='!EnterList.status&&EnterList.inOutType != "移库入库"' label="单价(元/吨)" prop="unitPrice" label-width="160">
+						<u-form-item v-if='!EnterList.status&&EnterList.inOutType != "移库入库"' label="单价(元/吨)"
+							prop="unitPrice" label-width="160">
 							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
@@ -255,17 +262,17 @@
 						流程
 					</view>
 					<view v-for="(item,index) in auditList" :key='index' class="audit">
-						<view class="row"  v-if='item.desc!="_PLACEHOLDER_"'>
+						<view class="row" v-if='item.desc!="_PLACEHOLDER_"'>
 							<view class="left">
 								<view class="item1">
-									<view class="item-content">{{item.operatorTitle}}</view> 
+									<view class="item-content">{{item.operatorTitle}}</view>
 									<view v-if="item.status=='success'" class='status success'>
 										<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 									</view>
 									<view v-if="item.status=='error'" class='status error'>
 										<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 									</view>
-									<view  v-if="item.status=='question'" class='status question'>
+									<view v-if="item.status=='question'" class='status question'>
 										<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 									</view>
 								</view>
@@ -276,22 +283,40 @@
 										<view class="name">{{item.desc}}
 										</view>
 										<!-- <view class='time'>{{item.updateDate}}</view> -->
-										<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
-										<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
-										<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+										<view v-if="item.status=='success'" class="status success">
+											{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+												v-if='!item.commonStaffs1&&index!=0'>已审核</text>
+										</view>
+										<view v-if="item.status=='error'" class="status error">
+											{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text
+												v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text>
+										</view>
+										<view v-if="item.status=='question'" class="status question">
+											{{item.commonStaffs1?item.staffscontent:''}}<text
+												v-if='!item.commonStaffs1'>未审核</text>
+										</view>
 										<!-- <view  class="status success">吕波（已审核）</view> -->
-										
+
 									</view>
-									<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
-									{{item.updateDate}}
+									<view
+										v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
+										class='time'>
+										{{item.updateDate}}
 									</view>
 								</view>
 								<view v-if='item.auditMind' class="right-content">
 									{{item.auditMind}}
 								</view>
+								<view class="flex audit_img">
+									<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+										<image :src="items" mode="" class="url_img" @click="openDocument(items)">
+										</image>
+									</view>
+								</view>
 							</view>
 							<view v-if='item.commonStaffs1' class="right">
-								<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+								<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"
+									size="28"></u-icon>
 							</view>
 						</view>
 						<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
@@ -300,12 +325,13 @@
 									<view class="item-content">
 										<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
 										<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
-									</view> 
-									<view class="name">{{item1.staffName}}</view> 
+									</view>
+									<view class="name">{{item1.staffName}}</view>
 								</view>
 							</view>
 						</view>
-						<view class="row-line" :style='[{"height":item.auditMind?"80px":"40px"}]' v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
+						<view class="row-line" :style='[{"height":item.auditMind?"80px":"40px"}]'
+							v-if="index!= auditList.length - 1&&item.desc!='_PLACEHOLDER_'"></view>
 					</view>
 				</view>
 			</u-form>
@@ -322,9 +348,15 @@
 					<view class="right-bottom">
 						{{auditMind.length}}/1000个字
 					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="250"
 						maxlength="1000" />
 				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
@@ -340,10 +372,14 @@
 
 <script>
 	import helper from '@/common/helper.js';
+	import upload from '@/components/upload.vue';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
+		components: {
+			upload,
+		},
 		data() {
 			return {
 				everyCheck: '',
@@ -357,8 +393,8 @@
 				type: '移库',
 				show: false,
 				show1: false,
-				auditList:[],
-				list:{},
+				auditList: [],
+				list: {},
 				auditMind: '',
 				pjList: [{
 						type: '一等品'
@@ -373,88 +409,140 @@
 						type: '等外'
 					}
 				],
-				count:0,
+				count: 0,
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		// onReady() {
 		// 	this.$refs.uForm.setRules(this.rules);
 		// },
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
 			this.everyCheck = uni.getStorageSync("everyTask")
-			this.count=0
+			this.count = 0
 			this.getList()
 		},
 		onShow() {
-			
+
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			showcontent(item){
-				item.showflow=!item.showflow
+			openDocument(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
+			showcontent(item) {
+				item.showflow = !item.showflow
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
 			},
 			getList() {
-				var that =this
+				var that = this
 				uni.showLoading({
-					title:'加载中',
-					mask:true,
+					title: '加载中',
+					mask: true,
 				})
 				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.list=res.data.data
+						this.list = res.data.data
 						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
 							relevanceId: res.data.data.relevanceId
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-									compId:uni.getStorageSync('pcUserInfo').compId
+									compId: uni.getStorageSync('pcUserInfo').compId
 								}).then(res1 => {
-								for (let i = 0; i < res.data.data.length; i++) {
-									if (res.data.data[i].inOutType == "移库出库" || res.data.data[i]
-										.inOutType == "贸易服务出库" || res.data.data[i].inOutType == "销售出库" ||
-										res.data.data[i].inOutType == "暂存出库") {
-										this.OutList = res.data.data[i]
-										this.OutList.judge = 1
-									} else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
-										.inOutType == "暂存入库" || res.data.data[i]
-										.inOutType == "收购入库"|| res
-										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
-										"贸易服务入库") {
-										this.EnterList = res.data.data[i]
-										this.EnterList.judge = 2
-									} else if (res.data.data[i].inOutType == "退库") {
-										this.retreatList = res.data.data[i]
-										this.retreatList.judge = 3
-									}
-								}
-								for(let i = 0; i < res1.data.data.length; i++) {
-									if(res1.data.data[i].contractNo==this.EnterList.contractNo){
-										if(res1.data.data[i].priceType=='随行就市'){
-											this.EnterList.status=true
-										}else{
-											this.EnterList.status=false
+									for (let i = 0; i < res.data.data.length; i++) {
+										if (res.data.data[i].inOutType == "移库出库" || res.data.data[
+												i]
+											.inOutType == "贸易服务出库" || res.data.data[i].inOutType ==
+											"销售出库" ||
+											res.data.data[i].inOutType == "暂存出库") {
+											this.OutList = res.data.data[i]
+											this.OutList.judge = 1
+										} else if (res.data.data[i].inOutType == "移库入库" || res.data
+											.data[i]
+											.inOutType == "暂存入库" || res.data.data[i]
+											.inOutType == "收购入库" || res
+											.data.data[i].inOutType == "采购入库" || res.data.data[i]
+											.inOutType ==
+											"贸易服务入库") {
+											this.EnterList = res.data.data[i]
+											this.EnterList.judge = 2
+										} else if (res.data.data[i].inOutType == "退库") {
+											this.retreatList = res.data.data[i]
+											this.retreatList.judge = 3
 										}
 									}
-									if(res1.data.data[i].contractNo==this.retreatList.contractNo){
-										if(res1.data.data[i].priceType=='随行就市'){
-											this.retreatList.status=true
-										}else{
-											this.retreatList.status=false
+									for (let i = 0; i < res1.data.data.length; i++) {
+										if (res1.data.data[i].contractNo == this.EnterList
+											.contractNo) {
+											if (res1.data.data[i].priceType == '随行就市') {
+												this.EnterList.status = true
+											} else {
+												this.EnterList.status = false
+											}
+										}
+										if (res1.data.data[i].contractNo == this.retreatList
+											.contractNo) {
+											if (res1.data.data[i].priceType == '随行就市') {
+												this.retreatList.status = true
+											} else {
+												this.retreatList.status = false
+											}
 										}
 									}
-								}
 								})
 							}
 							//审核流程
@@ -465,89 +553,149 @@
 								this.$api.doRequest('get', '/commonUser/getHis', {
 									workflowId: res1.data.data[0].id,
 									businessKey: this.id,
-									branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
+									branch: that.list.jointVentureParties ? that.list
+										.jointVentureParties : 'zt'
 								}).then(response => {
 									uni.hideLoading()
 									for (let i = 0; i < response.data.data.length; i++) {
-										this.$set(response.data.data[i],'status','question')
-										console.log(response.data.data[i].workflowHistoricTasks,i)
-										if(response.data.data[i].commonStaffs){
-											response.data.data[i].showflow=false
-											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
-											response.data.data[i].operatorName=response.data.data[i].desc
-											response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-											if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-												if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+										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')
+													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].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')
+											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')
+												// 显示附件和审核意见
+												if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+													response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+													response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
 												}else{
-													this.$set(response.data.data[i],'status','error')
+													response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind
 												}
-												response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
-												response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
-												var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
-												response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
-												response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
-											}else{
-												this.$set(response.data.data[i],'status','question')
+											} 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)
+												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')
+									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'
+										operatorTitle: this.list.creater.substring(
+											0, 2),
+										operatorName: this.list.creater,
+										updateDate: time3,
+										auditMind: '',
+										desc: '发起申请',
+										showflow: false,
+										commonStaffs1: null,
+										commonStaffs: null,
+										workflowHistoricTasks: [],
+										status: 'success'
 									})
 								})
-							})	
+							})
 						})
 					}
 				})
@@ -568,7 +716,6 @@
 				this.title = '审核意见（通过）'
 			},
 			reject() {
-
 				this.show1 = true
 				this.title = '驳回原因（驳回）'
 			},
@@ -671,10 +818,14 @@
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
+									var info = that.auditMind
+									if (that.fileUrl.length > 0) {
+										info = that.auditMind + "##" + that.fileUrl.toString()
+									}
 									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: list.taskId,
 										approved: true,
-										auditMind: that.auditMind,
+										auditMind: info ? info : "",
 										needReapply: false
 									}).then(res => {
 										if (res.data.code == 200) {
@@ -682,24 +833,24 @@
 											that.count++
 											if (that.everyCheck) {
 												helper.setAudit(that.list)
-											} 
+											}
 										} else {
 											that.$api.msg('审核失败！')
 										}
-										if(list.taskTypeKey == '3' || list.taskTypeKey == '4'){
-											if(that.count == 2){
+										if (list.taskTypeKey == '3' || list.taskTypeKey == '4') {
+											if (that.count == 2) {
 												setTimeout(function() {
 													uni.hideLoading()
 													uni.navigateBack()
 												}, 1000);
 											}
-										}else{
+										} else {
 											setTimeout(function() {
-											uni.hideLoading()
-											uni.navigateBack()
-										}, 1000);
+												uni.hideLoading()
+												uni.navigateBack()
+											}, 1000);
 										}
-										
+
 									}).catch(res => {
 										uni.hideLoading()
 										if (res.message) {
@@ -742,6 +893,7 @@
 
 			},
 			requestaudit(list, status) {
+
 				uni.showLoading({
 					title: "审核中"
 				})
@@ -749,36 +901,40 @@
 				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
+						var info = this.auditMind
+						if (this.fileUrl.length > 0) {
+							info = this.auditMind + "##" + this.fileUrl.toString()
+						}
 						this.$api.doRequest('post', '/newWorkflow/api/handle', {
 							taskId: list.taskId,
 							approved: false,
-							auditMind: this.auditMind,
+							auditMind: info ? info : "",
 							needReapply: true
 						}).then(res => {
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
-									this.count++
-									if (this.everyCheck) {
-										helper.setAudit(this.list)
-									} 
-									uni.hideLoading()
-									if(list.taskTypeKey == '3' || list.taskTypeKey == '4'){
-										if(this.count == 2){
-											setTimeout(function() {
-												uni.hideLoading()
-												uni.navigateBack()
-											}, 1000);
-										}
-									}else{
+								this.count++
+								if (this.everyCheck) {
+									helper.setAudit(this.list)
+								}
+								uni.hideLoading()
+								if (list.taskTypeKey == '3' || list.taskTypeKey == '4') {
+									if (this.count == 2) {
 										setTimeout(function() {
+											uni.hideLoading()
+											uni.navigateBack()
+										}, 1000);
+									}
+								} else {
+									setTimeout(function() {
 										uni.hideLoading()
 										uni.navigateBack()
-									   }, 1000);
-									}
-							}else{
+									}, 1000);
+								}
+							} else {
 								this.$api.msg('驳回失败！')
 							}
-							
+
 						})
 					}
 				})
@@ -1128,7 +1284,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 820rpx;
 			border-radius: 20rpx;
 
 			.alert-top {
@@ -1149,6 +1305,10 @@
 				position: absolute;
 				right: 33rpx;
 			}
+
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 
@@ -1182,6 +1342,7 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
+		overflow-y: scroll;
 
 		.right-bottom {
 			position: absolute;
@@ -1194,22 +1355,23 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+
 	.content2 {
 		background: white;
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-	
+
 		.row {
 			display: flex;
-	
+
 			.left {
 				display: flex;
 				align-items: center;
-	
+
 				.item1 {
 					position: relative;
-	
+
 					.item-content {
 						background: #617AE0;
 						width: 44px;
@@ -1220,7 +1382,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-	
+
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -1229,27 +1391,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;
@@ -1258,44 +1420,62 @@
 					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;
 						}
 					}
 				}
+
+				.audit_img {
+					flex-wrap: wrap;
+
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
-	
+
 		.row2 {
 			display: flex;
-	
+
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -1308,22 +1488,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/Issueandreceipt_task_details.vue

@@ -284,6 +284,12 @@
 								<view v-if='item.auditMind' class="right-content">
 									{{item.auditMind}}
 								</view>
+								<view v-if='item.fileUrl' class="flex audit_img">
+									<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+										<image :src="items" mode="" class="url_img" @click="openDocument(items)">
+										</image>
+									</view>
+								</view>
 							</view>
 							<view v-if='item.commonStaffs1' class="right">
 								<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
@@ -356,6 +362,21 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			openDocument(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -446,7 +467,20 @@
 												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
+												if (response.data.data[i]
+													.workflowHistoricTasks[len].auditMind
+												) {
+													response.data.data[i].auditMind =
+														response.data.data[i]
+														.workflowHistoricTasks[len]
+														.auditMind.split("##")[0]
+													response.data.data[i].fileUrl =
+														response.data.data[i]
+														.workflowHistoricTasks[len]
+														.auditMind.split("##")[1].split(
+															",")
+												}
+												// 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'
@@ -737,6 +771,20 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}	
 			}
 		}
 	

pages/task/audit/acquisitioncontract.vue

@@ -270,6 +270,12 @@
 							<view v-if='item.auditMind' class="right-content">
 								{{item.auditMind}}
 							</view>
+							<view class="flex audit_img">
+								<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+									<image :src="items" mode="" class="url_img" @click="auditFile(items)">
+									</image>
+								</view>
+							</view>
 						</view>
 						<view v-if='item.commonStaffs1' class="right">
 							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
@@ -313,6 +319,12 @@
 						maxlength="100" /> -->
 						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
 				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
@@ -356,6 +368,11 @@
 				url: "",
 				everyCheck: '',
 				auditCheck:"question",//判断审核是否通过
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		onBackPress(e) {
@@ -375,6 +392,35 @@
 			this.getList()
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
 			openDocument(src) {
 				uni.downloadFile({
 					url: src.appendixPath,
@@ -504,8 +550,15 @@
 												.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].auditMind = response.data.data[i]
+												// 	.workflowHistoricTasks[len].auditMind
+													// 显示附件和审核意见
+													if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+														response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+														response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+													}else{
+														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'
@@ -576,15 +629,19 @@
 			},
 			//驳回
 			rejectSubmit() {
+				var that = this
 				uni.showLoading({
 					title: '加载中',
 					mask: true
 				});
-				var that = this
+				var info = that.auditMind
+				if (that.fileUrl.length > 0) {
+					info = that.auditMind + "##" + that.fileUrl.toString()
+				}
 				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
-					auditMind: this.auditMind,
+					auditMind: info?info:"",
 					needReapply: true,
 				}).then(res => {
 					that.$api.msg('驳回成功')
@@ -601,6 +658,7 @@
 			},
 			close() {
 				this.show = false
+				this.fileUrl = []//清除审核附件
 			},
 			pass() {
 				this.show = true
@@ -620,10 +678,14 @@
 						title: '加载中',
 						mask: true
 					});
+					var info = that.auditMind
+					if (that.fileUrl.length > 0) {
+						info = that.auditMind + "##" + that.fileUrl.toString()
+					}
 					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
-						auditMind: this.auditMind,
+						auditMind: info?info:"",
 						needReapply: true,
 					}).then(res => {
 						that.$api.msg('通过成功')
@@ -818,7 +880,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 820rpx;
 			border-radius: 20rpx;
 
 			.alert-top {
@@ -839,6 +901,9 @@
 				position: absolute;
 				right: 33rpx;
 			}
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 
@@ -889,7 +954,8 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-		height:240px;
+		height:280rpx;
+		overflow: scroll;
 		/deep/.uni-textarea-textarea{
 			width: 80%;
 		}
@@ -997,6 +1063,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin: 0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	

pages/task/audit/charge_against_revenue.vue

@@ -231,6 +231,11 @@
 						<view v-if='item.auditMind' class="right-content">
 							{{item.auditMind}}
 						</view>
+						<view class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
 						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
@@ -263,9 +268,15 @@
 					<view class="right-bottom">
 						{{auditMind.length}}/1000个字
 					</view>
-					<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+					<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="250"
 						maxlength="1000" />
 				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
@@ -280,10 +291,14 @@
 
 <script>
 	import helper from '@/common/helper.js';
+	import upload from '@/components/upload.vue';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
+		components: {
+			upload,
+		},
 		data() {
 			return {
 				src: '../../../static/img/myimg/LiangShang@2x.png',
@@ -309,7 +324,12 @@
 				auditList: [],
 				url: "11",
 				imglist: [],
-				imglist2: []
+				imglist2: [],
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		onBackPress(e) {
@@ -353,6 +373,35 @@
 			}
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
 			openDocument(src) {
 				console.log(src)
 				uni.downloadFile({
@@ -561,8 +610,15 @@
 												.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].auditMind = response.data.data[i]
+											// 	.workflowHistoricTasks[len].auditMind
+											// 显示附件和审核意见
+											if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+												response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+												response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+											}else{
+												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'
@@ -624,6 +680,7 @@
 			},
 			close() {
 				this.show = false
+				this.fileUrl = []
 			},
 			pass() {
 				this.show = true
@@ -675,10 +732,14 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
+										var info = that.auditMind
+										if (that.fileUrl.length > 0) {
+											info = that.auditMind + "##" + that.fileUrl.toString()
+										}
 									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
-										auditMind: that.auditMind ? that.auditMind : "",
+										auditMind: info ? info : "",
 										needReapply: true
 									}).then(res => {
 										// count++
@@ -711,10 +772,14 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// var tmp = 0
+								var info = that.auditMind
+								if (that.fileUrl.length > 0) {
+									info = that.auditMind + "##" + that.fileUrl.toString()
+								}
 								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
-									auditMind: that.auditMind ? that.auditMind : "",
+									auditMind: info ? info : "",
 									needReapply: false
 								}).then(res => {
 									// tmp++
@@ -969,6 +1034,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin:0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	
@@ -1083,8 +1165,9 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 840rpx;
 			border-radius: 20rpx;
+			// overflow: scroll;
 
 			.alert-top {
 				padding: 33rpx;
@@ -1104,6 +1187,9 @@
 				position: absolute;
 				right: 33rpx;
 			}
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 

pages/task/audit/charge_against_revenue_detail.vue

@@ -224,6 +224,11 @@
 						<view v-if='item.auditMind' class="right-content">
 							{{item.auditMind}}
 						</view>
+						<view class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
 						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
@@ -324,6 +329,21 @@
 			}
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			previewImageFn(index) {
 				/* 预览图片 */
 				uni.previewImage({
@@ -506,7 +526,14 @@
 										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].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										// 显示附件和审核意见
+										if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+											response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+											response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+										}else{
+											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'
@@ -835,6 +862,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin:0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	

pages/task/audit/purchasecontract.vue

@@ -293,6 +293,11 @@
 							<view v-if='item.auditMind' class="right-content">
 								{{item.auditMind}}
 							</view>
+							<view class="flex audit_img">
+								<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+									<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+								</view>
+							</view>
 						</view>
 						<view v-if='item.commonStaffs1' class="right">
 							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
@@ -335,6 +340,12 @@
 					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="300" /> -->
 				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
@@ -376,6 +387,11 @@
 				url: "",
 				everyCheck: '',
 				auditCheck:"question",//判断审核是否通过
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		onBackPress(e) {
@@ -394,6 +410,35 @@
 
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
 			shadeshow(url) {
 				this.imgShow = true
 				this.url = url
@@ -497,7 +542,13 @@
 												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].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+												if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+													response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+													response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+												}else{
+													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'
@@ -562,15 +613,19 @@
 			},
 			//驳回
 			rejectSubmit() {
+				var that = this
 				uni.showLoading({
 					title: '加载中',
 					mask: true
 				});
-				var that = this
+				var info = that.auditMind
+				if (that.fileUrl.length > 0) {
+					info = that.auditMind + "##" + that.fileUrl.toString()
+				}
 				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
-					auditMind: this.auditMind,
+					auditMind: info?info:"",
 					needReapply: true,
 				}).then(res => {
 					that.$api.msg('驳回成功')
@@ -587,6 +642,7 @@
 			},
 			close() {
 				this.show = false
+				this.fileUrl = []//清除审核附件
 			},
 			pass() {
 				this.show = true
@@ -606,10 +662,14 @@
 						title: '加载中',
 						mask: true
 					});
+					var info = that.auditMind
+					if (that.fileUrl.length > 0) {
+						info = that.auditMind + "##" + that.fileUrl.toString()
+					}
 					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
-						auditMind: this.auditMind,
+						auditMind: info?info:"",
 						needReapply: true,
 					}).then(res => {
 						that.$api.msg('通过成功')
@@ -804,7 +864,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 820rpx;
 			border-radius: 20rpx;
 
 			.alert-top {
@@ -825,6 +885,9 @@
 				position: absolute;
 				right: 33rpx;
 			}
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 
@@ -877,7 +940,8 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-		height:240px;
+		height:280rpx;
+		overflow: scroll;
 		/deep/.uni-textarea-textarea{
 			width: 80%;
 		}
@@ -984,6 +1048,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin: 0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	

pages/task/audit/salecontract.vue

@@ -299,7 +299,6 @@
 										v-if='!item.commonStaffs1'>未审核</text>
 								</view>
 								<!-- <view  class="status success">吕波（已审核）</view> -->
-			
 							</view>
 							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
 								class='time'>
@@ -309,6 +308,11 @@
 						<view v-if='item.auditMind' class="right-content">
 							{{item.auditMind}}
 						</view>
+						<view class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
 						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'" size="28">
@@ -350,7 +354,12 @@
 						{{auditMind.length}}/1000个字
 					</view>
 					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
-		
+				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -398,6 +407,11 @@
 				rejectInfo1: "",
 				isSHowBtn: true,
 				auditCheck:"question",//判断审核是否通过
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		onBackPress(e) {
@@ -415,6 +429,35 @@
 			this.getList()
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
 			openDocument(src) {
 				uni.downloadFile({
 					url: src.appendixPath,
@@ -541,8 +584,15 @@
 													.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].auditMind = response.data.data[i]
+												// 	.workflowHistoricTasks[len].auditMind
+												// 显示附件和审核意见
+												if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+													response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+													response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+												}else{
+													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'
@@ -615,6 +665,7 @@
 			},
 			close() {
 				this.show = false
+				this.fileUrl = []//清除审核附件
 			},
 			pass() {
 				this.show = true
@@ -631,10 +682,14 @@
 					title: '加载中',
 					mask: true
 				});
+				var info = that.auditMind
+				if (that.fileUrl.length > 0) {
+					info = that.auditMind + "##" + that.fileUrl.toString()
+				}
 				that.$api.doRequest('post', '/newWorkflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: false,
-					auditMind: this.auditMind,
+					auditMind: info?info:"",
 					needReapply: true,
 				}).then(res => {
 					that.$api.msg('驳回成功')
@@ -668,10 +723,14 @@
 						title: '加载中',
 						mask: true
 					});
+					var info = that.auditMind
+					if (that.fileUrl.length > 0) {
+						info = that.auditMind + "##" + that.fileUrl.toString()
+					}
 					that.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
-						auditMind: this.auditMind,
+						auditMind: info?info:"",
 						needReapply: true,
 					}).then(res => {
 						that.$api.msg('通过成功')
@@ -867,7 +926,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 820rpx;
 			border-radius: 20rpx;
 
 			.alert-top {
@@ -888,6 +947,9 @@
 				position: absolute;
 				right: 33rpx;
 			}
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 
@@ -939,8 +1001,8 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-
-		height:240px;
+		height:280rpx;
+		overflow: scroll;
 		/deep/.uni-textarea-textarea{
 			width: 80%;
 		}
@@ -1052,6 +1114,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin: 0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	

pages/task/audit/warehouse_warrant.vue

@@ -164,6 +164,11 @@
 						<view v-if='item.auditMind' class="right-content">
 							{{item.auditMind}}
 						</view>
+						<view class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
 						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
@@ -195,9 +200,15 @@
 					<view class="right-bottom">
 						{{auditMind.length}}/1000个字
 					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="250"
 						maxlength="1000" />
 				</view>
+				<view class="upload_css">
+					上传附件
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="2"
+						:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
@@ -212,10 +223,14 @@
 
 <script>
 	import helper from '@/common/helper.js';
+	import upload from '@/components/upload.vue';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
+		components: {
+			upload
+		},
 		data() {
 			return {
 				src: '../../../static/img/myimg/LiangShang@2x.png',
@@ -238,7 +253,12 @@
 				id: "",
 				auditList: [],
 				url: "11",
-				url2:""
+				url2:"",
+				// 上传附件、
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
+				fileUrl: []
 			}
 		},
 		onBackPress(e) {
@@ -262,6 +282,35 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
+			getImgUrl(res) {
+				this.fileUrl.push(res)
+			},
+			onError(error) {
+				alert(error)
+				console.log('------------error-----------')
+				console.log(error)
+			},
+			onProgress(e) {
+				console.log(e)
+			},
+			onRemove(index) {
+				this.fileUrl.splice(index, 1)
+			},
 			detailed(data,status){
 				let obj
 				if(status==1){
@@ -453,7 +502,14 @@
 											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].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+											// 显示附件和审核意见
+											if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+												response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+												response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+											}else{
+												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'
@@ -505,12 +561,12 @@
 					}).then(response => {
 						// uni.hideLoading()
 						this.auditList = response.data.data
-
 					})
 				})
 			},
 			close() {
 				this.show = false
+				this.fileUrl = []//清除附件
 			},
 			pass() {
 				this.show = true
@@ -562,10 +618,14 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
+										var info = that.auditMind
+										if (that.fileUrl.length > 0) {
+											info = that.auditMind + "##" + that.fileUrl.toString()
+										}
 									that.$api.doRequest('post', '/newWorkflow/api/handle', {
 										taskId: that.auditInfo.taskId,
 										approved: false,
-										auditMind: that.auditMind ? that.auditMind : "",
+										auditMind: info?info:"",
 										needReapply: true
 									}).then(res => {
 										// count++
@@ -597,10 +657,14 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// 	var tmp = 0
+								var info = that.auditMind
+								if (that.fileUrl.length > 0) {
+									info = that.auditMind + "##" + that.fileUrl.toString()
+								}
 								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.auditInfo.taskId,
 									approved: true,
-									auditMind: that.auditMind ? that.auditMind : "",
+									auditMind: info?info:"",
 									needReapply: false
 								}).then(res => {
 									// tmp++
@@ -852,6 +916,23 @@
 						.status.question {
 							color: #f9ae3d;
 						}
+					}	
+				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin: 0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
 					}
 				}
 			}
@@ -969,7 +1050,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 700rpx;
+			height: 840rpx;
 			border-radius: 20rpx;
 
 			.alert-top {
@@ -990,6 +1071,9 @@
 				position: absolute;
 				right: 33rpx;
 			}
+			.upload_css {
+				margin-left: 20rpx;
+			}
 		}
 	}
 

pages/task/audit/warehouse_warrant_detail.vue

@@ -164,6 +164,11 @@
 						<view v-if='item.auditMind' class="right-content">
 							{{item.auditMind}}
 						</view>
+						<view class="flex audit_img">
+							<view v-for="(items,indexs) in item.fileUrl" class="url_css">
+								<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+							</view>
+						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
 						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
@@ -261,6 +266,21 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			auditFile(src) {
+				uni.downloadFile({
+					url: src,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			detailed(data,status){
 				let obj
 				if(status==1){
@@ -451,7 +471,14 @@
 											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].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										    // 显示附件和审核意见
+										    if (response.data.data[i].workflowHistoricTasks[len].auditMind && response.data.data[i].workflowHistoricTasks[len].auditMind.indexOf("##") !=-1) {
+										    	response.data.data[i].auditMind = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[0]
+										    	response.data.data[i].fileUrl = response.data.data[i].workflowHistoricTasks[len].auditMind.split("##")[1].split(",")
+										    }else{
+										    	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'
@@ -779,6 +806,23 @@
 						}
 					}
 				}
+				.audit_img {
+					flex-wrap: wrap;
+					margin: 0 20rpx;
+				
+					.url_css {
+						border: 1px solid #999999;
+						border-radius: 10px;
+						margin-top: 10px;
+						margin-right: 10px;
+				
+						.url_img {
+							width: 80px;
+							height: 80px;
+							border-radius: 10px;
+						}
+					}
+				}
 			}
 		}
 	

pages/user/setUp.vue

@@ -118,9 +118,12 @@
 		onShow() {
 			this.getList()
 			// #ifdef APP-PLUS
-			this.version = plus.runtime.version
-			console.log("当前版本为：", plus.runtime.version)
-			this.checkVersion()
+			plus.runtime.getProperty(plus.runtime.appid, (info) => {
+				//版本号
+				this.version = info.version;
+				console.log("当前版本为：", this.version)
+				this.checkVersion()
+			})
 			// #endif
 		},
 		onLoad() {},
@@ -140,14 +143,15 @@
 					url: baseUrlNew + '/appVersion/selectInfo',
 					data: {
 						appid: plus.runtime.appid,
-						version: plus.runtime.version,
+						version: this.version,
 						imei: "1",
 					},
 					method: 'GET',
 					success: (res) => {
-						var versionNo = plus.runtime.version
-						if (versionNo == res.data.data.version) {
-							this.version = "当前为最新版" + res.data.data.version
+						console.log("查看--------", this.version)
+						console.log("查看--------", res)
+						if (!res.data.data.version) {
+							this.version = "当前为最新版" + this.version
 						} else {
 							this.version = "发现新版本，立即更新"
 						}
@@ -162,7 +166,7 @@
 						url: 'https://api2.eliangeyun.com/appVersion/selectInfo',
 						data: {
 							appid: plus.runtime.appid,
-							version: plus.runtime.version,
+							version: this.version,
 							imei: "1"
 						},
 						method: 'GET',