guoyujia před 1 rokem
rodič
revize
fef0ff0ffe

+ 2 - 2
api/resourceGroup/resourceGroupDetail.js

@@ -1,9 +1,9 @@
 import req from '@/utils/request.js'
 
 
-export function getEquipmentByUidAndDid(planDetailId,deptId) {
+export function getEquipmentByUidAndDid(planDetailId,deptId,lotId) {
 	return req.request({
-		url:'/business/detail/getEquipmentByUidAndDid?planDetailId=' + planDetailId + '&deptId=' + deptId,
+		url:'/business/detail/getEquipmentByUidAndDid?planDetailId=' + planDetailId + '&deptId=' + deptId+ '&lotId=' + lotId,
 		method: 'GET',
 	})
 }

+ 1 - 1
components/dialog-selectEquipment/dialog-selectEquipment.vue

@@ -175,7 +175,7 @@
 		// 		}
 		// 		baseDialog.value.open()
 		// 	});
-		getEquipmentByUidAndDid(store.planDetails.id,store.curDeptDetails.deptId).then(equipmentRes => {
+		getEquipmentByUidAndDid(store.planDetails.id,store.curDeptDetails.deptId,store.dayworkInfo.lotId).then(equipmentRes => {
 			if(equipmentRes.code == 200){
 				for (var i = 0; i < equipmentRes.rows.length; i++) {
 					equipmentList.value[i] = {

+ 1 - 1
pages/reportingForWork/index.vue

@@ -171,7 +171,7 @@
 			}
 		})
 
-		getEquipmentByUidAndDid(store.planDetails.id, store.curDeptDetails.deptId).then(equipmentRes => {
+		getEquipmentByUidAndDid(store.planDetails.id, store.curDeptDetails.deptId,store.dayworkInfo.lotId).then(equipmentRes => {
 			if (equipmentRes.code == 200) {
 				hasEquipment.value = equipmentRes.rows.length > 0 ? true : false;
 			}