国内组件派车节点添加总托盘总数量等字段、上传pod判断是否为司机上传

subpkg/orderAllPodSign/orderAllPodSign.vue

@@ -202,6 +202,8 @@
 			},
 			// 提交表单数据
 			onSubmitForm() {
+				var user_gid=getApp().globalData.user_role
+				var is_driver=(user_gid=='DEFAULT.CARRIER_ADMIN'?true:false)
 				const row = getApp().globalData.orderAllPodSign;//回单表数据
 				if (this.formData.sign_status==null || this.formData.sign_status=="") {
 					 uni.showToast({
@@ -240,6 +242,7 @@
 					  	"aux": {
 					  		 "row":row,
 					  		 "aux":this.formData,//签收数据
+							 "is_driver":is_driver
 					  	},
 					  }
 				  //整单签收

subpkg/shipmentDispatch/shipmentDispatch.vue

@@ -46,7 +46,18 @@
 							    </u-input>
 						</view>
 					</u-form-item>
-			
+					<u-form-item prop="pallets"  label="总托数" labelWidth="25%" borderBottom v-if="order_type.startsWith('国内') && execute_bu === 'CMBU'">
+						<u-input :disabledColor="'#ffffff'"  placeholder="请输入数字" border="none" v-model="formData.pallets" @input="handlePalletsInput"/>
+					</u-form-item>
+					<u-form-item prop="qty"  label="总片数" labelWidth="25%" borderBottom v-if="order_type.startsWith('国内') && execute_bu === 'CMBU'">
+						<u-input :disabledColor="'#ffffff'"  placeholder="请输入数字" border="none" v-model="formData.qty" @input="handleQtyInput"/>
+					</u-form-item>
+					<u-form-item prop="power"  label="总功率" labelWidth="25%" borderBottom v-if="order_type.startsWith('国内') && execute_bu === 'CMBU'">
+						<u-input :disabledColor="'#ffffff'"  placeholder="请输入数字" border="none" v-model="formData.power" @input="handlePowerInput"/>
+					</u-form-item>
+					<u-form-item prop="warehouse_remark"  label="仓库备注" labelWidth="25%" borderBottom v-if="order_type.startsWith('国内') && execute_bu === 'CMBU'">
+						<u-input :disabledColor="'#ffffff'"  placeholder=" " border="none" v-model="formData.warehouse_remark" @input="handleWarehousemarkInput"/>
+					</u-form-item>
 				</view>		
 			</u--form>
 
@@ -117,6 +128,10 @@
 					driver_name:"",
 					driver_tel: "", //司机电话
 					early_pickup_date: "", //预计提货时间
+					pallets:"",//总托数
+					qty:"",//总片数
+					power:"",//总功率
+					warehouse_remark:""//仓库备注
 				},
 				rules: {
 					'truck_id': { required: true },//车辆
@@ -140,7 +155,9 @@
 				currentChecked1:'',
 				placeholder: "请输入搜索车牌号", //默认提示
 				placeholder1: "请输入搜索司机", //默认提示
-				carrier:''
+				carrier:'',
+				order_type:"",
+				execute_bu:""
 			}
 		},
 		onLoad(options) {
@@ -148,6 +165,9 @@
 			const isEmpty = !Object.keys(data).length
 			console.log("进来的承运商为"+options.carrier)
 			this.carrier=options.carrier
+			this.order_type= data[0].order_type;
+			this.execute_bu= data[0].execute_bu;
+			console.log("进来的订单类型为"+this.order_type)
 		},
 
 		methods: {
@@ -391,6 +411,18 @@
 			},
 			handleDriverTelInput(e){
 				this.formData.driver_tel = e;
+			},
+			handlePalletsInput(e){
+				this.formData.pallets = e;
+			},
+			handleQtyInput(e){
+				this.formData.qty = e;
+			},
+			handlePowerInput(e){
+				this.formData.power = e;
+			},
+			handleWarehousemarkInput(e){
+				this.formData.warehouse_remark = e;
 			}
 		}
 	}