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

components/upload.vue

@@ -110,6 +110,10 @@
 				type: String,
 				default: ''
 			},
+			isAction: {
+				type: Boolean,
+				default: true
+			},
 			// 最大上传数量
 			maxCount: {
 				type: [String, Number],
@@ -440,7 +444,7 @@
 					return;
 				}
 				// 检查上传地址
-				if (!this.action) {
+				if (!this.action&&this.isAction) {
 					this.showToast('请配置上传地址', true);
 					return;
 				}
@@ -468,21 +472,50 @@
 				}
 				this.lists[index].error = false;
 				this.uploading = true;
-				uploadImage(this.lists[index].url, 'appData/',
-					result => {
-						console.log
-						// 上传成功
-						this.lists[index].response = result;
-						this.lists[index].progress = 100;
-						this.lists[index].error = false;
-						let data = result
-						this.$emit('on-success', data, index, this.lists,this.imgIndex);
-						uni.hideLoading();
-						this.uploading = false;
-						this.uploadFile(index + 1);
-						this.$emit('on-change', data, index, this.lists,this.imgIndex);
-					}
-				)
+				if(!this.action){
+					uploadImage(this.lists[index].url, 'appData/',
+						result => {
+							console.log
+							// 上传成功
+							this.lists[index].response = result;
+							this.lists[index].progress = 100;
+							this.lists[index].error = false;
+							let data = result
+							this.$emit('on-success', data, index, this.lists,this.imgIndex);
+							uni.hideLoading();
+							this.uploading = false;
+							this.uploadFile(index + 1);
+							this.$emit('on-change', data, index, this.lists,this.imgIndex);
+						}
+					)
+				}else{
+					uni.uploadFile({
+						url: this.action,
+						// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
+						// files: files[i],
+						filePath: this.lists[index].url,
+						name: 'fileName',
+						formData: {
+							// fileName: chooseImageRes.tempFiles[0],
+							companyId: uni.getStorageSync('pcUserInfo').compId,
+							modelId: '',
+							vesselId: '',
+						},
+						success: (uploadFileRes) => {
+							console.log(JSON.parse(uploadFileRes.data))
+							this.$emit('on-success', JSON.parse(uploadFileRes.data), index, this.lists,this.imgIndex);
+							uni.hideLoading();
+							this.uploading = false;
+							this.uploadFile(index + 1);
+							this.$emit('on-change', JSON.parse(uploadFileRes.data), index, this.lists,this.imgIndex);
+						},
+						fail(res) {
+					
+							console.log(res);
+						}
+					});
+				}
+				
 				// 创建上传对象
 				// const task = uni.uploadFile({
 				// 	url: this.action,

config/index.js

@@ -4,13 +4,13 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

main.js

@@ -38,7 +38,7 @@ import '@/common/directive.js'
 let urlAddress = 'liangxin.zthymaoyi.com'
 
 Vue.prototype.$url = 'https://' + urlAddress + '/upload/'
-Vue.prototype.$uploadUrl = 'https://' + urlAddress + '/file/upload'
+Vue.prototype.$uploadUrl = config.def().baseUrlNew + 'appendix/api/uploadFiles'
 Vue.prototype.$ws = 'wss://' + urlAddress + '/chat'
 Vue.prototype.$ossUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/'
 Vue.prototype.utils = utils

manifest.json

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

pages/grain_pulse/editcompany.vue

@@ -112,7 +112,9 @@
 			</view>
 			<view style='padding-bottom:10px;' class="modular">
 				<view class="title Regular">场地照片（图片清晰，最多9张）</view>
-				<upload  :file-list="fileList2" class="upload" ref="upload" :action="action" :max-count="9"
+				<upload  :form-data="{companyId: pcUserInfo.compId,
+							modelId: '',
+							vesselId: ''}" :file-list="fileList2" class="upload" ref="upload" :action="action" :max-count="9"
 					:size-type="['compressed']" @on-success="getImgUrl2" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" ></upload>
 			</view>
@@ -170,6 +172,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false,
 				isAdd: true,
@@ -290,7 +293,7 @@
 			},
 			getImgUrl(res) {
 				console.log(res)
-				this.deptList.attachmentAddress = res
+				this.deptList.attachmentAddress = res.data.appendixPath
 			},
 			getList(){
 				this.isLoadMore=true

pages/grain_pulse/enter.vue

@@ -120,6 +120,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false,
 				isAdd: true,
@@ -244,7 +245,7 @@
 		methods: {
 			getImgUrl(res) {
 				console.log(res)
-				this.deptList.attachmentAddress = res
+				this.deptList.attachmentAddress = res.data.appendixPath
 			},
 			naviageToPage(item) {
 				// console.log(this.enter)

pages/grain_pulse/errorcorrection.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="uploading">
 				<view class="title Regular">上传图片</view>
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
+				<upload  class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
 					:size-type="['compressed']" :options="uploadOptions" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 			</view>
@@ -32,6 +32,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
@@ -71,7 +72,7 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				this.imgUrls.push(res);
+				this.imgUrls.push(res.data.appendixPath);
 			},
 			commit(){
 				var that=this

pages/grain_pulse/jubao.vue

@@ -11,7 +11,9 @@
 			</view>
 			<view class="uploading">
 				<view class="title Regular">上传图片</view>
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
+				<upload :form-data="{companyId: pcUserInfo.compId,
+							modelId: '',
+							vesselId: ''}" class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="6"
 					:size-type="['compressed']" :options="uploadOptions" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
 					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 			</view>
@@ -32,6 +34,7 @@
 		data() {
 			return {
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
@@ -71,7 +74,7 @@
 			getImgUrl(res) {
 				console.log(res)
 				console.log('------------res-----------')
-				this.imgUrls.push(res);
+				this.imgUrls.push(res.data.appendixPath);
 			},
 			commit(){
 				var that=this

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -337,29 +337,45 @@
 			</u-form>
 		</view>
 		<view v-if='show1' class="shade">
+			
 			<view class="wrap">
 				<view class="alert-top">
-					<view class="title">
-						{{title}}
+						<view class="title">
+							{{title}}
+						</view>
+						<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 					</view>
-					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
-				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="250"
+							maxlength="1000" />
+					</view>
+					<view class="upload_css">
+						上传附件
+						<!-- <u-upload class="upload" :width="150" ref="upload" :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :max-size="maxSize" :max-count="99"
+							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true"  @on-progress="onProgress"></u-upload> -->
+							<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+							:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+							@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+							@on-progress="onProgress">
+							<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+									<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+									<view>选择图片</view>
+								</view>
+							</u-upload>
 					</view>
-					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="250"
-						maxlength="1000" />
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
-						: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 class="audit_btn">
-				<view @click='close()' class="cancel">取消</view>
-				<view @click='passSubmit()' class="confirm">确定</view>
+					<view @click='close()' class="cancel">取消</view>
+					<view @click='passSubmit()' class="confirm">确定</view>
 				</view>
 			</view>
 		</view>
@@ -413,6 +429,8 @@
 				count: 0,
 				// 上传附件、
 				action: this.$uploadUrl,
+				// action1: config.def().baseUrlNew+ 'appendix/api/uploadFiles',
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				fileUrl: []
@@ -458,7 +476,8 @@
 				});
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				console.log(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -1297,8 +1316,8 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 770rpx;
-			overflow-y: scroll;
+			height: 798rpx;
+			
 			// overflow: hidden;
 			border-radius: 20rpx;
 	
@@ -1320,10 +1339,13 @@
 				position: absolute;
 				right: 33rpx;
 			}
-	
+			.content{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.upload_css {
-				margin-left: 20rpx;
-	
+				margin:0 0 16rpx 20rpx;
+				
 				.upload {
 					// width: 80px;
 					// height: 80px;
@@ -1533,4 +1555,17 @@
 			margin-top: 20rpx;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx !important;
+		width:190rpx !important;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

pages/task/audit/acquisitioncontract.vue

@@ -312,20 +312,37 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+							maxlength="100" /> -->
+							<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+					</view>
+					<view class="upload_css">
+						上传附件
+						<!-- <upload class="upload" :width="150" ref="upload" :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :max-size="maxSize" :max-count="99"
+							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+							 -->
+							 <u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+									modelId: '',
+									vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+							 :size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+							 @on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+							 @on-progress="onProgress">
+							 <view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+									<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+									<view>选择图片</view>
+								</view>
+							 </u-upload>
 					</view>
-					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" /> -->
-						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
-						: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 class="audit_btn">
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -364,7 +381,6 @@
 				show: false,
 				title: '',
 				contractNo: "",
-				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				imgShow: false,
@@ -373,6 +389,7 @@
 				auditCheck:"question",//判断审核是否通过
 				// 上传附件、
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				fileUrl: []
@@ -411,7 +428,7 @@
 				});
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -911,10 +928,12 @@
 			background: #fff;
 			width: calc(100% - 198rpx);
 			height: 770rpx;
-			overflow-y: scroll;
 			// overflow: hidden;
 			border-radius: 20rpx;
-	
+			.content{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -1274,4 +1293,17 @@
 			margin-top: 6px;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx !important;
+		width:190rpx !important;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

pages/task/audit/charge_against_revenue.vue

@@ -268,19 +268,35 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="240"
+							maxlength="1000" />
+					</view>
+					<view class="upload_css">
+						上传附件
+						<!-- <upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
+							:form-data="{companyId: pcUserInfo.compId,
+										modelId: '',
+										vesselId: ''}" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload> -->
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+						:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+						@on-progress="onProgress">
+						<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
 					</view>
-					<u-input :clearable='false' class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="240"
-						maxlength="1000" />
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
-						: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 class="audit_btn">
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -336,6 +352,7 @@
 				imglist2: [],
 				// 上传附件、
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				fileUrl: []
@@ -400,7 +417,7 @@
 				});
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -565,7 +582,8 @@
 						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-						if(this.auditInfo.status == '已收款' || this.auditInfo.status == '待付款'){
+						if((this.auditInfo.status == '已收款' && this.vesselId == '点击切换任务状态') 
+						|| (this.auditInfo.status == '待付款' && this.vesselId == '点击切换任务状态')){
 							this.$api.doRequest('post', '/expenseInfo/editCollectionStatus',
 								that.detialData).then(res1 => {
 								if (res1.data.code == 200) {
@@ -573,6 +591,8 @@
 									setTimeout(function() {
 										uni.navigateBack();
 									}, 2000);
+								}else{
+									return
 								}
 							})
 						}
@@ -1214,10 +1234,12 @@
 			background: #fff;
 			width: calc(100% - 198rpx);
 			height: 780rpx;
-			overflow-y: scroll;
 			// overflow: hidden;
 			border-radius: 20rpx;
-	
+			.content{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -1349,4 +1371,17 @@
 			text-align: right;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx !important;
+		width:190rpx !important;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

pages/task/audit/purchasecontract.vue

@@ -333,19 +333,34 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content1">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+						<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+							maxlength="300" /> -->
+					</view>
+					<view class="upload_css">
+						上传附件
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+						:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+						@on-progress="onProgress">
+						<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+						<!--< upload :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
+							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload> -->
 					</view>
-					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
-					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="300" /> -->
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
-						: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 class="audit_btn">
 				<view @click='close()' class="cancel">取消</view>
@@ -383,7 +398,6 @@
 				show: false,
 				title: '',
 				contractNo: "",
-				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				imgShow: false,
@@ -392,6 +406,7 @@
 				auditCheck:"question",//判断审核是否通过
 				// 上传附件、
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				fileUrl: []
@@ -429,7 +444,7 @@
 				});
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -892,10 +907,12 @@
 			background: #fff;
 			width: calc(100% - 198rpx);
 			height: 770rpx;
-			overflow-y: scroll;
 			// overflow: hidden;
 			border-radius: 20rpx;
-	
+			.content1{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -1251,4 +1268,17 @@
 			margin-top: 6px;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx !important;
+		width:190rpx !important;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 </style>

pages/task/audit/refuel.vue

@@ -147,21 +147,30 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view style='overflow-y: scroll;height: 740rpx;padding-bottom:102rpx;'>
-					<view class="u-textarea-style">
-						<view class="right-bottom">
-							{{auditMind.length}}/1000个字
-						</view>
-						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30"
-							rows="11"></textarea>
-
+				<view style='overflow-y: scroll;height: 732rpx;padding-bottom:102rpx;'>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/1000个字
 					</view>
-					<u-upload class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30"
+						rows="11"></textarea>
+
+				</view>
+				<view style='padding-left:10px;'>
+					上传附件
+					<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
 							modelId: '',
 							vesselId: ''}" :action="action1" :show-tips="false" :max-size="maxSize" :max-count="9"
-						:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
-						@on-remove="onRemove" @on-uploaded="isAdd = true"
-						:limitType="['png', 'jpg', 'jpeg', 'webp', 'gif']" @on-progress="onProgress"></u-upload>
+					:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+					@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+					@on-progress="onProgress">
+					<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+							<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+							<view>选择图片</view>
+						</view>
+						</u-upload>
+				</view>
+
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -816,7 +825,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 948rpx;
+			height: 836rpx;
 			border-radius: 20rpx;
 			// overflow-y: scroll;
 
@@ -1229,6 +1238,20 @@
 		margin-right: 0px;
 	}
 
+
+/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx;
+		width:190rpx;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+}
 	/deep/.place {
 		color: #000;
 	}

pages/task/audit/salecontract.vue

@@ -350,17 +350,32 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content1">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
+					</view>
+					<view class="upload_css">
+						上传附件
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+						:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+						@on-progress="onProgress">
+						<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+						<!-- <upload :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
+							:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload> -->
 					</view>
-					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30" rows="11"></textarea>
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="150" ref="upload" :action="action" :max-size="maxSize" :max-count="99"
-						: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 class="audit_btn">
 				<view @click='close()' class="cancel">取消</view>
@@ -398,7 +413,6 @@
 				auditList: [],
 				show: false,
 				contractNo: "",
-				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
 				url: "",
@@ -409,6 +423,7 @@
 				rejectInfo: "",
 				rejectInfo1: "",
 				isSHowBtn: true,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				auditCheck:"question",//判断审核是否通过
 				// 上传附件、
 				action: this.$uploadUrl,
@@ -448,7 +463,7 @@
 				});
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -954,10 +969,12 @@
 			background: #fff;
 			width: calc(100% - 198rpx);
 			height: 770rpx;
-			overflow-y: scroll;
 			// overflow: hidden;
 			border-radius: 20rpx;
-	
+			.content1{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -1330,4 +1347,17 @@
 			text-align: right;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+			background:#fff;
+			border:1px dashed #ccc;
+			border-radius:10rpx;
+			height:190rpx;
+			width:190rpx;
+			margin:10rpx;
+			text-align:center;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+		}
 </style>

pages/task/audit/sales_shift.vue

@@ -143,7 +143,7 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view style='overflow-y: scroll;height: 740rpx;padding-bottom:102rpx;'>
+				<view style='overflow-y: scroll;height: 732rpx;padding-bottom:102rpx;'>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
 						{{auditMind.length}}/1000个字
@@ -152,12 +152,20 @@
 						rows="11"></textarea>
 		
 				</view>
-				<u-upload class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+				<view style='padding-left:10px;'>
+					上传附件
+					<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
 							modelId: '',
 							vesselId: ''}" :action="action1" :show-tips="false" :max-size="maxSize" :max-count="9"
 					:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
 					@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
-					@on-progress="onProgress"></u-upload>
+					@on-progress="onProgress">
+					<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+							<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+							<view>选择图片</view>
+						</view>
+						</u-upload>
+				</view>
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -831,7 +839,7 @@
 			margin: auto;
 			background: #fff;
 			width: calc(100% - 198rpx);
-			height: 948rpx;
+			height: 836rpx;
 			border-radius: 20rpx;
 			// overflow-y: scroll;
 	
@@ -874,11 +882,13 @@
 		left: 0;
 		border-right: 1px solid #eee;
 		color: #AFB3BF;
+		border-radius: 0 0 0 10px;
 	}
 	
 	.confirm {
 		right: 0;
 		color: #22C572;
+		border-radius: 0 0 10px 0;
 	}
 	
 	.textarea {
@@ -907,7 +917,7 @@
 		padding: 10rpx 20rpx;
 		position: relative;
 	
-		height: 240px;
+		height: 170px;
 	
 		/deep/.uni-textarea-textarea {
 			width: 80%;
@@ -949,6 +959,19 @@
 			color: #00C265;
 		}
 	}
+	/deep/.u-upload .u-list-item{
+		background:#fff;
+		border:1px dashed #ccc;
+		border-radius:10rpx;
+		height:190rpx;
+		width:190rpx;
+		margin:10rpx;
+		text-align:center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+	}
 	/deep/.u-radio-group{
 		display: flex;
 		justify-content: space-around;
@@ -965,4 +988,5 @@
 			margin-right:0;
 		}
 	}
+	
 </style>

pages/task/audit/tradeServices_audit_approval.vue

@@ -48,7 +48,7 @@
 			</view>
 			<view class="form_item">
 				<view class="title">附件</view>
-				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="0"
+				<upload  class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="0"
 					:file-list="imgUrl" :size-type="['compressed']" @on-success="getImgUrl" :deletable="false"
 					:showProgress="false" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 					@on-progress="onProgress"></upload>

pages/task/audit/universalityAudit.vue

@@ -150,21 +150,37 @@
 					</view>
 					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
 				</view>
-				<view class="u-textarea-style">
-					<view class="right-bottom">
-						{{auditMind.length}}/1000个字
+				<view class="content">
+					<view class="u-textarea-style">
+						<view class="right-bottom">
+							{{auditMind.length}}/1000个字
+						</view>
+						<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+							maxlength="1000" /> -->
+						<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30"
+							rows="11"></textarea>
+					</view>
+					<view class="upload_css">
+						上传附件
+						<u-upload :custom-btn='true' class="upload" ref="upload" name='fileName' :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :action="action" :show-tips="false" :max-size="maxSize" :max-count="9"
+						:size-type="['compressed']" @on-success="getImgUrl($event)" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
+						@on-progress="onProgress">
+						<view slot="addBtn" class="slot-btn u-list-item" hover-class="slot-btn__hover" hover-stay-time="150">
+								<image style="width:23px;height:23px;" src="../../../static/img/liangmai/xiangji-2.png" mode=""></image>
+								<view>选择图片</view>
+							</view>
+						</u-upload>
+						<!-- <upload class="upload" :form-data="{companyId: pcUserInfo.compId,
+								modelId: '',
+								vesselId: ''}" :width="140" ref="upload" :action="action" :max-size="maxSize"
+							:max-count="99" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+							@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+							@on-progress="onProgress"></upload> -->
+							
 					</view>
-					<!-- <u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="1000" /> -->
-					<textarea maxlength="1000" v-model='auditMind' placeholder="请在此输入审核意见" name="" id="" cols="30"
-						rows="11"></textarea>
-				</view>
-				<view class="upload_css">
-					上传附件
-					<upload class="upload" :width="140" ref="upload" :action="action" :max-size="maxSize"
-						:max-count="99" :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 class="audit_btn">
 					<view @click='close()' class="cancel">取消</view>
@@ -198,6 +214,7 @@
 				imglist: [],
 				auditList: [],
 				action: this.$uploadUrl,
+				pcUserInfo :uni.getStorageSync('pcUserInfo'),
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M,
 				fileUrl: []
 			}
@@ -282,7 +299,7 @@
 				
 			},
 			getImgUrl(res) {
-				this.fileUrl.push(res)
+				this.fileUrl.push(res.data.appendixPath)
 			},
 			onError(error) {
 				alert(error)
@@ -848,10 +865,12 @@
 			background: #fff;
 			width: calc(100% - 198rpx);
 			height: 770rpx;
-			overflow-y: scroll;
 			// overflow: hidden;
 			border-radius: 20rpx;
-
+			.content{
+				height:600rpx;
+				overflow-y: scroll;
+			}
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -941,4 +960,17 @@
 			}
 		}
 	}
+	/deep/.u-upload .u-list-item{
+			background:#fff;
+			border:1px dashed #ccc;
+			border-radius:10rpx;
+			height:190rpx;
+			width:190rpx;
+			margin:10rpx;
+			text-align:center;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+		}
 </style>

pages/task/audit/warehouse_warrant.vue

@@ -37,8 +37,10 @@
 				<view class="right" style='width:33.3333%;text-align:center;'>金额（元）</view>
 			</view>
 			<view class="row" v-for='item in auditInfo.goodNameList'>
-				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.goodsName}}</view>
-				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>{{item.inWarehouseWeight}}</view>
+				<view class="left" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>
+					{{item.goodsName}}</view>
+				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>
+					{{item.inWarehouseWeight}}</view>
 				<view class="right" style='width:33.3333%;text-align:center;'>{{item.requestFunds}}</view>
 			</view>
 			<view class="row">
@@ -66,6 +68,14 @@
 				<view class="right">{{auditInfo.count}}</view>
 			</view> -->
 		</view>
+		<view class="content1" v-if="auditInfo.warehousingOrderList[0].remark">
+			<view class="title ">
+				备注信息
+			</view>
+			<view style="margin-top: 20rpx;">
+				<textarea v-model="auditInfo.warehousingOrderList[0].remark" :autoHeight="true" disabled style="font-size: 28rpx;"></textarea>
+			</view>
+		</view>
 
 		<view class="content1">
 			<view class="title ">
@@ -129,14 +139,14 @@
 				<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>
@@ -147,14 +157,22 @@
 								<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">
@@ -162,7 +180,8 @@
 						</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;'>
@@ -171,8 +190,8 @@
 							<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>
@@ -234,7 +253,7 @@
 				id: "",
 				auditList: [],
 				url: "11",
-				url2:""
+				url2: ""
 			}
 		},
 		onBackPress(e) {
@@ -258,19 +277,19 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			detailed(data,status){
+			detailed(data, status) {
 				let obj
-				if(status==1){
-					 obj= JSON.stringify(this.auditInfo.warehousingOrderList)
-				}else{
+				if (status == 1) {
+					obj = JSON.stringify(this.auditInfo.warehousingOrderList)
+				} else {
 					obj = JSON.stringify([data])
 				}
-					uni.navigateTo({
-						url: '/pages/task/audit/viewDetail?data='+obj
-					});
+				uni.navigateTo({
+					url: '/pages/task/audit/viewDetail?data=' + obj
+				});
 			},
-			showcontent(item){
-				item.showflow=!item.showflow
+			showcontent(item) {
+				item.showflow = !item.showflow
 			},
 			openXls() {
 				if (this.url && this.url != "ng") {
@@ -311,7 +330,7 @@
 					title: "加载中...",
 					mask: true
 				})
-				var that =this
+				var that = this
 				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
 				// 	currentPage: 1,
 				// 	pageSize: 100,
@@ -358,39 +377,44 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
-						var arr=[]
-						if(res1.data.data.warehousingOrderList){
-							var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
+						var arr = []
+						if (res1.data.data.warehousingOrderList) {
+							var datalist = JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
 							for (var i = 0; i < datalist.length; i++) {
-								if(arr.length==0){
+								if (arr.length == 0) {
 									arr.push(datalist[i])
-								}else{
-									var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
-									if(arr1.length>0){
+								} else {
+									var arr1 = arr.filter((item) => {
+										return item.goodsName == datalist[i].goodsName
+									})
+									if (arr1.length > 0) {
 										for (var q = 0; q < arr.length; q++) {
-											if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
-												console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
-												arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
-												arr[q].requestFunds+=datalist[i].requestFunds
+											if (arr[q].goodsName == datalist[i].goodsName) {
+												console.log(22222)
+												console.log(arr[q].inWarehouseWeight, datalist[i]
+													.inWarehouseWeight)
+												arr[q].inWarehouseWeight += datalist[i].inWarehouseWeight
+												arr[q].requestFunds += datalist[i].requestFunds
 											}
 										}
-									}else{
+									} else {
 										arr.push(datalist[i])
 									}
 								}
-								
+
 							}
 							for (var q = 0; q < arr.length; q++) {
-								arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
-								arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
+								arr[q].inWarehouseWeight = arr[q].inWarehouseWeight.toFixed(2)
+								arr[q].requestFunds = arr[q].requestFunds.toFixed(2)
 							}
 						}
-						console.log(arr,1111111)
-						this.auditInfo.goodNameList=arr
-						if(this.auditInfo.inWarehouseWeightTotal){
-							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(2)
+						console.log(arr, 1111111)
+						this.auditInfo.goodNameList = arr
+						if (this.auditInfo.inWarehouseWeightTotal) {
+							this.auditInfo.inWarehouseWeightTotal = this.auditInfo.inWarehouseWeightTotal.toFixed(
+								2)
 						}
-						if(this.auditInfo.requestFundsTotal){
+						if (this.auditInfo.requestFundsTotal) {
 							this.auditInfo.requestFundsTotal = this.auditInfo.requestFundsTotal.toFixed(2)
 						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
@@ -402,90 +426,121 @@
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
 								businessKey: this.id,
-								branch:that.auditInfo.jointVentureParties?that.auditInfo.jointVentureParties:'zt'
+								branch: that.auditInfo.jointVentureParties ? that.auditInfo
+									.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
+											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
+												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
+													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].commonStaffs1 = response.data.data[i]
+											.commonStaffs
+									} else {
+										if (response.data.data[i].workflowHistoricTasks && response
+											.data.data[i].workflowHistoricTasks.length > 0) {
+											var len = response.data.data[i].workflowHistoricTasks
+												.length - 1
+											if (response.data.data[i].workflowHistoricTasks[len]
+												.approved) {
+												this.$set(response.data.data[i], 'status',
+													'success')
+											} else {
+												this.$set(response.data.data[i], 'status', 'error')
 											}
-											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
-											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
-											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
-											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
-											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
-										}else{
-											this.$set(response.data.data[i],'status','question')
+											response.data.data[i].operatorTitle = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+												.substring(response.data.data[i]
+													.workflowHistoricTasks[0].operatorName.length -
+													2)
+											response.data.data[i].operatorName = response.data
+												.data[i].workflowHistoricTasks[len].operatorName
+											var time = new Date(response.data.data[i]
+												.workflowHistoricTasks[len].claimTime)
+											.getTime()
+											response.data.data[i].updateDate = this.$u.timeFormat(
+												time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind = response.data.data[i]
+												.workflowHistoricTasks[len].auditMind
+										} else {
+											this.$set(response.data.data[i], 'status', 'question')
 											// response.data.data[i].status='question'
-											if(response.data.data[i].desc=='总经理助理审核'){
-												response.data.data[i].operatorTitle='总助'
-											}else if(response.data.data[i].desc=='杜大光审核'){
-												response.data.data[i].operatorTitle='大光'
-											}else{
-												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											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.auditInfo.createDate).getTime()
-								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								var time2 = new Date(this.auditInfo.createDate).getTime()
+								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle:this.auditInfo.creater.substring(0,2),
-									operatorName:this.auditInfo.creater,
-									updateDate:time3,
-									auditMind:'',
-									desc:'发起申请',
-									showflow:false,
-									commonStaffs1:null,
-									commonStaffs:null,
-									workflowHistoricTasks:[],
-									status:'success'
+									operatorTitle: this.auditInfo.creater.substring(0, 2),
+									operatorName: this.auditInfo.creater,
+									updateDate: time3,
+									auditMind: '',
+									desc: '发起申请',
+									showflow: false,
+									commonStaffs1: null,
+									commonStaffs: null,
+									workflowHistoricTasks: [],
+									status: 'success'
 								})
 							})
 						})
-						
+
 					}
 				})
 				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -757,17 +812,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;
@@ -778,7 +833,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-	
+
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -787,27 +842,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;
@@ -816,33 +871,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;
 						}
@@ -850,10 +905,10 @@
 				}
 			}
 		}
-	
+
 		.row2 {
 			display: flex;
-	
+
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -866,22 +921,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/warehouse_warrant_detail.vue

@@ -72,6 +72,14 @@
 				<view class="right">{{auditInfo.count}}</view>
 			</view> -->
 		</view>
+		<view class="content1" v-if="auditInfo.warehousingOrderList[0].remark">
+			<view class="title ">
+				备注信息
+			</view>
+			<view style="margin-top: 20rpx;">
+				<textarea v-model="auditInfo.warehousingOrderList[0].remark" :autoHeight="true" disabled style="font-size: 28rpx;"></textarea>
+			</view>
+		</view>
 
 		<view class="content1">
 			<view class="title ">

pages/task/my_task.vue

@@ -799,7 +799,7 @@
 				} else if (item.businessCode == 'FEIYONGGUANLI-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId
+							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId + '&vesselId=' + item.vesselId
 						})
 					} else {
 						uni.navigateTo({