haugnfuli 3 lat temu
rodzic
commit
3b8362d62b

+ 1 - 0
pageD/identity/driverIdentity.vue

@@ -181,6 +181,7 @@
 				ModelIndex: '高栏',
 				Model: '',
 				ModelType: ["高栏", "集装箱", "自卸车"],
+				carLongIndex: '13',
 				carLong: '',
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				driverCarInfoList: {},

+ 59 - 15
pageD/warehousings/warehousings.vue

@@ -27,7 +27,7 @@
 				<view class="c-row b-b">
 					<text class="tit">车牌号</text>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo.carNo}}</text>
+						<text>{{WarehouseInOutInfo1.carNo}}</text>
 					</view>
 				</view>
 			</view>
@@ -38,16 +38,18 @@
 			<view class="c-list">
 				<view class="cu-form-group align-start">
 					<view class="title">毛重(吨)</view>
-					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"></input>
+					<input placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight"
+						@input="grossWeightInput"></input>
 				</view>
 				<view class="cu-form-group align-start">
 					<view class="title">皮重(吨)</view>
-					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"></input>
+					<input placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
+						@input="tareInput"></input>
 				</view>
 				<view class="c-row b-b">
 					<text class="tit">净重(吨)</text>
 					<view class="con-list">
-						<text>{{WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare > 0 ? WarehouseInOutInfo.grossWeight - WarehouseInOutInfo.tare : 0}}</text>
+						<text>{{numFilter(WarehouseInOutInfo.netWeight)}}</text>
 					</view>
 				</view>
 				<view class="c-row b-b">
@@ -59,10 +61,10 @@
 				<view class="cu-form-group align-start">
 					<view class="title">仓位号</view>
 					<view class="con-list">
-					<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
-				</view>
+						<input placeholder="请输入仓位号" name="input" v-model="WarehouseInOutInfo.binNumber"></input>
+					</view>
 				</view>
-				
+
 				<view class="c-row b-b">
 					<text class="tit">入库类型 </text>
 					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
@@ -140,7 +142,7 @@
 							</view>
 							<!-- 底部操作菜单 -->
 							<view class="padding flex flex-direction">
-								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">暂存</button>
+								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit1">暂存</button>
 								<button class="cu-btn bg-red margin-tb-sm lg" @click="commit">提交</button>
 							</view>
 						</view>
@@ -165,24 +167,46 @@
 					contractNo: {},
 					carNo: {},
 				},
-				pinIndex: 0,
+				WarehouseInOutInfo1: {
+					contractNo: {},
+					carNo: {},
+				},
+				pinIndex: '不限(默认)',
+				pinTypes: '',
 				pinType: ['不限(默认)', '一等品', '二等品', '三等品', '等外'],
-				ruIndex: 0,
+				ruIndex: '采购入库',
+				rutypes: '',
 				ruType: ['采购入库', '移库入库', '暂存入库', '贸易服务入库', '退库'],
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
 			this.WarehouseInOutInfo.goodsName = option.goodsName
-			this.WarehouseInOutInfo.startNetWeight = option.startNetWeight
-			this.WarehouseInOutInfo.carNo = option.carNo+'('+ option.tranCarNo+ ')'
+			this.WarehouseInOutInfo.startWeight = option.startWeight
+			this.WarehouseInOutInfo1.carNo = option.carNo + '(' + option.tranCarNo + ')'
 			this.WarehouseInOutInfo.warehouseName = option.warehouseName
+			this.WarehouseInOutInfo.id = option.id
+			this.WarehouseInOutInfo.carNo = option.carNo
 		},
 		methods: {
+			commit1() {
+				console.log(this.list)
+				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.WarehouseInOutInfo.statusFlag = 1
+				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 
+				}).catch(res => {
+					uni.showToast({
+						title: res.data.message,
+						icon: 'none',
+						duration: 2000
+					})
+				})
+			},
 			commit() {
 				console.log(this.list)
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
+				this.WarehouseInOutInfo.statusFlag = 3
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 
 				}).catch(res => {
@@ -193,13 +217,33 @@
 					})
 				})
 			},
-			ruChange(e){
+			numFilter(value) {
+				if (!value) {
+					return 0
+				}
+				// 截取当前数据到小数点后两位
+				let realVal = parseFloat(value).toFixed(2)
+				return realVal
+			},
+			grossWeightInput(e) {
+				this.WarehouseInOutInfo.grossWeight = e.detail.value
+				if (this.WarehouseInOutInfo.grossWeight && this.WarehouseInOutInfo.tare) {
+					this.WarehouseInOutInfo.netWeight = this.WarehouseInOutInfo.grossWeight - this.WarehouseInOutInfo.tare
+				}
+			},
+			tareInput(e) {
+				this.WarehouseInOutInfo.tare = e.detail.value
+				if (this.WarehouseInOutInfo.grossWeight && this.WarehouseInOutInfo.tare) {
+					this.WarehouseInOutInfo.netWeight = this.WarehouseInOutInfo.grossWeight - this.WarehouseInOutInfo.tare
+				}
+			},
+			ruChange(e) {
 				this.ruIndex = e.detail.value
 				this.rutypes = this.ruType[this.ruIndex];
 			},
 			pinChange(e) {
 				this.pinIndex = e.detail.value
-				this.pintypes = this.pinType[this.pinIndex];
+				this.pinTypes = this.pinType[this.pinIndex];
 			},
 		}
 

+ 1 - 3
pages/task/my_task.vue

@@ -109,9 +109,7 @@
 				})
 				}else{
 					uni.navigateTo({
-						url: `/pageD/warehousings/warehousings?id=${item.id}&contractNo=${item.contractNo}
-						&goodsName=${item.goodsName}&startNetWeight=${item.startNetWeight}
-						&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+						url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
 					})
 				}
 			}