diff --git a/src/api/productionManagement/assayedContent.js b/src/api/productionManagement/assayedContent.js index 3376966..136a16f 100644 --- a/src/api/productionManagement/assayedContent.js +++ b/src/api/productionManagement/assayedContent.js @@ -29,7 +29,7 @@ export const getassayContentDeatils = (params) => { // 作业中心下拉接口 export const getWorkCenter = () =>{ return request({ - url:'/api/blade-desk/BA/WorkCenter/listForSelect', + url:'/api/blade-desk/bsWorkCenter/getList', method:'get' }) } diff --git a/src/api/productionManagement/coatingMaterial.js b/src/api/productionManagement/coatingMaterial.js index 6845091..8aa8214 100644 --- a/src/api/productionManagement/coatingMaterial.js +++ b/src/api/productionManagement/coatingMaterial.js @@ -78,6 +78,7 @@ export const getAddRequireList = params => { }); }; +// 作业中心下拉 export const getWorkCenter = () =>{ return request({ url:'/api/blade-desk/bsWorkCenter/getList', diff --git a/src/api/qualityManagement/periodicTesting/projectCycle.js b/src/api/qualityManagement/periodicTesting/projectCycle.js index 7f50ddf..24557e3 100644 --- a/src/api/qualityManagement/periodicTesting/projectCycle.js +++ b/src/api/qualityManagement/periodicTesting/projectCycle.js @@ -10,15 +10,11 @@ export const getProjectList = (params) => { }; // 获取列表数据 bsCraftAbility/queryAllCa -export const getList = (current, size, params) => { +export const getList = params => { return request({ url: '/blade-desk/QA/CycleTest/list', method: 'get', - params: { - ...params, - current, - size, - }, + params }); }; @@ -113,4 +109,13 @@ export const setCycleBat = (data) =>{ }) } +// 导出 +export const exportExcel = (params) =>{ + return request({ + url:'/api/blade-desk/QA/CycleTest/export-excel', + method:'get', + params, + responseType: "blob", + }) +} diff --git a/src/api/qualityManagement/periodicTesting/testProject.js b/src/api/qualityManagement/periodicTesting/testProject.js index 5158b39..714c0a7 100644 --- a/src/api/qualityManagement/periodicTesting/testProject.js +++ b/src/api/qualityManagement/periodicTesting/testProject.js @@ -61,4 +61,12 @@ export const getStandardList = () =>{ }) } - +// 导出接口 +export const exportExcel = (params) =>{ + return request({ + url:'/api/blade-desk/QA/CycleTestItem/export-excel', + method:'get', + params, + responseType: "blob", + }) +} diff --git a/src/api/storeManagement/binTransfer.js b/src/api/storeManagement/binTransfer.js index f1516c8..06bb86c 100644 --- a/src/api/storeManagement/binTransfer.js +++ b/src/api/storeManagement/binTransfer.js @@ -4,7 +4,7 @@ import request from '@/axios'; // 库位调整列表 export const getTransferList = params =>{ return request({ - url:'/api/blade-wms/stAllotRecord/page', + url:'/api/blade-wms/stAllotRecord/list', method:'get', params }) diff --git a/src/api/storeManagement/otherReceiving.js b/src/api/storeManagement/otherReceiving.js new file mode 100644 index 0000000..f054ae2 --- /dev/null +++ b/src/api/storeManagement/otherReceiving.js @@ -0,0 +1,20 @@ +// 其他入库 +import request from '@/axios'; + +// 其它入库列表 +export const getOtherInList = params =>{ + return request({ + url:'/api/blade-wms/stOtherReceiptRecord/page', + method:'get', + params + }) +} + +// 物料下拉 +export const getGoodsOutList = params =>{ + return request({ + url:'/api/blade-wms/combox/config/goodsOut', + method:'get', + params + }) +} \ No newline at end of file diff --git a/src/api/storeManagement/warehouseMaintenance.js b/src/api/storeManagement/warehouseMaintenance.js index af7d10e..3f4b4dd 100644 --- a/src/api/storeManagement/warehouseMaintenance.js +++ b/src/api/storeManagement/warehouseMaintenance.js @@ -13,7 +13,7 @@ export const getWareList = params =>{ // 库房新增 export const addWare = (data) =>{ return request({ - url:'/api/blade-wms/stStorehouse/save', + url:'/api/blade-wms/stStorehouse/submit', method:'post', data }) @@ -71,4 +71,13 @@ export const editLocation = (data) =>{ method:'post', data }) -} \ No newline at end of file +} + +// 根据角色别名查询用户 +export const getUserByRoleAlias = (params) => { + return request({ + url: '/api/blade-system/user/list-all-by-role-alias', + method: 'get', + params, + }); + }; \ No newline at end of file diff --git a/src/views/basicData/js/warehouseMain.js b/src/views/basicData/js/warehouseMain.js index f446919..fbaeff5 100644 --- a/src/views/basicData/js/warehouseMain.js +++ b/src/views/basicData/js/warehouseMain.js @@ -116,20 +116,26 @@ export default { overflow: true, search: true, type: 'select', - dicData: [ - { - label: '保管员一', - value: 1 - }, - { - label: '保管员二', - value: 2 - }, - { - label: '保管员三', - value: 3 - }, - ], + dicUrl:'/api/blade-system/user/list-all-by-role-alias?roleAlias=保管员', + // props:{ + // label: 'realName', + // value: 'userName', + // }, + // } + // dicData: [ + // { + // label: '保管员一', + // value: 1 + // }, + // { + // label: '保管员二', + // value: 2 + // }, + // { + // label: '保管员三', + // value: 3 + // }, + // ], // rules: [ // { // required: true, @@ -283,7 +289,7 @@ export const warehouseOption = { delBtnIcon: " ", labelWidth: 120, menu: true, - menuWidth: 200, + menuWidth: 120, dialogWidth: 920, dialogClickModal: false, searchEnter: true, @@ -419,20 +425,21 @@ export const warehouseOption = { overflow: true, search: true, type:'select', - dicData:[ - { - label:'保管员一', - value:1 - }, - { - label:'保管员二', - value:2 - }, - { - label:'保管员三', - value:3 - }, - ], + dicUrl:'/api/blade-system/user/list-all-by-role-alias?roleAlias=保管员', + // dicData:[ + // { + // label:'保管员一', + // value:1 + // }, + // { + // label:'保管员二', + // value:2 + // }, + // { + // label:'保管员三', + // value:3 + // }, + // ], // rules: [ // { // required: true, @@ -467,7 +474,7 @@ export const storageOption = { delBtnIcon: " ", labelWidth: 120, menu: true, - menuWidth: 200, + menuWidth: 120, dialogWidth: 920, dialogClickModal: false, searchEnter: true, diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue index ff2e19d..0c022c1 100644 --- a/src/views/basicData/warehouseMaintenance.vue +++ b/src/views/basicData/warehouseMaintenance.vue @@ -284,6 +284,9 @@ export default { done() this.getWare() } + }).catch(() =>{ + // loading() + done() }) } }, diff --git a/src/views/inboundOutboundManagement/binTransfer/index.vue b/src/views/inboundOutboundManagement/binTransfer/index.vue index ca7763a..e376782 100644 --- a/src/views/inboundOutboundManagement/binTransfer/index.vue +++ b/src/views/inboundOutboundManagement/binTransfer/index.vue @@ -103,7 +103,7 @@ export default { remote: true, props:{ label: 'goodsCode', - value: 'id', + value: 'goodsCode', res: 'data.records', }, rules: [{ required: true, message: '请选择物料编号', trigger: 'blur' }], @@ -125,7 +125,7 @@ export default { }, { label: '旧库房号', - prop: 'shCode', + prop: 'oldWarehouseName', // bind: 'oldStorageLocation.coStorehouse.shName', sortable: true, filter: true, @@ -154,7 +154,7 @@ export default { }, { label: '旧库位号', - prop: 'oldSlId', + prop: 'oldLocation', // bind: 'oldStorageLocation.location', sortable: true, filter: true, @@ -214,7 +214,7 @@ export default { { label: '新库位号', - prop: 'newSIId', + prop: 'newSlId', // bind: 'newStorageLocation.location', sortable: true, filter: true, @@ -383,8 +383,12 @@ export default { onLoad() { getTransferList({ current:this.page.currentPage, - size:this.page.pageSize + size:this.page.pageSize, + ...this.query }).then(res =>{ + res.data.data.records.map(item =>{ + item.newSlId = item.newSlId == -1 ? '' : item.newSlId + }) this.data = res.data.data.records console.log('data-------------',this.data) this.page.total = res.data.data.total; diff --git a/src/views/inboundOutboundManagement/components/addEditDialog.vue b/src/views/inboundOutboundManagement/components/addEditDialog.vue index 3b89a85..a8ea559 100644 --- a/src/views/inboundOutboundManagement/components/addEditDialog.vue +++ b/src/views/inboundOutboundManagement/components/addEditDialog.vue @@ -2,23 +2,23 @@ - - + + - - + - - + + @@ -58,15 +58,14 @@ *物料编号 - +