fix: 备件归还备件入库

src/api/outLocation.ts

@@ -7,7 +7,17 @@ export function getOutLocationPage(params) {
 export function getOutLocationDetail(params) {
   return http.get('/eam/item-apply-request-main/appGetByNumber',{params})
 }
+// 出库新增
+// export function outLocationCreat(data) {
+//   return http.post('/eam/item-apply-request-main/outOperation',data)
+// }
+
 // 出库新增
 export function outLocationCreat(data) {
-  return http.post('/eam/item-apply-request-main/outOperation',data)
+  return http.post('/eam/item-out-location/create',data)
+}
+
+// 根据库位编码查询备件信息
+export const getByLocationNumber = async (params) => {
+  return http.get('/eam/item-accounts/getByLocationNumber',{params})
 }

src/api/spareParts.ts

@@ -5,6 +5,11 @@ export function getSparePartsInfo(params) {
   return http.get('/eam/item/inScanCodeByNumber',{params})
 }
 // 备件归还获取备件信息
-export function getSparePartsReturnInfo(params) {
-  return http.get('/eam/item/scanCodeByNumber',{params})
+export function getByItemNumber(params) {
+  return http.get('/eam/item-accounts/getByItemNumber',{params})
+}
+
+// 备件归还获取库位信息
+export function getByLocationNumber(params) {
+  return http.get('/eam/item-accounts/getByLocationNumber',{params})
 }

src/api/sparePartsReturn.ts

@@ -1,5 +1,10 @@
 import http from './http'
 // 归还
-export function sparePartsReturn(data) {
-  return http.post('/eam/item-apply-request-main/inOperation',data)
+// export function sparePartsReturn(data) {
+//   return http.post('/eam/item-apply-request-main/inOperation',data)
+// }
+
+// 归还
+export function create(data) {
+  return http.post('/eam/item-in-location/create',data)
 }

src/pages/index.vue

@@ -41,11 +41,11 @@
 							<view class="icon-item" @click="open(cur.path)">
 								<!-- 扫码图标 -->
 								<image src="../static/images/icon8.png" mode="" v-if="cur.componentName == 'scanCodeMeau'"></image>
-								<!-- 采购入库图标 -->
+								<!-- 入库图标 -->
 								<image src="../static/images/icon1.png" mode="" v-else-if="cur.componentName == 'inLocation'"></image>
 								<!-- 备件归还图标 -->
 								<image src="../static/images/icon3.png" mode="" v-else-if="cur.componentName == 'sparePartsReturn'"></image>
-								<!-- 采购出库图标 -->
+								<!-- 出库图标 -->
 								<image src="../static/images/icon2.png" mode="" v-else-if="cur.componentName == 'outLocation'"></image>
 								<view>{{cur.name}}</view>
 							</view>

src/pages/outLocation/addForm.vue

@@ -1,96 +1,36 @@
 <template>
-	<!-- 添加维修工单 -->
+	<!-- 添加出库信息 -->
 	<view class="add-form-container">
 		<u-form :model="form" ref="formRef" label-width="160rpx">
-			<u-form-item label="申请人" prop="applyName" required class='disabled'>
-				<u-input v-model="form.applyName" placeholder="请输入申请人" disabled />
+			<u-form-item label="领用人"  class='disabled'>
+				<u-input v-model="form.receiver" placeholder="请输入领用人" />
 			</u-form-item>
-			<u-form-item label="申请部门" prop="applyDeptName" required class='disabled'>
-				<u-input v-model="form.applyDeptName" placeholder="请输入申请部门" disabled />
+			<u-form-item label="库位" prop="locationNumber" required>
+				<u-input v-model="form.locationNumber" placeholder="请输入库位" @blur="blur()"
+					@confirm="handelScanMsg" :focus='isFocus' />		
 			</u-form-item>
-			<u-form-item label="审批人" prop="approveName" required class='disabled'>
-				<u-input v-model="form.approveName" placeholder="请输入审批人" disabled />
+			<u-form-item label="备件名称" prop="itemName" required class="disabled">
+					<u-input v-model="form.itemName" disabled  placeholder="请输入备件名称"/>
 			</u-form-item>
+			<u-form-item label="备件编码" prop="itemNumber" required class="disabled">
+					<u-input v-model="form.itemNumber" disabled placeholder="请输入备件编号" />
+			</u-form-item>
+			<u-form-item label="出库数量" prop="qty" required class="disabled">
+				<u-input v-model="form.qty" type="number"  placeholder="请输入出库数量"/>
+			</u-form-item>
+			<u-form-item label="库存数量" prop="stockQty" required class="disabled">
+				<u-input v-model="form.stockQty" type="number" disabled placeholder="请输入库存数量" />
+			</u-form-item>
+			<!-- <u-form-item label="剩余出库数量" prop="totalReception" required class="disabled">
+				<u-input v-model="form1.totalReception" type="number" disabled placeholder="请输入出库数量" />
+			</u-form-item>
+			<u-form-item label="出库数量" prop="qty" required>
+				<u-input v-model="form1.qty" type="number" placeholder="请输入出库数量" />
+			</u-form-item>
+			<u-form-item label="描述" prop="describes">
+				<u-input v-model="form1.describes" placeholder="请输入描述" />
+			</u-form-item> -->
 		</u-form>
-		<view class="list">
-			<view class="title">
-				<span>*</span>申领信息
-			</view>
-			<view class="item " v-for="(item,index) in form.subList" :key="index">
-				<view class="item-box">
-					<view class="spare-title">
-						<view class="title-txt">
-							备件名称：{{item.itemName}}
-						</view>
-					</view>
-					<u-row gutter="16">
-						<!-- 	<u-col :span="24">
-							<view class="dec">
-								库位：{{item.locationNumber}}
-							</view>
-						</u-col> -->
-
-						<u-col :span="24">
-							<view class="dec">
-								已出库数量:{{item.receiveQty}}
-							</view>
-						</u-col>
-						<u-col :span="24">
-							<view class="dec">
-								申请数量:{{item.qty}}
-							</view>
-						</u-col>
-					</u-row>
-				</view>
-			</view>
-		</view>
-
-		<view class="list">
-			<view class="title">
-				<span>*</span>出库信息
-			</view>
-			<view class="item " v-for="(item,index) in form.itemNumbers" :key="index">
-				<view class="item-box">
-					<view class="spare-title">
-						<view class="title-txt">
-							备件名称：{{item.itemName}}
-						</view>
-					</view>
-					<u-row gutter="16">
-						<u-col :span="24">
-							<view class="dec">
-								出库数量：{{item.qty}}
-							</view>
-						</u-col>
-						<u-col :span="24">
-							<view class="dec">
-								申请数量：{{item.applyQty}}
-							</view>
-						</u-col>
-						<u-col :span="24">
-							<view class="dec">
-								库位编码：{{item.locationNumber}}
-							</view>
-						</u-col>
-						<!-- <u-col :span="24">
-							<view class="dec">
-								库位名称：{{item.locationName}}
-							</view>
-						</u-col> -->
-						<u-col :span="24">
-							<view class="dec">
-								库位类型：{{item.isInAccount == 'FALSE'?'帐外库' :'帐内库'}}
-							</view>
-						</u-col>
-					</u-row>
-				</view>
-				<u-icon name="minus-circle" color="#aaaaaa" size="60" @click="delSpareParts(item,index)"></u-icon>
-			</view>
-			<view class="add-btn">
-				<u-button type="primary" @click="open"><u-icon name="plus-circle" color="#ffffff"
-						size="36"></u-icon>添加备件</u-button>
-			</view>
-		</view>
 		<view class="footer">
 			<view class="btns">
 				<button class="reset" @click="reset">重置</button>
@@ -98,48 +38,6 @@
 			</view>
 			<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
 		</view>
-		<!-- 添加备件 -->
-		<u-popup v-model="isPopupShow" mode="center" border-radius="14">
-			<view class="popup-title">添加备件</view>
-			<scroll-view scroll-y="true" style="max-height:60vh;">
-				<view class="popup">
-					<u-form :model="form1" ref="form1Ref" label-width="180rpx">
-						<u-form-item label="库位" prop="locationNumber" required>
-							<u-input v-model="form1.locationNumber" placeholder="请输入库位" @blur="blur()"
-								@confirm="handelScanMsg" :focus='isFocus' />
-				
-						</u-form-item>
-						<u-form-item :label="`备件名称`" prop="itemNumber" required class="disabled">
-							<view class="select">
-								<u-input v-model="form1.itemName" placeholder="请选择备件" disabled />
-							</view>
-						</u-form-item>
-						<u-form-item label="申请数量" prop="applyQty" required class="disabled">
-							<u-input v-model="form1.applyQty" type="number" disabled placeholder="请输入申请数量" />
-						</u-form-item>
-						<u-form-item label="已出库数量" prop="receiveQty" required class="disabled">
-							<u-input v-model="form1.receiveQty" type="number" disabled placeholder="请输入已出库数量" />
-						</u-form-item>
-						<u-form-item label="库存数量" prop="stockQty" required class="disabled">
-							<u-input v-model="form1.stockQty" type="number" disabled placeholder="请输入库存数量" />
-						</u-form-item>
-						<u-form-item label="剩余出库数量" prop="totalReception" required class="disabled">
-							<u-input v-model="form1.totalReception" type="number" disabled placeholder="请输入出库数量" />
-						</u-form-item>
-						<u-form-item label="出库数量" prop="qty" required>
-							<u-input v-model="form1.qty" type="number" placeholder="请输入出库数量" />
-						</u-form-item>
-						<u-form-item label="描述" prop="describes">
-							<u-input v-model="form1.describes" placeholder="请输入描述" />
-						</u-form-item>
-					</u-form>
-				</view>
-			</scroll-view>
-			<view class="popup-footer">
-				<view @click="isPopupShow = false">取消</view>
-				<view class="sure" @click="addSpare">确认</view>
-			</view>
-		</u-popup>
 	</view>
 </template>
 
@@ -162,20 +60,16 @@
 	const form = ref({
 		id: '',
 		number: '',
+		stockQty:'',
+		qty:'',
+		receiver:'',
 		supplierName: '',
-		itemNumbers: [],
-		subList: []
-	})
-	const form1 = ref({
-		itemNumber: "",
-		itemName: '',
 		locationNumber: '',
-		applyQty: '',
-		receiveQty: '',
-		stockQty: '',
-		totalReception:'',
-		qty: ''
+		itemName:'',
+		itemNumber:'',
+		subList: []
 	})
+
 	const isShow = ref(false)
 	const isInAccount = ref('FALSE')
 
@@ -183,8 +77,27 @@
 	const msg = ref('')
 	// 触发提交表单
 	function submit() {
-		if (form.value.itemNumbers.length === 0) {
-			proxy.$modal.showToast('请添加出库信息')
+		// 校验
+		if (!form.value.locationNumber) {
+			proxy.$modal.showToast('请选择库位')
+			return;
+		}
+		if (!form.value.itemNumber) {
+			proxy.$modal.showToast('请选择备件')
+			return;
+		}
+		// 校验
+		if (!form.value.qty) {
+			proxy.$modal.showToast('请选择出库数量')
+			return;
+		}
+		
+		if (Number(form.value.qty) <= 0) {
+			proxy.$modal.showToast('出库数量需大于0')
+			return;
+		}
+		if (Number(form.value.qty)>Number(form.value.stockQty)) {
+			proxy.$modal.showToast('出库数量不能大于库存数量')
 			return;
 		}
 		proxy.$modal.confirm('是否添加出库信息').then(() => {
@@ -211,146 +124,44 @@
 	}
 	// 重置
 	function reset() {
-		form.value.itemNumbers = []
+		form.value.locationNumber = ''
+		form.value.stockQty = ''
+		form.value.qty = ''
+		form.value.receiver = ''
+		form.value.itemName = ''
+		form.value.itemNumber = ''
 	}
-	// 获取订单信息详情
-	async function getInLocationDetail() {
-		// let itemNumbers = form.value.itemNumbers.map(item=>{
-		// 	return {
-		// 		itemNumber:item.itemNumber,
-		// 		qty:item.qty,
-		// 		locationNumber:item.locationNumber,
-		// 	}
-		// })
-		await outLocationApi.getOutLocationDetail({
-			id: form.value.id,
-			number: form.value.number,
+	// 根据库位编号查询备件信息以及库存
+	async function getByLocationNumber() {
+		await outLocationApi.getByLocationNumber({
+			locationNumber: form.value.locationNumber
 			// itemNumbers:itemNumbers  || []
 		}).then(res => {
-			form.value.applyName = res.data.applyName
-			form.value.approveName = res.data.approveName
-			form.value.applyDeptName = res.data.applyDeptName
-			form.value.subList = res.data.subList
+			if(!res.data.itemNumber){
+				proxy.$modal.showToast('该库位下无备件信息')
+				return;
+			}
+			
+			form.value.itemName = res.data.itemName
+			form.value.itemNumber = res.data.itemNumber
+			form.value.stockQty = res.data.qty
+	
 		}).catch(() => { })
 	}
 	// 打开弹窗
 	function open() {
-		form1.value = {
-			itemNumber: "",
-			itemName: '',
-			locationNumber: '',
-			applyQty: '',
-			receiveQty: '',
-			stockQty: '',
-			qty: ''
-		}
 		isPopupShow.value = true
 		isShow.value = false
 		isFocus.value = true
 	}
-	// 添加备件
-	function addSpare() {
-		// 校验
-		if (!form1.value.locationNumber) {
-			proxy.$modal.showToast('请选择库位')
-			return;
-		}
-		if (!form1.value.itemNumber) {
-			proxy.$modal.showToast(msg.value)
-			return;
-		}
 
-		if (!form1.value.qty) {
-			proxy.$modal.showToast(`请输入数量`)
-			return;
-		}
-		if (Number(form1.value.qty) + Number(form1.value.receiveQty) > Number(form1.value.applyQty)) {
-			proxy.$modal.showToast('已出库数量和出库数量不可大于申请数量')
-			return;
-		}
-		if (Number(form1.value.qty) > Number(form1.value.totalReception)) {
-			proxy.$modal.showToast('出库数量不可大于剩余出库数量')
-			return;
-		}
-		if (form.value.itemNumbers && form.value.itemNumbers.length > 0) {
-			let arr = form.value.itemNumbers.filter(item => item.locationNumber == form1.value.locationNumber)
-			if (arr && arr.length > 0) {
-				proxy.$modal.showToast('该库位已添加')
-				return;
-			}
-			let arr1 = form.value.subList.filter(item => item.itemNumber == form1.value.itemNumber)
-			if (!arr1 || (arr1 && arr1.length == 0)) {
-				proxy.$modal.showToast('申领信息没有该备件')
-				return;
-			}
-		}
-		form.value.itemNumbers.push(form1.value)
-		isPopupShow.value = false
-	}
-	// 删除备件
-	function delSpareParts(item,index) {
-		let bol = form.value.itemNumbers.some(cur=>cur.itemNumber == item.itemNumber&&item.isInAccount == 'FALSE'&&cur.isInAccount == 'TRUE')
-		if(bol){
-			proxy.$modal.showToast('请先删除该备件得帐内库')
-			return;
-		}
-		form.value.itemNumbers.splice(index, 1)
-	}
-	function getLocation() {
-		let itemNumbers = form.value.itemNumbers.map(item=>{
-			return {
-				itemNumber:item.itemNumber,
-				qty:item.qty,
-				locationNumber:item.locationNumber,
-			}
-		})
-		locationApi.getOutLocation({
-			number: form1.value.locationNumber,
-			id: form.value.id,
-			itemNumbers:itemNumbers
-		}).then(res => {
-			if (!res.data) {
-			msg.value = res.msg
-			form1.value.areaNumber = '';
-			form1.value.itemName = '';
-			form1.value.itemNumber = '';
-			form1.value.receiveQty ='';
-			form1.value.applyQty ='';
-			form1.value.stockQty = '';
-			form1.value.totalReception ='';
-			form1.value.isInAccount ='';
-			isInAccount.value ='';
-				return;
-			}
-			form1.value.areaNumber = res.data.areaNumber;
-			form1.value.itemName = res.data.itemName;
-			form1.value.itemNumber = res.data.itemNumber;
-			form1.value.receiveQty = res.data.receiveQty || 0;
-			form1.value.applyQty = res.data.applyQty || 0;
-			form1.value.stockQty = res.data.qty || 0;
-			form1.value.totalReception = res.data.totalReception || 0;
-			form1.value.isInAccount = res.data.isInAccount;
-			isInAccount.value = res.data.isInAccount || ''
-			
-			// this.itemNumber = res.data.itemNumber || ''
-		}).catch((error) => {
-			msg.value = error.msg
-			form1.value.areaNumber = '';
-			form1.value.itemName = '';
-			form1.value.itemNumber = '';
-			form1.value.receiveQty = '';
-			form1.value.applyQty = '';
-			form1.value.stockQty = '';
-			isInAccount.value = '';
-		})
-	}
 	function blur() {
-		if (form1.value.locationNumber) {
-			getLocation()
+		if (form.value.locationNumber) {
+			getByLocationNumber();
 		}
 	}
 	function handelScanMsg() {
-		getLocation()
+		getByLocationNumber
 	}
 	onLoad(async (option) => {
 		if (option.data && JSON.parse(decodeURIComponent(option.data)) && JSON.parse(decodeURIComponent(option
@@ -360,7 +171,7 @@
 			form.value.number = formData.number
 			form.value.id = formData.id
 		}
-		await getInLocationDetail()
+		//await getInLocationDetail()
 	})
 </script>