前端

config/index.js

@@ -7,10 +7,10 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.67:9888/',
 	// baseUrlNew: 'http://192.168.110.9:9888/',
-	// baseUrlNew: 'http://192.168.110.82:8090/',
+	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/',
 	h5Appid: 'wxb66b599f7f61b46f',

pages/erpbusiness/add_quality_testing.vue

@@ -24,7 +24,7 @@
 				<view class="title">任务编号</view>
 				<view class="con-list">
 					<view @click='show4=true'>{{gridList.inOutTaskNo?gridList.inOutTaskNo:'请选择任务编号'}}</view>
-					<u-picker :range="taskNolist" range-key="inOutTaskNo" @confirm='tasknopicker($event)'
+					<u-picker :range="taskNolist" range-key="inOutTaskNo1" @confirm='tasknopicker($event)'
 						v-model="show4" mode="selector">
 					</u-picker>
 				</view>
@@ -875,6 +875,10 @@
 				warehouseName: this.gridList.warehouseName
 			}).then(res => {
 				console.log(res)
+				for (let i = 0; i < res.data.data.length; i++) {
+					this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'（'+res.data.data[i].taskFlag+'）':''))
+				}
+				console.log(res.data.data,22222)
 				this.taskNolist = res.data.data
 			})
 			this.multiSelector1 = [{
@@ -1156,6 +1160,9 @@
 					warehouseName: this.gridList.warehouseName
 				}).then(res => {
 					console.log(res)
+					for (let i = 0; i < res.data.data.length; i++) {
+						this.$set(res.data.data[i],'inOutTaskNo1',res.data.data[i].inOutTaskNo+(res.data.data[i].taskFlag?'（'+res.data.data[i].taskFlag+'）':''))
+					}
 					this.taskNolist = res.data.data
 				})
 
@@ -1449,9 +1456,13 @@
 			print() {
 				console.log(this.printId)
 				if(this.printId){
+					uni.showLoading({
+						title:"加载中"
+					})
 					this.$api.doRequest('get', '/qualityInspectionManagement/api/getQualityInspection', {
 						id: this.printId
 					}).then(res => {
+						uni.hideLoading()
 						uni.setStorageSync("quality_print", res.data.data)
 						uni.navigateTo({
 							url: '/pages/erpbusiness/bleConnect'

pages/fuelfilling/track_addition.vue

@@ -138,14 +138,6 @@
 									})
 									return
 								}
-								that.$api.doRequest('post', '/fillingDetailInfo/api/addFillingDetail', that.detailData)
-									.then(res1 => {
-										if (res1.data.code == 200) {
-										}
-									})
-									.catch(res => {
-										uni.$u.toast(res.message);
-									});
 								that.$api.doRequest('post', '/fuelFillingInfo/api/addFilling', that.detailData)
 									.then(res1 => {
 										if (res1.data.code == 200) {

pages/task/audit/freight_setting_approval.vue

@@ -51,6 +51,10 @@
 					<u-input v-else v-model="list.tranPriceIng" input-align="right"
 						placeholder="请输入运费单价" />
 				</u-form-item>
+				<u-form-item label="货值" prop="tranPrice" label-width="250">
+					<u-input  v-model="list.goodsValueIng" input-align="right"
+						placeholder="请输入货值" />
+				</u-form-item>
 			</u-form>
 		</view>
 		<u-form ref="uForm">
@@ -321,6 +325,7 @@
 				tranProcessInfo.id = that.list.id
 				tranProcessInfo.flag = "2"
 				tranProcessInfo.billingMethod = that.list.billingMethod
+				tranProcessInfo.goodsValueIng = that.list.goodsValueIng
 				tranProcessInfo.reviewer = that.userInfo.userName
 				tranProcessInfo.tranTypeKey = that.list.tranTypeKey
 				if (that.list.billingMethod == 1&&that.list.tranType=="汽运"||that.list.tranType!="汽运") {

pages/task/audit/warehouse_approval.vue

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

pages/task/audit/warehouse_details.vue

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

pages/task/my_task.vue

@@ -42,6 +42,8 @@
 							<view v-if='statusFlag==3' class="title-row1">已审批
 								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
 							</view>
+							<view v-if='statusFlag==5' class="title-row1">{{item.messageTitleEn}}
+							</view>
 							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 						</view>
 						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
@@ -483,6 +485,12 @@
 						
 						console.log(that.taskInfo)
 						for (var i = 0; i < this.taskInfo.length; i++) {
+							// if(this.statusFlag==5){
+							// 	if(this.taskInfo[i].messageTitleEn.indexOf('已')==-1){
+							// 		var textarr=this.taskInfo[i].messageTitleEn.split('审')
+							// 		this.taskInfo[i].messageTitleEn=textarr[0]+'已审核'
+							// 	}
+							// }
 							let _str = this.taskInfo[i]
 							// let a = this.getRoles()
 							// if (_str.messageContent.indexOf("您发起") > -1) {