mes/nalinv-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.10.11.66:3000/mes/nalinv-ui into dev

Browse Source
This commit is contained in:
syngna_qiao 2024-11-26 11:11:18 +08:00
commit 605c543576
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/mes/wip/resource-feeding/index.vue
View File

@ -119,8 +119,8 @@
import {listByActivityId} from "@/api/admin/activity-option";
import {operationDialogObj, resourceDialogObj, shopOrderObj} from "@/views/mes/wip/resource-feeding/init";
import {fetchList as getShopOrderList} from "@/api/mes/prd/shop-order";
import {findOperationList as getOperationList} from '@/api/mes/prd/operation';
import {fetchList as getResourceList} from '@/api/mes/pms/resrce'
import {fetchList as getOperationList} from '@/api/mes/prd/operation';
import {findResourceList as getResourceList} from '@/api/mes/pms/resrce'
import {copyJSON} from "@/util/util";
import {checkItemGroup, downItemObj, selectEqpFeedingListPage, upItemObj,selectAndSaveLotMaterial,selectByMaterialLot} from '@/api/mes/wms/warehouse/eqp-feeding'
import {dateFormat} from "@/util/date";

2
src/views/mes/wip/resource-feeding/init.js
View File

@ -31,7 +31,7 @@ export const operationDialogObj = {
}
export const resourceDialogObj = {
condition: 'resource',
searchText: 'resrce',
tableColumn: [
{
prop: 'resrce',