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

# Conflicts:
#	components/selectAddress.vue
#	pages/business/businessNew.vue
#	pages/business/release.vue

config/index.js

@@ -1,10 +1,10 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrl: 'http://localhost:8080/',
-	baseUrlNew: 'http://192.168.110.67:9100/',
+	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的

manifest.json

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

pages.json

@@ -716,7 +716,9 @@
 		{
 			"path": "pages/business/businessNew",
 			"style": {
+				// "navigationStyle": "custom",
 				"navigationBarTitleText": "交易",
+				"enablePullDownRefresh": true,
 				"titleNView": {
 					"autoBackButton": false,
 					"backgroundColor": "#fff",

pages/erpbusiness/add_quality_testing.vue

@@ -1073,6 +1073,15 @@
 			groupChange(e) {
 				console.log(e,this.gridListInit)
 				this.gridListInit.warehouseName=this.gridList.warehouseName
+				if (uni.getStorageSync('checkcustomer')) {
+					uni.setStorageSync('checkcustomer','')
+						this.gridListInit.identityId =''
+						this.gridListInit.customerName =''
+						this.gridListInit.customerPhone =''
+						this.gridListInit.carNumber = ''
+						this.gridListInit.customerNumberCard = ''
+						this.$forceUpdate()
+				}
 				// this.gridList = JSON.parse(JSON.stringify(this.gridListInit))
 				this.gridList = this.$u.deepClone(this.gridListInit)
 				this.gridList.serviceManagementType = e
@@ -1096,6 +1105,8 @@
 					console.log(res)
 					this.taskNolist = res.data.data
 				})
+				
+				console.log(this.gridList,111111111111)
 			},
 			outtypepicker(e, status) {
 				if (status == 0) {

pages/erpbusiness/sendCommand.vue

@@ -206,239 +206,179 @@
 				//编号
 				// command.rowSpace(10);
 				if (that.gridList.qualityNo) {
-					command.setText(that.gridList.qualityNo.substring(that.gridList.qualityNo.length - 3));
 					command.bold(3); //加粗
-					command.setFontSize(0); //字体大小
+					command.setFontSize(36); //字体大小
 					command.setSelectJustification(1) //居中
 					command.rowSpace(200);
-					command.setPrint();
-					// command.rowSpace(60);
-					// command.bold(0); //取消加粗
-					// command.setFontSize(0); //正常字体
+					command.setText(that.gridList.qualityNo.substring(that.gridList.qualityNo.length - 3));
+				} else {
+					uni.showToast('编号错误！')
 				}
 
 
-				// 标题
+				command.setPrint();
+				command.rowSpace(60);
+				command.bold(0); //取消加粗
+				command.setFontSize(0); //正常字体
 
-				command.setText("粮食质检单");
+				// 标题
 				command.bold(1); //加粗
-				command.setFontSize(0); //字体大小
+				command.setFontSize(16); //字体大小
 				command.setSelectJustification(1) //居中
-				command.rowSpace(60);
 				// command.rowSpace(10);
+				command.setText("粮食质检单");
 				command.setPrint();
-
+				command.rowSpace(60);
+				command.bold(0); //取消加粗
+				command.setFontSize(0); //正常字体
 				// 二维码
+				command.rowSpace(60);
 				command.setSelectSizeOfModuleForQRCode(5);
 				command.setSelectErrorCorrectionLevelForQRCode(7)
 				command.setStoreQRCodeData(that.gridList.compId + '&' + that.gridList.qualityNo + '&' + that.gridList
 					.warehouseId);
-				command.rowSpace(60);
 				command.setPrintQRCode();
-
 				//客户姓名
-
-				command.setText("客户姓名:" + that.gridList.customerName);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("客户姓名:" + that.gridList.customerName);
 				command.setPrint();
 				//客户身份证
-
-				command.setText("客户身份证:" + that.gridList.customerNumberCard);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("客户身份证:" + that.gridList.customerNumberCard);
 				command.setPrint();
-
 				//客户电话
-
-				command.setText("客户电话:" + that.gridList.customerPhone);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("客户电话:" + that.gridList.customerPhone);
 				command.setPrint();
-
 				//车牌号
-
-				command.setText("车牌号:" + that.gridList.carNumber);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("车牌号:" + that.gridList.carNumber);
 				command.setPrint();
-
 				if (that.gridList.boxNo) {
 					//箱号
-
-					command.setText("箱号-1:" + that.gridList.boxNo);
-					command.setFontSize(0); //字体大小
 					command.setSelectJustification(0); //居左
 					command.setLeftMargin(30)
+					command.setText("箱号-1:" + that.gridList.boxNo);
 					command.setPrint();
 				}
 				if (that.gridList.boxNoOther) {
 					//箱号
-
-					command.setText("箱号-2:" + that.gridList.boxNoOther);
-					command.setFontSize(0); //字体大小
 					command.setSelectJustification(0); //居左
 					command.setLeftMargin(30)
+					command.setText("箱号-2:" + that.gridList.boxNoOther);
 					command.setPrint();
 				}
 				if (that.gridList.titleNo) {
 					//封号
-
-					command.setText("封号-1:" + that.gridList.titleNo);
-					command.setFontSize(0); //字体大小
 					command.setSelectJustification(0); //居左
 					command.setLeftMargin(30)
+					command.setText("封号-1:" + that.gridList.titleNo);
 					command.setPrint();
 				}
 				if (that.gridList.titleNoOther) {
 					//封号
-
-					command.setText("封号-2:" + that.gridList.titleNoOther);
-					command.setFontSize(0); //字体大小
 					command.setSelectJustification(0); //居左
 					command.setLeftMargin(30)
+					command.setText("封号-2:" + that.gridList.titleNoOther);
 					command.setPrint();
 				}
 				//仓位号
-
-				command.setText("仓位号:" + that.gridList.binNumber);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("仓位号:" + that.gridList.binNumber);
 				command.setPrint();
 				//收货单位
-
-				command.setText("收货单位:" + that.gridList.compName);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("收货单位:" + that.gridList.compName);
 				command.setPrint();
 				//联系人
-
-				command.setText("联系人:" + that.gridList.person);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("联系人:" + that.gridList.person);
 				command.setPrint();
-
 				//联系电话
-
-				command.setText("联系电话:" + that.gridList.personPhone);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("联系电话:" + that.gridList.personPhone);
 				command.setPrint();
-
 				//货名
-				command.setText("货名:" + that.gridList.goodsName);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("货名:" + that.gridList.goodsName);
 				command.setPrint();
-
 				//类型
-
-				command.setText("类型:" + that.gridList.type);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("类型:" + that.gridList.type);
 				command.setPrint();
-
 				//容量
-
-				command.setText("容量(克/升):" + that.gridList.bulkDensity);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("容量(克/升):" + that.gridList.bulkDensity);
 				command.setPrint();
-
 				//不完善粒
-
-				command.setText("不完善粒(%):" + that.gridList.imperfectGrain);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("不完善粒(%):" + that.gridList.imperfectGrain);
 				command.setPrint();
-
 				//等级
-
-				command.setText("等级:" + that.gridList.grade);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("等级:" + that.gridList.grade);
 				command.setPrint();
-
 				//水分
-				command.setText("水分(%):" + that.gridList.waterContent);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("水分(%):" + that.gridList.waterContent);
 				command.setPrint();
 				//热损伤
-
-				command.setText("热损伤(%):" + that.gridList.jiaorenli);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("热损伤(%):" + that.gridList.jiaorenli);
 				command.setPrint();
 				//单价
+				command.setSelectJustification(0); //居左
+				command.setLeftMargin(30)
 				if (that.gridList.type == '潮粮') {
 					command.setText("单价(元/公斤):" + that.gridList.tidalGrainPrice);
-					command.setFontSize(0); //字体大小
-					command.setSelectJustification(0); //居左
-					command.setLeftMargin(30)
-					command.setPrint();
+				} else {
+					command.setText("单价(元/公斤):" + that.gridList.dryGrainPrice);
 				}
-
+				command.setPrint();
 				//杂质
-
-				command.setText("杂质(%):" + that.gridList.impurity);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("杂质(%):" + that.gridList.impurity);
 				command.setPrint();
-
 				//霉变粒
-
-				command.setText("霉变粒(%):" + that.gridList.mildewGrain);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("霉变粒(%):" + that.gridList.mildewGrain);
 				command.setPrint();
-
 				//购粮性质
-				command.setText("购粮性质:" + that.gridList.natureOfGrainPurchase);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("购粮性质:" + that.gridList.natureOfGrainPurchase);
 				command.setPrint();
-
 				//仓位号
-
-				command.setText("仓位号:" + that.gridList.binNumber);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("仓位号:" + that.gridList.binNumber);
 				command.setPrint();
-
 				//囤位号
-
-				command.setText("囤位号:" + that.gridList.storageTagNo);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("囤位号:" + that.gridList.storageTagNo);
 				command.setPrint();
-
 				//质检员
-
-				command.setText("质检员:" + that.gridList.qualityInspector);
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("质检员:" + that.gridList.qualityInspector);
 				command.setPrint();
 				//客户签名
 				// command.rowSpace(100);
@@ -448,11 +388,9 @@
 				// command.setPrint();
 				// command.rowSpace(100);
 				//收货单位签名或盖章
-
-				command.setText("收货单位签名或盖章：");
-				command.setFontSize(0); //字体大小
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
+				command.setText("收货单位签名或盖章：");
 				command.setPrintAndFeed(150);
 				command.setPrintAndFeedRow(10);
 				that.isReceiptSend = true;
@@ -514,58 +452,60 @@
 						dataView.setUint8(i, buff[(currentTime - 1) * onTimeData + i])
 					}
 				}
-				console.log("第" + currentTime + "次发送数据大小为：" + buf.byteLength)
+				// console.log("第" + currentTime + "次发送数据大小为：" + buf.byteLength)
 
 				let {
 					BLEInformation
 				} = that.Bluetooth;
-
-				uni.writeBLECharacteristicValue({
-					deviceId: BLEInformation.deviceId,
-					serviceId: BLEInformation.writeServiceId,
-					characteristicId: BLEInformation.writeCharaterId,
-					value: buf,
-					success: function(res) {
-						if (currentTime <= loopTime) {
-							// wx.showLoading({
-							//   title: '传输中...',
-							// })
-						} else {
+				setTimeout(()=>{
+					uni.writeBLECharacteristicValue({
+						deviceId: BLEInformation.deviceId,
+						serviceId: BLEInformation.writeServiceId,
+						characteristicId: BLEInformation.writeCharaterId,
+						value: buf,
+						success: function(res) {
+							if (currentTime <= loopTime) {
+								// wx.showLoading({
+								//   title: '传输中...',
+								// })
+							} else {
+								uni.showToast({
+									title: '已打印第' + currentPrint + '张成功'
+								});
+							} //console.log(res)
+						},
+						fail: function(e) {
 							uni.showToast({
-								title: '已打印第' + currentPrint + '张成功'
+								title: '打印第' + currentPrint + '张失败',
+								icon: 'none'
 							});
-						} //console.log(res)
-					},
-					fail: function(e) {
-						uni.showToast({
-							title: '打印第' + currentPrint + '张失败',
-							icon: 'none'
-						}); //console.log(e)
-					},
-					complete: function() {
-						currentTime++;
-
-						if (currentTime <= loopTime) {
-							that.currentTime = currentTime
-
-							that.Send(buff);
-						} else {
-							if (currentPrint == printNum) {
-								that.looptime = 0
-								that.lastData = 0
-								that.currentTime = 1
-								that.isReceiptSend = false
-								that.currentPrint = 1
-							} else {
-								currentPrint++;
-								that.currentPrint = currentPrint
-								that.currentTime = 1
-
+							 console.log(e)
+						},
+						complete: function() {
+							currentTime++;
+					
+							if (currentTime <= loopTime) {
+								that.currentTime = currentTime
+					
 								that.Send(buff);
+							} else {
+								if (currentPrint == printNum) {
+									that.looptime = 0
+									that.lastData = 0
+									that.currentTime = 1
+									that.isReceiptSend = false
+									that.currentPrint = 1
+								} else {
+									currentPrint++;
+									that.currentPrint = currentPrint
+									that.currentTime = 1
+					
+									that.Send(buff);
+								}
 							}
 						}
-					}
-				});
+					})
+				},100);
 
 				// plus.bluetooth.writeBLECharacteristicValue({
 				// 	deviceId: BLEInformation.deviceId,

pages/task/audit/freight_settlement_approvalcopy.vue

@@ -24,7 +24,7 @@
 				<view>{{dataobj.contractNo}}</view>
 			</view>
 			<view class="person-info">
-				
+
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>收款方</view>
 					<view class="top_info">{{dataobj.payee}}</view>
@@ -43,65 +43,117 @@
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>备注</view>
-					<view class="top_info">{{dataobj.bankBranch}}</view>
+					<view class="top_info">{{dataobj.remark}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>合计</view>
 					<view class="top_info">{{num}}</view>
 				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>附件</view>
+					<view>
+						<view v-if='imglist2.length>0'>
+							<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/pdf3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+										style="width: 40px; height: 40px;" src="../../../static/img/excle3.png"
+										mode=""></image>
+									<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+										style="width: 40px; height: 40px;" src="../../../static/img/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 class="img_dowload" @click="openDocument(item)">下载</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			<view class="car-container">
-				<view v-for="item in list" class="car-container-item">
-					<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
-					</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">箱号{{item.boxNo}}
-					</view>
-					<view class="car-type-item">
-						<view class="left">装</view>
-						<view class="textInfo">{{item.loadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">卸</view>
-						<view class="textInfo">{{item.unloadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">结</view>
-						<view class="textInfo">{{item.settlementWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">预</view>
-						<view class="textInfo">{{item.transportPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">算</view>
-						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view v-if='item.deductionAmount>=0' class="right">扣</view>
-						<view v-if='item.deductionAmount<0' class="right">加</view>
-						<view v-if='item.deductionAmount<0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
-						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">服</view>
-						<view class="textInfo">{{item.serviceCharge}}元</view>
+				<view v-for="item1 in list" class="car-container-item">
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>运输编号</view>
+						<view class="top_info">{{item1.taskNo}}</view>
 					</view>
-					<view class="car-type-item">
-						<view class="center">税</view>
-						<view class="textInfo">{{item.taxPoint}}元</view>
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>发货地</view>
+						<view class="top_info">
+							{{item1.startPrivate}}{{item1.startCity}}{{item1.startArea}}{{item1.startDetailedAddress}}
+						</view>
 					</view>
-					<view class="car-type-item">
-						<view class="right">实</view>
-						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>收货地</view>
+						<view class="top_info">
+							{{item1.endPrivate}}{{item1.endCity}}{{item1.endArea}}{{item1.endDetailedAddress}}</view>
 					</view>
-					<view class="car-type-item">
-						<view class="left">合</view>
-						<view class="textInfo">{{item.totalPayable}}元</view>
+					<view v-for="item in item1.tranSettlementReportList" class="car-container-item">
+
+						<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})
+						</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">
+							仓位号{{item.boxNo}}
+						</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">
+							箱号{{item.boxNo}}
+						</view>
+						<view class="car-type-item">
+							<view class="left">装</view>
+							<view class="textInfo">{{item.loadingWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">卸</view>
+							<view class="textInfo">{{item.unloadingWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="right">结</view>
+							<view class="textInfo">{{item.settlementWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">预</view>
+							<view class="textInfo">{{item.transportPrice}}元/吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">算</view>
+							<view class="textInfo">{{item.settlementPrice}}元/吨</view>
+						</view>
+						<view class="car-type-item">
+							<view v-if='item.deductionAmount>=0' class="right">扣</view>
+							<view v-if='item.deductionAmount<0' class="right">加</view>
+							<view v-if='item.deductionAmount<0' class="textInfo">
+								{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+							<view v-if='item.deductionAmount>=0' class="textInfo">
+								{{item.deductionAmount?-item.deductionAmount:0}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">服</view>
+							<view class="textInfo">{{item.serviceCharge}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">税</view>
+							<view class="textInfo">{{item.taxPoint}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="right">实</view>
+							<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">合</view>
+							<view class="textInfo">{{item.totalPayable}}元</view>
+						</view>
 					</view>
 				</view>
-
 			</view>
 		</view>
 		<u-form ref="uForm">
@@ -131,14 +183,16 @@
 									<!-- <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>
+											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>
+											v-if='!item.commonStaffs1'>未审核</text>
+									</view>
 									<!-- <view  class="status success">吕波（已审核）</view> -->
 								</view>
 								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
@@ -208,12 +262,12 @@
 				list: {
 					approveStatus: "",
 				},
-				dataobj:{},
+				dataobj: {},
 				title: '',
-				num:0,
+				num: 0,
 				show: false,
 				height: 200,
-				auditList:[],
+				auditList: [],
 				auditMind: '',
 				autoHeight: true,
 				border: false,
@@ -221,6 +275,8 @@
 				customerName: "", //客户
 				shippingAddress: "", //发货地址
 				receivingAddress: "", //收货地址
+				imglist: [], //存
+				imglist2: [], //展示
 			}
 		},
 		onBackPress(e) {
@@ -237,24 +293,62 @@
 			this.isSHowBtn = options.isShowbtn
 			this.getList()
 		},
+		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) {
+								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		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('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			getList() {
-				var that =this
+				var that = this
 				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.dataobj=res.data.data
-						if(res.data.data.tranSettlementReportList.length>0){
-							this.num=0
-							for (var i = 0; i < res.data.data.tranSettlementReportList.length; i++) {
-								if(res.data.data.tranSettlementReportList[i].totalPayable){
-									this.num+=res.data.data.tranSettlementReportList[i].totalPayable	
+						this.dataobj = res.data.data
+						this.imglist = this.dataobj.freightAddressUrl.split(',')
+						if (res.data.data.tranTaskInfoList.length > 0) {
+							this.num = 0
+							for (var i = 0; i < res.data.data.tranTaskInfoList.length; i++) {
+								if (res.data.data.tranTaskInfoList[i].tranSettlementReportList) {
+									var data = res.data.data.tranTaskInfoList[i].tranSettlementReportList
+									for (var q = 0; q < data.length; q++) {
+										if (data[q].totalPayable) {
+											this.num += data[q].totalPayable
+										}
+									}
 								}
 							}
 						}
-						this.num=this.num.toFixed(2)
-						this.list = res.data.data.tranSettlementReportList
+						this.num = this.num.toFixed(2)
+						this.list = res.data.data.tranTaskInfoList
 						// console.log(this.list, 124)
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -330,8 +424,8 @@
 											response.data.data[i].operatorName = response.data
 												.data[i].workflowHistoricTasks[len].operatorName
 											var time = new Date(response.data.data[i]
-												.workflowHistoricTasks[len].claimTime)
-											.getTime()
+													.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]
@@ -347,7 +441,7 @@
 												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)
@@ -357,26 +451,26 @@
 											response.data.data[i].auditMind = ''
 										}
 									}
-						
+
 								}
 								console.log(response.data.data)
-								for(let i = 0 ;i<response.data.data.length;i++){
-									if(response.data.data[i].status == "error"){
+								for (let i = 0; i < response.data.data.length; i++) {
+									if (response.data.data[i].status == "error") {
 										this.auditCheck = "error"
 										break;
-									}else if(response.data.data[i].status == "question"){
+									} else if (response.data.data[i].status == "question") {
 										this.auditCheck = "question"
 										break;
-									}else{ 
+									} else {
 										this.auditCheck = "success"
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].createDate).getTime()
+								var time2 = new Date(this.dataobj.createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle: this.list[0].requester.substring(0, 2),
-									operatorName: this.list[0].requester,
+									operatorTitle: this.dataobj.creater.substring(0, 2),
+									operatorName: this.dataobj.creater,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',
@@ -413,7 +507,7 @@
 				// 		})
 				// 	}
 				// })
-				
+
 			},
 			close() {
 				this.show = false
@@ -475,7 +569,7 @@
 					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: list.taskId,
 						approved: status,
-						auditMind: this.auditMind ,
+						auditMind: this.auditMind,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						if (status == true) {
@@ -502,12 +596,13 @@
 		margin: 10rpx;
 		padding: 20rpx 20rpx 230rpx 20rpx;
 	}
+
 	.u-form {
 		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
-	
+
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
@@ -515,6 +610,7 @@
 			color: #878C9C;
 		}
 	}
+
 	.content {
 		.top {
 			display: flex;
@@ -539,8 +635,8 @@
 
 		.top_info {
 			margin: 10rpx 0;
-			width:70%;
-			text-align:right;
+			width: 70%;
+			text-align: right;
 		}
 
 		.title {
@@ -782,16 +878,17 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
+
 	.container {
 		padding: 20rpx 20rpx 250rpx 20rpx;
 	}
-	
+
 	.u-form {
 		margin-bottom: 20rpx;
 		background: #fff;
 		border-radius: 10px;
 		padding: 30rpx 10px;
-	
+
 		.u-form-item {
 			line-height: 30px;
 			padding: 0px 0;
@@ -799,22 +896,22 @@
 			color: #878C9C;
 		}
 	}
-	
+
 	.content {
 		margin-top: 30rpx;
-	
+
 		.top {
 			display: flex;
 			justify-content: space-between;
 		}
-	
+
 		.content-item {
 			border-radius: 20rpx;
 			background: white;
 			padding: 40rpx 20rpx;
 			margin-bottom: 30rpx;
 		}
-	
+
 		.title {
 			font-size: 32rpx;
 			font-weight: 600;
@@ -822,23 +919,23 @@
 			text-align: left;
 			margin: 20rpx 0;
 		}
-	
+
 		.car-container {
 			border-bottom: 2rpx solid #EEEEEE;
 		}
-	
+
 		.car-type-item {
 			font-size: 28rpx;
 			margin: 20rpx 0;
 			color: #878C9C;
 		}
-	
+
 		.weightInfoCss {
 			font-size: 28rpx;
 			color: #333333;
 			font-weight: 500;
 		}
-	
+
 		.row {
 			display: flex;
 			justify-content: space-between;
@@ -848,19 +945,19 @@
 			// 	// color: #333333;
 			// }
 		}
-	
+
 		.money {
 			font-size: 32rpx;
 			font-weight: 500;
 			margin-bottom: 30rpx;
 		}
-	
+
 		.moneyInfo {
 			color: #22C572;
 			font-size: 32rpx;
 		}
 	}
-	
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
@@ -870,43 +967,43 @@
 		left: 0;
 		background-color: #f8f8f8;
 		flex-direction: column;
-	
+
 		.btn1,
 		.btn2 {
 			width: 100%;
 			margin-bottom: 26rpx;
 			border-radius: 90rpx;
 		}
-	
+
 		.btn1 {
 			background: white;
 			color: #00C265;
 		}
 	}
-	
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-	
+
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-	
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-	
+
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
@@ -914,7 +1011,7 @@
 			}
 		}
 	}
-	
+
 	.shade {
 		position: fixed;
 		top: 0;
@@ -923,7 +1020,7 @@
 		width: 100%;
 		background: rgba(0, 0, 0, 0.4);
 		z-index: 3;
-	
+
 		.wrap {
 			position: absolute;
 			left: 0;
@@ -935,7 +1032,7 @@
 			width: calc(100% - 198rpx);
 			height: 700rpx;
 			border-radius: 20rpx;
-	
+
 			.alert-top {
 				padding: 33rpx;
 				display: flex;
@@ -943,20 +1040,20 @@
 				align-items: center;
 				position: relative;
 			}
-	
+
 			.title {
 				font-size: 32rpx;
 				font-weight: 600;
 				color: #333333;
 			}
-	
+
 			.close {
 				position: absolute;
 				right: 33rpx;
 			}
 		}
 	}
-	
+
 	.cancel,
 	.confirm {
 		position: absolute;
@@ -968,18 +1065,18 @@
 		border-top: 1px solid #eee;
 		font-size: 34rpx;
 	}
-	
+
 	.cancel {
 		left: 0;
 		border-right: 1px solid #eee;
 		color: #AFB3BF;
 	}
-	
+
 	.confirm {
 		right: 0;
 		color: #22C572;
 	}
-	
+
 	.textarea {
 		margin: 18rpx auto;
 		width: 100%;
@@ -989,7 +1086,7 @@
 		font-size: 28rpx;
 		padding: 10px;
 	}
-	
+
 	.textCss {
 		display: flex;
 		justify-content: flex-end;
@@ -997,7 +1094,7 @@
 		text-align: right;
 		color: #333333;
 	}
-	
+
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -1005,11 +1102,13 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-	
-		height:240px;
-		/deep/.uni-textarea-textarea{
+
+		height: 240px;
+
+		/deep/.uni-textarea-textarea {
 			width: 80%;
 		}
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;
@@ -1017,27 +1116,27 @@
 			color: #AFB3BF;
 		}
 	}
-	
+
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
-	
+
 	.content2 {
 		background: white;
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-	
+
 		.row {
 			display: flex;
-	
+
 			.row-left {
 				display: flex;
 				align-items: center;
-	
+
 				.item1 {
 					position: relative;
-	
+
 					.item-content {
 						background: #617AE0;
 						width: 44px;
@@ -1048,7 +1147,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-	
+
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -1057,27 +1156,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;
 					}
 				}
-	
+
 			}
-	
+
 			.row-right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-	
+
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -1086,33 +1185,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;
 						}
@@ -1120,10 +1219,10 @@
 				}
 			}
 		}
-	
+
 		.row2 {
 			display: flex;
-	
+
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -1136,119 +1235,138 @@
 				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;
 		}
 	}
-	
+
 	.form_top {
 		border-bottom: 1px solid #C7CAD6;
 		padding-bottom: 10px;
 		font-size: 30rpx;
 		font-weight: 600;
 	}
-	.form_view{
+
+	.form_view {
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		background: #F9F9FA;
 		padding: 30rpx 20rpx;
 	}
-	.label_css{
+
+	.label_css {
 		font-size: 26rpx;
 		color: #878C9C;
 	}
-	.input_css{
+
+	.input_css {
 		font-size: 20rpx;
 	}
-	/deep/.uni-textarea-wrapper{
-		height:200px;
+
+	/deep/.uni-textarea-wrapper {
+		height: 200px;
 	}
-	
+
 	// .fujian_title{
 	// 	font-size: 34rpx;
 	// 	margin-top: 20px;
 	// 	font-weight: 600;
 	// 	// margin-left: 10px;
 	// }
-	.headInfo{
+	.headInfo {
 		height: 100px;
 		background-color: #FFFFFF;
 		margin-bottom: 20rpx;
 		border-radius: 10px;
 		padding: 30rpx 10px;
 		display: flex;
-		.headInfo_left{
+
+		.headInfo_left {
 			width: 10%;
 			line-height: 60px;
 			text-align: center;
 		}
-		.headInfo_middle{
+
+		.headInfo_middle {
 			width: 70%;
 			padding-left: 10px;
 		}
-		.headInfo_right{
+
+		.headInfo_right {
 			width: 20%;
 			line-height: 60px;
-			.char_a{
+
+			.char_a {
 				color: #22C572;
 			}
-			.char_b{
-				 color: #FE6430;
+
+			.char_b {
+				color: #FE6430;
 			}
-			.char_c{
+
+			.char_c {
 				color: #FB2323;
 			}
-			.char_a,.char_b,.char_c{
+
+			.char_a,
+			.char_b,
+			.char_c {
 				font-size: 16px;
 			}
 		}
-		.adopt{
+
+		.adopt {
 			position: absolute;
 			right: 30px;
 			top: 60px;
-			.adopt_img{
+
+			.adopt_img {
 				width: 90px;
 				height: 90px;
 			}
 		}
-		.headInfo_title{
+
+		.headInfo_title {
 			font-size: 19px;
 			color: #333333;
 			font-weight: 600;
 		}
-		.headInfo_No{
+
+		.headInfo_No {
 			color: #878C9C;
 			font-size: 13px;
 			margin-top: 10px;
 		}
 	}
-	
+
 	.img_item {
 		display: flex;
 		width: 100%;
 		margin: 10px 0;
 		padding: 0 10rpx;
-		.imgsign{
+
+		.imgsign {
 			width: 25px;
 			height: 25px;
 			margin-top: 6px;
 		}
+
 		.char_css {
 			font-size: 28rpx;
 			font-weight: 600;
@@ -1261,12 +1379,13 @@
 			text-overflow: ellipsis;
 			word-break: break-all;
 		}
-		.img_size{
+
+		.img_size {
 			color: #B0B3BF;
 			font-size: 12px;
 			margin-top: 5px;
 		}
-	
+
 		.img_dowload {
 			width: 14%;
 			color: #22C572;

pages/task/audit/freight_settlement_detailscopy.vue

@@ -24,7 +24,7 @@
 				<view>{{dataobj.contractNo}}</view>
 			</view>
 			<view class="person-info">
-				
+
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>收款方</view>
 					<view class="top_info">{{dataobj.payee}}</view>
@@ -43,65 +43,118 @@
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>备注</view>
-					<view class="top_info">{{dataobj.bankBranch}}</view>
+					<view class="top_info">{{dataobj.remark}}</view>
 				</view>
 				<view style='display:flex;align-items: center;' class="top1">
 					<view>合计</view>
 					<view class="top_info">{{num}}</view>
 				</view>
+				<view style='display:flex;align-items: center;' class="top1">
+					<view>附件</view>
+					<view>
+						<view v-if='imglist2.length>0'>
+							<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/pdf3.png" mode=""></image>
+										<image v-else-if="item.type == 'xls'||item.type == 'xlsx'"
+											style="width: 40px; height: 40px;" src="../../../static/img/excle3.png"
+											mode=""></image>
+										<image v-else-if="item.type == 'doc'||item.type == 'docx'"
+											style="width: 40px; height: 40px;" src="../../../static/img/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 class="img_dowload" @click="openDocument(item)">下载</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			<view class="car-container">
-				<view v-for="item in list" class="car-container-item">
-					<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
-					</view>
-					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">箱号{{item.boxNo}}
+				<view v-for="item1 in list" class="car-container-item">
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>运输编号</view>
+						<view class="top_info">{{item1.taskNo}}</view>
 					</view>
-					<view class="car-type-item">
-						<view class="left">装</view>
-						<view class="textInfo">{{item.loadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">卸</view>
-						<view class="textInfo">{{item.unloadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">结</view>
-						<view class="textInfo">{{item.settlementWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">预</view>
-						<view class="textInfo">{{item.transportPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">算</view>
-						<view class="textInfo">{{item.settlementPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view v-if='item.deductionAmount>=0' class="right">扣</view>
-						<view v-if='item.deductionAmount<0' class="right">加</view>
-						<view v-if='item.deductionAmount<0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
-						<view v-if='item.deductionAmount>=0' class="textInfo">{{item.deductionAmount?-item.deductionAmount:0}}元</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">服</view>
-						<view class="textInfo">{{item.serviceCharge}}元</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">税</view>
-						<view class="textInfo">{{item.taxPoint}}元</view>
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>发货地</view>
+						<view class="top_info">
+							{{item1.startPrivate}}{{item1.startCity}}{{item1.startArea}}{{item1.startDetailedAddress}}
+						</view>
 					</view>
-					<view class="car-type-item">
-						<view class="right">实</view>
-						<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+					<view style='display:flex;align-items: center;' class="top1">
+						<view>收货地</view>
+						<view class="top_info">
+							{{item1.endPrivate}}{{item1.endCity}}{{item1.endArea}}{{item1.endDetailedAddress}}
+						</view>
 					</view>
-					<view class="car-type-item">
-						<view class="left">合</view>
-						<view class="textInfo">{{item.totalPayable}}元</view>
+					<view v-for="item in item1.tranSettlementReportList" class="car-container-item">
+						<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})
+						</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">
+							仓位号{{item.boxNo}}
+						</view>
+						<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">
+							箱号{{item.boxNo}}
+						</view>
+						<view class="car-type-item">
+							<view class="left">装</view>
+							<view class="textInfo">{{item.loadingWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">卸</view>
+							<view class="textInfo">{{item.unloadingWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="right">结</view>
+							<view class="textInfo">{{item.settlementWeight}}吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">预</view>
+							<view class="textInfo">{{item.transportPrice}}元/吨</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">算</view>
+							<view class="textInfo">{{item.settlementPrice}}元/吨</view>
+						</view>
+						<view class="car-type-item">
+							<view v-if='item.deductionAmount>=0' class="right">扣</view>
+							<view v-if='item.deductionAmount<0' class="right">加</view>
+							<view v-if='item.deductionAmount<0' class="textInfo">
+								{{item.deductionAmount?-item.deductionAmount:0}}元
+							</view>
+							<view v-if='item.deductionAmount>=0' class="textInfo">
+								{{item.deductionAmount?-item.deductionAmount:0}}元
+							</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">服</view>
+							<view class="textInfo">{{item.serviceCharge}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="center">税</view>
+							<view class="textInfo">{{item.taxPoint}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="right">实</view>
+							<view class="textInfo">{{item.amountActuallyPaid}}元</view>
+						</view>
+						<view class="car-type-item">
+							<view class="left">合</view>
+							<view class="textInfo">{{item.totalPayable}}元</view>
+						</view>
 					</view>
 				</view>
-	
 			</view>
 		</view>
 		<u-form ref="uForm">
@@ -131,14 +184,16 @@
 									<!-- <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>
+											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>
+											v-if='!item.commonStaffs1'>未审核</text>
+									</view>
 									<!-- <view  class="status success">吕波（已审核）</view> -->
 								</view>
 								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0'
@@ -202,39 +257,80 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
-				num:0,
+				num: 0,
 				list: {
 					approveStatus: "",
 				},
-				show:false,
-				auditList:[],
-				dataobj:{},
+				show: false,
+				auditList: [],
+				dataobj: {},
 				customerName: "", //客户
 				shippingAddress: "", //发货地址
 				receivingAddress: "", //收货地址
+				imglist: [], //存
+				imglist2: [], //展示
 			}
 		},
 		onLoad(options) {
 			this.id = options.id
 			this.getList()
 		},
+		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) {
+								this.imglist2[i].type = this.imglist2[i].appendixName.split(".")[1]
+							}
+						}
+					})
+				},
+				deep: true
+			}
+		},
 		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('打开文档成功');
+							}
+						});
+					}
+				});
+			},
 			getList() {
+				var that = this
 				this.$api.doRequest('get', '/expenseInfo/ExpenseInfo', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						this.dataobj=res.data.data
-						if(res.data.data.tranSettlementReportList.length>0){
-							this.num=0
-							for (var i = 0; i < res.data.data.tranSettlementReportList.length; i++) {
-								if(res.data.data.tranSettlementReportList[i].totalPayable){
-									this.num+=res.data.data.tranSettlementReportList[i].totalPayable	
+						this.dataobj = res.data.data
+						this.imglist = this.dataobj.freightAddressUrl.split(',')
+						if (res.data.data.tranTaskInfoList.length > 0) {
+							this.num = 0
+							for (var i = 0; i < res.data.data.tranTaskInfoList.length; i++) {
+								if (res.data.data.tranTaskInfoList[i].tranSettlementReportList) {
+									var data = res.data.data.tranTaskInfoList[i].tranSettlementReportList
+									for (var q = 0; q < data.length; q++) {
+										if (data[q].totalPayable) {
+											this.num += data[q].totalPayable
+										}
+									}
 								}
 							}
 						}
-						this.num=this.num.toFixed(2)
-						this.list = res.data.data.tranSettlementReportList
+						this.num = this.num.toFixed(2)
+						this.list = res.data.data.tranTaskInfoList
 						// console.log(this.list, 124)
 						// 查流程
 						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -243,7 +339,8 @@
 						}).then(res1 => {
 							this.$api.doRequest('get', '/commonUser/getHis', {
 								workflowId: res1.data.data[0].id,
-								businessKey: this.id
+								businessKey: this.id,
+								// branch:that.list[0].jointVentureParties?that.list[0].jointVentureParties:'zt'
 							}).then(response => {
 								uni.hideLoading()
 								for (let i = 0; i < response.data.data.length; i++) {
@@ -309,8 +406,8 @@
 											response.data.data[i].operatorName = response.data
 												.data[i].workflowHistoricTasks[len].operatorName
 											var time = new Date(response.data.data[i]
-												.workflowHistoricTasks[len].claimTime)
-											.getTime()
+													.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]
@@ -326,7 +423,7 @@
 												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)
@@ -336,26 +433,26 @@
 											response.data.data[i].auditMind = ''
 										}
 									}
-						
+
 								}
 								console.log(response.data.data)
-								for(let i = 0 ;i<response.data.data.length;i++){
-									if(response.data.data[i].status == "error"){
+								for (let i = 0; i < response.data.data.length; i++) {
+									if (response.data.data[i].status == "error") {
 										this.auditCheck = "error"
 										break;
-									}else if(response.data.data[i].status == "question"){
+									} else if (response.data.data[i].status == "question") {
 										this.auditCheck = "question"
 										break;
-									}else{ 
+									} else {
 										this.auditCheck = "success"
 									}
 								}
 								this.auditList = response.data.data
-								var time2 = new Date(this.list[0].createDate).getTime()
+								var time2 = new Date(this.dataobj.createDate).getTime()
 								var time3 = this.$u.timeFormat(time2, 'mm.dd hh:MM')
 								this.auditList.unshift({
-									operatorTitle: this.list[0].requester.substring(0, 2),
-									operatorName: this.list[0].requester,
+									operatorTitle: this.dataobj.creater.substring(0, 2),
+									operatorName: this.dataobj.creater,
 									updateDate: time3,
 									auditMind: '',
 									desc: '发起申请',
@@ -374,11 +471,11 @@
 				// }).then(res => {
 				// 	this.contractNo = res.data.data.contractNo
 				// 	this.carId = res.data.data.carId
-				// 	this.customerName =  res.data.data.customer
+				// 	this.customerName = res.data.data.customer
 				// 	this.shippingAddress = res.data.data.send
 				// 	this.receivingAddress = res.data.data.receive
 				// 	if (res.data.code == 200) {
-				// 		this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+				// 		this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
 				// 			compId: "2710b21efc1e4393930c5dc800010dc4",
 				// 			currentPage: this.currentPage,
 				// 			pageSize: this.pageSize,
@@ -387,10 +484,12 @@
 				// 		}).then(res => {
 				// 			if (res.data.code == 200) {
 				// 				this.list = res.data.data.records[0]
+				// 				console.log(this.list, 124)
 				// 			}
 				// 		})
 				// 	}
 				// })
+
 			},
 			fanHui() {
 				uni.navigateBack()
@@ -528,25 +627,25 @@
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-	
+
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-	
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-	
+
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;
@@ -571,22 +670,23 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+
 	.content2 {
 		background: white;
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-	
+
 		.row {
 			display: flex;
-	
+
 			.row-left {
 				display: flex;
 				align-items: center;
-	
+
 				.item1 {
 					position: relative;
-	
+
 					.item-content {
 						background: #617AE0;
 						width: 44px;
@@ -597,7 +697,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-	
+
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -606,27 +706,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;
 					}
 				}
-	
+
 			}
-	
+
 			.row-right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-	
+
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -635,33 +735,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;
 						}
@@ -669,10 +769,10 @@
 				}
 			}
 		}
-	
+
 		.row2 {
 			display: flex;
-	
+
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -685,29 +785,36 @@
 				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;
 		}
 	}
+
 	.top_info {
 		margin: 10rpx 0;
-		width:70%;
-		text-align:right;
+		width: 70%;
+		text-align: right;
+	}
+
+	.img_dowload {
+		width: 14%;
+		color: #22C572;
+		text-align: right;
 	}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -45,7 +45,7 @@
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
-					<td>容重(g/L)</td>
+					<td>{{list.goodsName!='大豆' ? '容重(g/L)' : '蛋白(g/L)'}}</td>
 					<td>价格(元/公斤)</td>
 				</tr>
 				<tr v-for="(item,index) in list.detailPrints">

pages/task/audit/warehouse_details.vue

@@ -45,7 +45,7 @@
 			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
-					<td>容重(g/L)</td>
+					<td>{{list.goodsName!='大豆' ? '容重(g/L)' : '蛋白(g/L)'}}</td>
 					<td>价格(元/公斤)</td>
 				</tr>
 				<tr v-for="(item,index) in list.detailPrints">

pages/user/newReport.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="status_bar"></view>
 		<view class="top-nav">
-			<u-icon name="arrow-left" size="38" class="back" @click="back"></u-icon>
+			<uni-icons class="back" type="back" size="25" @click="back"></uni-icons>
 			<view class="right" :class="index==2?'nav-active':''" @click="navClick(2)">
 				新季
 			</view>
@@ -530,7 +530,7 @@
 				},
 				opts2: {
 					color: ["#D2F3E2", "#22C572"],
-					padding: [15, 30, 0, 5],
+					padding: [15, 20, 0, 5],
 					legend: {
 						fontSize: 12,
 						position: 'top',
@@ -1068,7 +1068,7 @@
 					}
 				} else {
 					if (val[1].biViewInfoList && val[1].biViewInfoList.length > 0) {
-
+						this.ym1Change = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].name.replace(/-/g, ".");
 						this.ym1 = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].name
 						this.sr = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].weight
 						this.zc = val[3].biViewInfoList[val[3].biViewInfoList.length - 1].weight
@@ -1706,7 +1706,7 @@
 	.back {
 		position: absolute;
 		left: 20rpx;
-		top: 0;
+		top: 25%;
 		bottom: 0;
 		margin: auto;
 	}