前端

config/index.js

@@ -10,9 +10,9 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/sendCommand.vue

@@ -14,7 +14,6 @@
 				<button type='primary' class="btn" @tap='goToList'>返回列表页</button>
 				<!-- <button type='primary' @tap='labelTest' :loading='isLabelSend' :disabled='isLabelSend'>标签测试</button> -->
 			</view>
-
 			<view style='margin-top:4%;display: flex;flex-direction: row;'>
 				<!-- hidden='true' -->
 				<canvas canvas-id='edit_area_canvas'
@@ -209,17 +208,19 @@
 					command.bold(3); //加粗
 					command.setFontSize(36); //字体大小
 					command.setSelectJustification(1) //居中
-					command.rowSpace(200);
+					command.rowSpace(100);
 					command.setText(that.gridList.qualityNo.substring(that.gridList.qualityNo.length - 3));
 				} else {
 					uni.showToast('编号错误！')
+					command.bold(3); //加粗
+					command.setFontSize(36); //字体大小
+					command.setSelectJustification(1) //居中
+					command.rowSpace(100);
+					command.setText("编号错误"+that.gridList.qualityNo);
 				}
 
 
 				command.setPrint();
-				command.rowSpace(60);
-				command.bold(0); //取消加粗
-				command.setFontSize(0); //正常字体
 
 				// 标题
 				command.bold(1); //加粗
@@ -246,12 +247,12 @@
 				//客户身份证
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
-				command.setText("客户身份证:" + that.gridList.customerNumberCard);
+				command.setText("客户身份证:" + that.gridList.weighingManagement.customerNumberCard);
 				command.setPrint();
 				//客户电话
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
-				command.setText("客户电话:" + that.gridList.customerPhone);
+				command.setText("客户电话:" + that.gridList.weighingManagement.customerPhone);
 				command.setPrint();
 				//车牌号
 				command.setSelectJustification(0); //居左
@@ -294,18 +295,18 @@
 				//收货单位
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
-				command.setText("收货单位:" + that.gridList.compName);
+				command.setText("收货仓库:" + that.gridList.weighingManagement.warehouseName);
 				command.setPrint();
 				//联系人
-				command.setSelectJustification(0); //居左
-				command.setLeftMargin(30)
-				command.setText("联系人:" + that.gridList.person);
-				command.setPrint();
+				// command.setSelectJustification(0); //居左
+				// command.setLeftMargin(30)
+				// command.setText("联系人:" + that.gridList.person);
+				// command.setPrint();
 				//联系电话
-				command.setSelectJustification(0); //居左
-				command.setLeftMargin(30)
-				command.setText("联系电话:" + that.gridList.personPhone);
-				command.setPrint();
+				// command.setSelectJustification(0); //居左
+				// command.setLeftMargin(30)
+				// command.setText("联系电话:" + that.gridList.personPhone);
+				// command.setPrint();
 				//货名
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)
@@ -361,10 +362,10 @@
 				command.setText("霉变粒(%):" + that.gridList.mildewGrain);
 				command.setPrint();
 				//购粮性质
-				command.setSelectJustification(0); //居左
-				command.setLeftMargin(30)
-				command.setText("购粮性质:" + that.gridList.natureOfGrainPurchase);
-				command.setPrint();
+				// command.setSelectJustification(0); //居左
+				// command.setLeftMargin(30)
+				// command.setText("购粮性质:" + that.gridList.natureOfGrainPurchase);
+				// command.setPrint();
 				//仓位号
 				command.setSelectJustification(0); //居左
 				command.setLeftMargin(30)

pages/fuelfilling/apply_for_reimbursement.vue

@@ -5,7 +5,7 @@
 				<view class="c-row">
 					<view class="title">车牌号</view>
 					<view class="con-list">
-						<input v-model='detailData.carNo' type="text">
+						<input maxlength="7" v-model='detailData.carNo' type="text">
 
 					</view>
 				</view>
@@ -103,7 +103,7 @@
 					<u-upload  imageMode='aspectFill' class="upload" :ref="'upload'+index" name='fileName' :file-list="item.fileList" :form-data="{companyId: pcUserInfo.compId,
 								modelId: '',
 								vesselId: ''}" :action="action"  :max-size="maxSize" :max-count="9"
-						:size-type="['compressed']" @on-success="getImgUrl($event,index)" @on-error="onError"
+						:size-type="['compressed']" @on-success="getImgUrl($event,index)" 
 						@on-remove="onRemove($event,index)" :show-progress='false' :limitType ="['png', 'jpg', 'jpeg', 'webp', 'gif']"
 						@on-progress="onProgress"></u-upload>
 					<!-- <upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9"
@@ -260,7 +260,9 @@
 									this.totalCost = (Number(this.totalCost) + Number(this.detailData.fillingDetailInfoList[i]
 										.currentConsumption)).toFixed(2)
 								this.detailData.fillingDetailInfoList[i].fileList=[]
-								if(this.detailData.fillingDetailInfoList[i].addressUrl){								var arr=this.detailData.fillingDetailInfoList[i].addressUrl.split(',')
+								if(this.detailData.fillingDetailInfoList[i].addressUrl){
+									var arr=this.detailData.fillingDetailInfoList[i].addressUrl.split(',')
+									this.detailData.fillingDetailInfoList[i].addressUrl=arr
 									for (var q = 0; q < arr.length; q++) {
 										if(arr[q]!=''){
 											this.detailData.fillingDetailInfoList[i].fileList.push({url:arr[q]})
@@ -365,6 +367,16 @@
 					this.tfc=0
 					this.totalCost=0
 					for (var i = 0; i < this.fillingDetail.fillingDetailInfoList.length; i++) {
+						if(this.fillingDetail.fillingDetailInfoList[i].addressUrl.length>0){
+							this.fillingDetail.fillingDetailInfoList[i].fileList=[]
+							var arr=this.fillingDetail.fillingDetailInfoList[i].addressUrl
+							for (var q = 0; q < arr.length; q++) {
+								if(arr[q]!=''){
+									this.fillingDetail.fillingDetailInfoList[i].fileList.push({url:arr[q]})
+								}
+							}
+						}
+						console.log(this.fillingDetail.fillingDetailInfoList)
 						this.fillingDetail.fillingDetailInfoList[i].serialNumber=i+1
 						this.tfc = (Number(this.tfc) + Number(this.fillingDetail.fillingDetailInfoList[i].oilConsumption))
 							.toFixed(2)
@@ -426,6 +438,7 @@
 					title: '加载中',
 					mask: true
 				});
+				that.fillingDetail.carNo=that.detailData.carNo
 				that.fillingDetail.tfc = that.tfc
 				that.fillingDetail.remark=that.detailData.remark
 				that.fillingDetail.totalCost = that.totalCost

pages/task/audit/purchasecontract.vue

@@ -296,7 +296,7 @@
 							</view>
 							<view class="flex audit_img">
 								<view v-for="(items,indexs) in item.fileUrl" class="url_css">
-									<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+									<image :src="items"  imageMode='aspectFill' class="url_img" @click="auditFile(items)"></image>
 								</view>
 							</view>
 						</view>

pages/task/audit/refuel.vue

@@ -138,7 +138,7 @@
 							</view>
 							<view class="flex audit_img">
 								<view v-for="(items,indexs) in item.fileUrl" class="url_css">
-									<image :src="items" mode="" class="url_img" @click="auditFile(items)"></image>
+									<image :src="items"  imageMode='aspectFill' class="url_img" @click="auditFile(items)"></image>
 								</view>
 							</view>
 						</view>