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

config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.1.114:8090/',
-	// baseUrlNew: 'http://192.168.1.122:8090/',
+	baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	baseUrlNew: 'http://192.168.110.138:8090/',

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -297,7 +297,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="row-line" v-if="index!= auditList.length - 1"></view>
+						<view class="row-line" :style='[{"height":item.auditMind?"80px":"40px"}]' v-if="index!= auditList.length - 1"></view>
 					</view>
 				</view>
 			</u-form>
@@ -522,7 +522,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),
@@ -1286,7 +1286,7 @@
 			}
 		}
 		.row-line {
-			width: 1px;
+			width: 2px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;

pages/task/audit/Issueandreceipt_task_details.vue

@@ -460,7 +460,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/acquisitioncontract.vue

@@ -103,8 +103,11 @@
 						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view> -->
-				<view v-if='imglist.length'>
-					<view v-for='item in imglist'>
+				<view v-if='imglist.length>0'>
+					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+						<view style="max-width:60%;word-break: break-word">
+							{{item.appendixName}}
+						</view>
 						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
 							点击下载
 						</view>
@@ -259,7 +262,7 @@
 		methods: {
 			openDocument(src){
 				uni.downloadFile({
-				  url: src,
+				  url: src.appendixPath,
 				  success: function (res) {
 				    var filePath = res.tempFilePath;
 				    uni.openDocument({
@@ -301,9 +304,7 @@
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for (var i = 0; i < res1.data.data.length; i++) {
-								that.imglist.push(res1.data.data[i].appendixPath)
-							}
+							that.imglist=res1.data.data
 						})
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -379,7 +380,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/purchasecontract.vue

@@ -134,10 +134,17 @@
 						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view> -->
-				<view v-for='item in imglist'>
-					<view @click='shadeshow(item)'>
-						<image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image>
-					</view>
+				<view v-if='imglist.length>0'>
+					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+						<view style="max-width:60%;word-break: break-word">
+							{{item.appendixName}}
+						</view>
+						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
+							点击下载
+						</view>
+						<!-- <u-icon name="attach" ></u-icon> -->
+						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+				</view>
 				</view>
 			</u-form-item>
 			<view class="content2">
@@ -215,10 +222,10 @@
 				</view>
 				<view class="u-textarea-style">
 					<view class="right-bottom">
-						{{auditMind.length}}/100个字
+						{{auditMind.length}}/300个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="300" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -282,6 +289,21 @@
 				this.imgShow = true
 				this.url = url
 			},
+			openDocument(src){
+				uni.downloadFile({
+				  url: src.appendixPath,
+				  success: function (res) {
+				    var filePath = res.tempFilePath;
+				    uni.openDocument({
+				      filePath: filePath,
+				      showMenu: true,
+				      success: function (res) {
+				        console.log('打开文档成功');
+				      }
+				    });
+				  }
+				});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},
@@ -306,9 +328,7 @@
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for (var i = 0; i < res1.data.data.length; i++) {
-								that.imglist.push(res1.data.data[i].appendixPath)
-							}
+							that.imglist=res1.data.data
 						})
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'BUY-CONTRACT-APPROVE',
@@ -383,7 +403,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/salecontract.vue

@@ -125,9 +125,9 @@
 			<u-form-item label-width='260' label="备注信息">
 			</u-form-item>
 			<u-form-item>
-				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
+				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="附件">
+			<u-form-item label-width='90' label="附件">
 				<!-- <view class="textCss">
 					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imglist"
 					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
@@ -137,12 +137,18 @@
 				<!-- <view v-for='item in imglist'>
 					<image style='width:100px;height:100px;' :src="item" mode=""></image>
 				</view> -->
-				<view v-for='item in imglist'>
-					<view @click='shadeshow(item)'>
-						<image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image>
-					</view>
+				<view v-if='imglist.length>0'>
+					<view style="justify-content: space-between;" class='flex' v-for='item in imglist'>
+						<view style="max-width:60%;word-break: break-word">
+							{{item.appendixName}}
+						</view>
+						<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
+							点击下载
+						</view>
+						<!-- <u-icon name="attach" ></u-icon> -->
+						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+				</view>
 				</view>
-
 			</u-form-item>
 			<view class="content2">
 				<view class="title row">
@@ -223,7 +229,7 @@
 						{{auditMind.length}}/100个字
 					</view>
 					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
-						maxlength="100" />
+						maxlength="300" />
 				</view>
 				<view @click='close()' class="cancel">取消</view>
 				<view @click='passSubmit()' class="confirm">确定</view>
@@ -288,6 +294,21 @@
 			this.getList()
 		},
 		methods: {
+			openDocument(src){
+				uni.downloadFile({
+				  url: src.appendixPath,
+				  success: function (res) {
+				    var filePath = res.tempFilePath;
+				    uni.openDocument({
+				      filePath: filePath,
+				      showMenu: true,
+				      success: function (res) {
+				        console.log('打开文档成功');
+				      }
+				    });
+				  }
+				});
+			},
 			shadeshow(url) {
 				this.imgShow = true
 				this.url = url
@@ -314,11 +335,7 @@
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for (var i = 0; i < res1.data.data.length; i++) {
-								that.imglist.push(
-									res1.data.data[i].appendixPath
-								)
-							}
+							that.imglist=res1.data.data
 						})
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'SALE-CONTRACT-APPROVE',
@@ -393,7 +410,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/warehouse_approval.vue

@@ -320,7 +320,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/warehouse_details.vue

@@ -257,7 +257,7 @@
 								}
 								// console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time2=new Date(this.list.createDate).getTime()
 								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
 									operatorTitle:this.list.creater.substring(0,2),

pages/task/audit/warehouse_warrant.vue

@@ -410,7 +410,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								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),

pages/task/audit/warehouse_warrant_detail.vue

@@ -409,7 +409,7 @@
 								}
 								console.log(response.data.data)
 								this.auditList = response.data.data
-								var time2=new Date(this.auditList[0].createDate).getTime()
+								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),