app调整

api/apiList.js

@@ -181,6 +181,10 @@ export function getOrderPodDelete(data) {
   return Request( `/api/entry/{mini}/m-action/getOrderPodDelete`,data );
 }
 
+//签收编辑重新保存数量tm_ie_shipmentstatus
+export function getAppUpdatePodSign(data) {
+  return Request( `/api/entry/{mini}/m-action/getAppUpdatePodSign`,data );
+}
 
 // 查询货量明细
 // OM模式

pages.json

@@ -19,14 +19,16 @@
 		"style": {
 			"navigationBarBackgroundColor": "#005BB5",
 			"navigationBarTitleText": "司机",
-			"enablePullDownRefresh": false
+			"enablePullDownRefresh": false,
+			"disableScroll": true
 		}
 	},{
 		"path": "pages/carrierMenu/carrierMenu",
 		"style": {
 			"navigationBarBackgroundColor": "#005BB5",
 			"navigationBarTitleText": "承运商",
-			"enablePullDownRefresh": false
+			"enablePullDownRefresh": false,
+			"disableScroll": true
 		}
 	  },
 		{

pages/carrierMenu/carrierMenu.vue

@@ -58,6 +58,7 @@
 
 <style lang="scss">
 	.park_content {
+		 width: 100%;
 		.mask {
 			position: absolute;
 			top: 0;

publicConfig/config.js

@@ -4,7 +4,9 @@
   2. 打包生产模式： 小程序切换url； H5切换ENV_MODEL
  */
 let BASEURL = {
-	url: "http://127.0.0.1:8080", //TMS
+	url: "http://127.0.0.1:8080", //开发
+	//url: "https://otmuat.trinasolar.com", //UAT
+	//url: "https://otms.trinasolar.com", //正式
 }
 
 //当使用多域名代理服务时生效，用于统一添加API前缀以区分服务代理地址。本地开发H5注意修改manifest.json中Proxy代理规则

subpkg/orderPodSignEdit/orderPodSignEdit.vue

@@ -110,7 +110,7 @@
 
 <script>
 	import {getAppIeShipmentStatus, getOrderPodDelete,
-	    getOrderPodDetailSign} from '../../api/apiList.js'
+	    getOrderPodDetailSign,getAppUpdatePodSign} from '../../api/apiList.js'
 	 import { formatGMT } from '../../utils/util'
 	export default {
 		name: 'orderPodSignEdit',
@@ -129,6 +129,7 @@
 					sign_qty: "", //签收数量
 					plan_qty: "", //应签收数量
 					remark: "", //备注
+					 id:"",//id
 		
 				},
 				rules: {
@@ -224,7 +225,7 @@
 			},
 			buttonEdit(e) {
 				var datas =this.podData
-				console.log(datas)
+				//console.log(datas)
 				for(var i=0; i<datas.length; i++){
 					console.log(datas[i].sign_status)
 					this.formData.time =datas[i].sign_time; //签收时间
@@ -234,6 +235,7 @@
 					this.formData.remark=datas[i].remark; //备注
 					this.formData.sign_qty=datas[i].sign_qty; //签收数量
 					this.formData.plan_qty=null;//应签收数量
+					this.formData.id=datas[i].id;//id
 				}	
 			},
 			onSignQty(qty){
@@ -309,74 +311,40 @@
 				  this.searchValue =''
 			},
 
-			// 提交表单数据
+			// 提交表单数据，保存ie_shipmentstatus
 			onSubmitForm() {
 				const row = getApp().globalData.orderPodSignEdit;//回单表数据
-				if (this.formData.sign_status==null || this.formData.sign_status=="") {
+				 const executeBu= row.execute_bu
+				 console.log(executeBu)
+				//验证金额
+				var signQty =uni.$u.test.number(this.formData.sign_qty)
+				if (!signQty && executeBu!='TBU') {
 					 uni.showToast({
-						title: "签收状态必填",
+						title: "请填写正确的金额",
 						icon: 'none',
 						duration: 2000
 					 })	
 					 return;
-				 }else{
-					 if(this.formData.sign_status=="异常签收"){
-					 	if (this.formData.remark==null || this.formData.remark=="") {
-					 		 uni.showToast({
-					 			title: "异常签收时备注必填",
-					 			icon: 'none',
-					 			duration: 2000
-					 		 })	
-					 	 return;
-					 	 }
-					 }
 				 }
-			//验证签收
-			 var  cargoDetails = this.orderList[0].cargoDetails;
-			 var totle=0;
-			 if(cargoDetails.length>0){
-				 cargoDetails.map(item => {
-					 item.this_qty = Number(item.this_qty);
-				 	var thisQty= uni.$u.test.number(item.this_qty)
-				 	 if (!thisQty) {
-						 totle+=1;
-				 	  }
-				 })
-				 if(totle>0){
-					 uni.showToast({
-						title: "请填写正确的签收数量",
-						icon: 'none',
-						duration: 2000
-					 })	
-					 return;
-				 }
-			 }
 			
-				const imgInstance = this.$refs.myUploadImg //获取图片上传实例
-				imgInstance.uploadImage(images => {
-					this.formData.files=images;//图片或者文件
-				   this.formData.time= this.convertTimeHh24(this.formData.time)
-						 var baseData = {
-							"aux": {
-								 "row": row,
-								 "headData": this.formData,
-								 "detailData": cargoDetails,
-							},
-						 }
-						 //明细签收
-						/* getOrderPodDetailSign(baseData).then(res => {
-							if (res.data.data.messageType === 'success') {
-								uni.showToast({
-									title: '操作成功！',
-									duration: 1000
-								})  			
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1500)
-							}
-						 })*/
-					})
-				
+			  //只更新数量信息
+				 var baseData = {
+					"args": {
+						 "row": this.formData,
+					},
+				 }
+				 //明细签收
+				 getAppUpdatePodSign(baseData).then(res => {
+					if (res.data.data.messageType === 'success') {
+						uni.showToast({
+							title: '操作成功！',
+							duration: 1000
+						})  			
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1500)
+					}
+				 })
 			},
 			
 			//设置显示枚举