zhongtianhaoyuan 2 år sedan
förälder
incheckning
a4271ba172

+ 3 - 3
config/index.js

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

+ 1 - 2
pages/erp/index.vue

@@ -29,7 +29,6 @@
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 						<image :src="item.src" class="sign"></image>
 					</view>
-
 					<text>{{item.name}}</text>
 				</view>
 			</view>
@@ -599,7 +598,7 @@
 		width: 40px;
 		height: 40px;
 		top: 4px;
-		margin-right: 6px;
+		/* margin-right: 6px; */
 	}
 
 	.dropdown {

+ 48 - 30
pages/reimbursement/get_request_funds.vue

@@ -44,39 +44,32 @@
 				</view>
 			</view>
 			<view class="c-row">
-				<view class="title">附件(选填)</view>
+				<view class="title">附件</view>
 			</view>
-			<view style="display: flex;flex-wrap: wrap;">
-
+			<view>
 				<view v-if='imglist2.length>0'>
-					<view style="justify-content: space-between;margin-top: 20rpx;display: flex;" v-for='item in imglist2'>
-						<view class="" style="display: flex;">
-							<image
-								v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/pdf3.png" mode="">
-							</image>
-							<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/excle3.png" mode="">
-							</image>
-							<image v-else-if="item.type == 'doc'||item.type == 'docx'"
-								style="width: 80px; height: 80px;" src="../../static/img/oa_office/word3.png" mode="">
-							</image>
-							<image v-else style="width: 80px; height: 80px;" :src="item.appendixPath" mode=""></image>
-						</view>
-						<!-- 	<view class="" style="justify-content: space-between;margin-top: 20rpx;display: flex;" v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'">
-							<image class="upload" src="../../static/img/oa_office/pdf.png" mode=""></image>
-							<view style="max-width:60%;word-break: break-word">
-								{{item.appendixName}}
+					<view style="margin-top: 20rpx;" v-for='item in imglist2'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
+								</image>
 							</view>
-							<view class="" style="color: #19be6b;text-decoration:underline;" @click="openDocument(item)">
-								点击下载
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
 							</view>
-						</view> -->
-						<!-- <view  v-else style="margin-left: 20rpx;display: flex;flex-wrap: wrap;"> -->
-						<!-- <image else :src="item.appendixPath" mode="" style="width: 100px;height: 100px;"></image> -->
-						<!-- </view> -->
-						<!-- <u-icon name="attach" ></u-icon> -->
-						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+							<view class="img_dowload" @click="openDocument(item)">下载</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -127,7 +120,6 @@
 								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
-						console.log(res)
 					})
 				},
 				deep: true
@@ -289,4 +281,30 @@
 		width: 80rpx;
 		height: 80rpx;
 	}
+
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

+ 66 - 9
pages/task/audit/acquisitioncontract.vue

@@ -149,26 +149,46 @@
 			<u-form-item>
 				<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='260' 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" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view> -->
+				<view class="fujian_title">共{{imglist.length}}个附件</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 class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
+								</image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
+							</view>
+							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
+								下载
+							</view>
 						</view>
+						
 						<!-- <u-icon name="attach" ></u-icon> -->
 						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
 				</view>
-			</u-form-item>
+			<!-- </u-form-item> -->
 			<view class="content2">
 				<view class="title row">
 					流程
@@ -366,6 +386,12 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist = res1.data.data
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
 						})
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -608,7 +634,7 @@
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
-			font-size: 20rpx;
+			font-size: 26rpx;
 			color: #878C9C;
 		}
 	}
@@ -976,11 +1002,42 @@
 	}
 
 	.label_css {
-		font-size: 20rpx;
+		font-size: 26rpx;
 		color: #878C9C;
 	}
 
 	.input_css {
 		font-size: 20rpx;
 	}
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+	.fujian_title{
+		font-size: 34rpx;
+		margin-top: 20px;
+		font-weight: 600;
+		// margin-left: 10px;
+	}
+	
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

+ 5 - 3
pages/task/audit/charge_against_revenue.vue

@@ -119,7 +119,7 @@
 						<view class="img_item">
 							<view class="" style="width: 16%;">
 								<image
-									v-if="item.type == 'pdf'||item.type == 'doc'||item.type == 'docx'||item.type == 'xls'||item.type == 'xlsx'"
+									v-if="item.type == 'pdf'"
 									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
 									mode=""></image>
 								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
@@ -311,8 +311,10 @@
 					}).then(res => {
 						this.imglist2 = res.data.data
 						for (let i = 0; i < this.imglist2.length; i++) {
-							if (this.imglist2[i].appendixName) {
-								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							if (this.imglist2[i].appendixName) {//获取文件的后缀名
+								let index = that.imglist[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
 							}
 						}
 					})

+ 90 - 2
pages/task/audit/charge_against_revenue_detail.vue

@@ -115,8 +115,29 @@
 			</view>
 			<view v-if='auditInfo.srcList.length>0' class="">
 				<view style='flex-wrap: wrap;' class="file">
-					<image v-for='(item,index) in auditInfo.srcList' @click="previewImageFn(index)" class='fujianImg'
-						:src="item" mode=""></image>
+					<view class="" v-for='(item,index) in imglist2'>
+						<view class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;"
+									src="../../../static/img/oa_office/img.png" mode=""></image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
+							</view>
+							<view class="img_dowload" @click="openDocument(item)">下载</view>
+						</view>
+					</view>
 				</view>
 			</view>
 			<view v-else class="">
@@ -246,6 +267,8 @@
 				id: "",
 				auditList: [],
 				url: "11",
+				imglist: [],
+				imglist2: []
 			}
 		},
 		onBackPress(e) {
@@ -268,6 +291,25 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
+		watch: {
+			imglist: {
+				handler: function() {
+					this.$api.doRequest('get', 'appendix/query/getFileList', {
+						appendixIds: this.imglist.toString()
+					}).then(res => {
+						this.imglist2 = res.data.data
+						for (let i = 0; i < this.imglist2.length; i++) {
+							if (this.imglist2[i].appendixName) {
+								let index = that.imglist[i].appendixName.lastIndexOf(".")//获取最后出现.的下标
+								that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								// this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		methods: {
 			previewImageFn(index) {
 				/* 预览图片 */
@@ -315,6 +357,22 @@
 					}
 				});
 			},
+			openDocument(src) {
+				console.log(src)
+				uni.downloadFile({
+					url: src.appendixPath,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			openXls() {
 				if (this.url && this.url != "ng") {
 					uni.downloadFile({
@@ -372,6 +430,9 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if (this.auditInfo.addressUrl) {
+							this.imglist = this.auditInfo.addressUrl.split(',')
+						}
 						if (this.auditInfo.addressUrl && this.auditInfo.addressUrl != '') {
 							this.auditInfo.srcList = this.auditInfo.addressUrl.split(',')
 						} else {
@@ -928,4 +989,31 @@
 		border: 1px solid #ccc;
 		margin: 5px;
 	}
+	
+	.char_css {
+		// text-align: center;
+		// width: 90px;
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+	
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

+ 132 - 108
pages/task/audit/purchasecontract.vue

@@ -2,227 +2,214 @@
 	<view class="container">
 		<u-form ref="uForm">
 			<view class="form_top">基本信息</view>
-			
+			<u-form-item label-width='260' label="合同编号" :borderBottom="false">
+				<u-input v-model="list.contractNo" input-align="right" placeholder="--" disabled />
+			</u-form-item>
+			<u-form-item label-width='260' label="交易主体" :borderBottom="false">
+				<u-input v-model="list.transactionSubject" input-align="right" placeholder="--" disabled />
+			</u-form-item>
 			<view class="form_view" style="background: #F9F9FA;">
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="结算方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.settlementMethod" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='150' label="交货方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.deliverType1" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.deliverType1" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="货名" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='150' label="品级" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='200' label="容重(克/升)>=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='200' label="水分(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='200' label="热损伤(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='200' label="杂质(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
-						</u-form-item>
-					</u-col>
-				</u-row>
-				<u-row customStyle="margin-bottom: 10px;">
-					<u-col span="6">
-						<u-form-item label-width='200' label="霉变粒(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled />
-						</u-form-item>
-					</u-col>
-					<u-col span="6">
-						<u-form-item label-width='230' label="不完善粒(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='200' label="霉变粒(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
-						<u-form-item label-width='200' label="不完善粒(%)<=" class="label_css" :borderBottom="false">
-							<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled />
+						<u-form-item label-width='260' label="不完善粒(%)<=" class="label_css" :borderBottom="false">
+							<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="运输方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.shippingType" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='150' label="包装方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.packingMethod" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.packingMethod" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
 				<u-row customStyle="margin-bottom: 10px;">
 					<u-col span="6">
 						<u-form-item label-width='150' label="验收方式" class="label_css" :borderBottom="false">
-							<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 					<u-col span="6">
 						<u-form-item label-width='150' label="重量(吨)" class="label_css" :borderBottom="false">
-							<u-input v-model="list.weight" input-align="right" placeholder="" disabled />
+							<u-input v-model="list.weight" input-align="right" placeholder="--" disabled />
 						</u-form-item>
 					</u-col>
 				</u-row>
-				
-				
-				
-				
-			
-				
 			</view>
-			
-			<u-form-item label-width='260' label="合同编号">
-				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="买方" :borderBottom="false">
+				<u-input v-model="list.buyer" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交易主体">
-				<u-input v-model="list.transactionSubject" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="买方电话" :borderBottom="false">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="买方">
-				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="卖方" :borderBottom="false">
+				<u-input v-model="list.seller" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="卖方电话" :borderBottom="false">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方">
-				<u-input v-model="list.seller" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交货日期(起)" :borderBottom="false">
+				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="溢短装(%)" :borderBottom="false">
+				<u-input v-model="list.overShort" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			
-			
-			
-			<u-form-item label-width='260' label="交货日期(起)">
-				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交货日期(止)" :borderBottom="false">
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="溢短装(%)">
-				<u-input v-model="list.overShort" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同单价(元/吨)" :borderBottom="false">
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货日期(止)">
-				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同总价(元)" :borderBottom="false">
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合同单价(元/吨)">
-				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="合同总价(元)">
-				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' label="货源所在地区">
+			<u-form-item label-width='260' label="货源所在地区" :borderBottom="false">
 				<view class="textCss">
 					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' label="货源详细地址">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="货源详细地址" :borderBottom="false">
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="交货地所在地区">
+			<u-form-item label-width='260' label="交货地所在地区" :borderBottom="false">
 				<view class="textCss">
 					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="交货地详细地址" :borderBottom="false">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="签订日期">
-				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="签订日期" :borderBottom="false">
+				<u-input v-model="list.signingDate" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="最终实际交易量(吨)">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='300' label="最终实际交易量(吨)" :borderBottom="false">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
-				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled />
+			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人" :borderBottom="false">
+				<u-input v-model="list.personCharge" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' label="结算单价(元/吨)">
-				<u-input v-model="list.settlementPrice" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='300' label="结算单价(元/吨)" :borderBottom="false">
+				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			
-			
-			
-			
-			
-			
-			
-			
-			<u-form-item label-width='260' label="合同收入(元)">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="合同收入(元)" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="已开发票(元)">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="已开发票(元)" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="费用支出(元)">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="费用支出(元)" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未开发票(元)">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="未开发票(元)" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="未回款(元)">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="未回款(元)" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="双章原件回收情况">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled />
+			<u-form-item label-width='260' label="双章原件回收情况" :borderBottom="false">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="备注信息">
+			<u-form-item label-width='260' label="备注信息" :borderBottom="false">
 			</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='260' 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" @on-uploaded="isAdd = true" :before-upload="filterFileType"
 						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view> -->
+				<view class="fujian_title">共{{imglist.length}}个附件</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 class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
+								</image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
+							</view>
+							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
+								下载
+							</view>
 						</view>
 						<!-- <u-icon name="attach" ></u-icon> -->
 						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
+					</view>
 				</view>
-				</view>
-			</u-form-item>
+			<!-- </u-form-item> -->
 			<view class="content2">
 				<view class="title row">
 					流程
@@ -406,6 +393,12 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist=res1.data.data
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") //获取最后出现.的字符
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
 						})
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'BUY-CONTRACT-APPROVE',
@@ -615,7 +608,7 @@
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
-			font-size: 20rpx;
+			font-size: 26rpx;
 			color: #878C9C;
 		}
 	}
@@ -963,10 +956,41 @@
 		
 	}
 	.label_css{
-		font-size: 20rpx;
+		font-size: 26rpx;
 		color: #878C9C;
 	}
 	.input_css{
 		font-size: 20rpx;
 	}
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+	.fujian_title{
+		font-size: 34rpx;
+		margin-top: 20px;
+		font-weight: 600;
+		// margin-left: 10px;
+	}
+	
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>

+ 65 - 9
pages/task/audit/salecontract.vue

@@ -191,7 +191,7 @@
 			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="暂无备注信息" disabled />
 			</u-form-item>
-			<u-form-item label-width='90' 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"
@@ -201,19 +201,38 @@
 				<!-- <view v-for='item in imglist'>
 					<image style='width:100px;height:100px;' :src="item" mode=""></image>
 				</view> -->
+				<view class="fujian_title">共{{imglist.length}}个附件</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 class="img_item">
+							<view class="" style="width: 16%;">
+								<image
+									v-if="item.type == 'pdf'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/pdf3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/excle3.png"
+									mode=""></image>
+								<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+									style="width: 40px; height: 40px;" src="../../../static/img/oa_office/word3.png"
+									mode=""></image>
+								<image v-else style="width: 40px; height: 40px;" :src="item.appendixPath" mode="">
+								</image>
+							</view>
+							<view class="" style="width: 70%;">
+								<view class="char_css">{{item.appendixName}}</view>
+								<view class="">{{item.appendixSize}}</view>
+							</view>
+							<view style="color: #19be6b;text-decoration:underline;" class="img_dowload" @click="openDocument(item)">
+								下载
+							</view>
 						</view>
+						
 						<!-- <u-icon name="attach" ></u-icon> -->
 						<!-- <image style='width: 200rpx;height: 200rpx;' :src="item" mode=""></image> -->
 					</view>
 				</view>
-			</u-form-item>
+			<!-- </u-form-item> -->
 			<view class="content2">
 				<view class="title row">
 					流程
@@ -411,6 +430,12 @@
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
 							that.imglist = res1.data.data
+							for (let i = 0; i < that.imglist.length; i++) {//获取后缀
+								if (that.imglist[i].appendixName) {
+									let index = that.imglist[i].appendixName.lastIndexOf(".") 
+									that.imglist[i].type = that.imglist[i].appendixName.substring(index+1)
+								}
+							}
 						})
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
 							businessCode: 'SALE-CONTRACT-APPROVE',
@@ -665,7 +690,7 @@
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
-			font-size: 20rpx;
+			font-size: 26rpx;
 			color: #878C9C;
 		}
 	}
@@ -1038,7 +1063,7 @@
 		
 	}
 	.label_css{
-		font-size: 20rpx;
+		font-size: 26rpx;
 		color: #878C9C;
 	}
 	.input_css{
@@ -1047,4 +1072,35 @@
 	/deep/.uni-textarea-wrapper{
 		height:200px;
 	}
+	.char_css {
+		font-size: 30rpx;
+		font-weight: 600;
+		display: -webkit-box;
+		overflow: hidden;
+		/*! autoprefixer: off; */
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+		text-overflow: ellipsis;
+		word-break: break-all;
+	}
+	.fujian_title{
+		font-size: 34rpx;
+		margin-top: 20px;
+		font-weight: 600;
+		// margin-left: 10px;
+	}
+	
+	.img_item {
+		display: flex;
+		width: 100%;
+		margin: 10px 0;
+		padding: 0 10rpx;
+	
+		.img_dowload {
+			width: 14%;
+			color: #22C572;
+			text-align: right;
+		}
+	}
 </style>