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,14 +4,14 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.110.9:8099/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	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

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)
@@ -1217,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;
@@ -1352,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>