diff --git a/src/pages.json b/src/pages.json index d5c52e7..8a04199 100644 --- a/src/pages.json +++ b/src/pages.json @@ -38,6 +38,12 @@ }, /* 新购及其页面 */ // 验收 + { + "path": "pages/repair/wsMaInfo/index", + "style": { + "navigationBarTitleText": "编码采集" + } + }, { "path": "pages/new-purchase/accept/index", "style": { @@ -662,6 +668,12 @@ "navigationBarTitleText": "现场维修数量" } }, + { + "path": "pages/dateUpdate/index", + "style": { + "navigationStyle": "custom" + } + }, // 材料站 start // 首页 { diff --git a/src/pages/dateUpdate/index.vue b/src/pages/dateUpdate/index.vue new file mode 100644 index 0000000..a30c1c5 --- /dev/null +++ b/src/pages/dateUpdate/index.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/pages/repair/tree-select/select-one.vue b/src/pages/repair/tree-select/select-one.vue new file mode 100644 index 0000000..a387786 --- /dev/null +++ b/src/pages/repair/tree-select/select-one.vue @@ -0,0 +1,169 @@ + + + + + \ No newline at end of file diff --git a/src/pages/repair/wsMaInfo/index.vue b/src/pages/repair/wsMaInfo/index.vue new file mode 100644 index 0000000..972dc02 --- /dev/null +++ b/src/pages/repair/wsMaInfo/index.vue @@ -0,0 +1,364 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index f2338f3..bfdb8d7 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -107,7 +107,7 @@ - +
@@ -143,7 +143,7 @@ onShow((options) => { const newInfoList = ref([ { title: '编码采集', - url: '/pages/new-purchase/bind/index', + url: '/pages/repair/wsMaInfo/index', iconSrc: '../../static/workbench/bianMa.png', }, { @@ -153,7 +153,7 @@ const newInfoList = ref([ }, { title: '日期更新', - url: '/pages/new-purchase/accept/index', + url: '/pages/dateUpdate/index', iconSrc: '../../static/workbench/panDian.png', }, { @@ -274,6 +274,11 @@ const repairList = ref([ url: '/pages/repair/repairManage/index', iconSrc: '../../static/workbench/repair.png', }, + { + title: '现场维修', + url: '/pages/repair/fieldMaintenance/index', + iconSrc: '../../static/workbench/repair.png', + }, { title: '修试审核', url: '/pages/repair/testExamine/index', diff --git a/src/services/materialsStation.js b/src/services/materialsStation.js index 3257de5..b0e3bf6 100644 --- a/src/services/materialsStation.js +++ b/src/services/materialsStation.js @@ -58,7 +58,7 @@ export const getBmTeamList = (data) => { export const getPickingOutboundListAPI = (data) => { return http({ method: 'GET', - url: '/material/lease_apply_info/list', + url: '/material/material_lease_apply_info/list', data, }) } @@ -67,7 +67,7 @@ export const getPickingOutboundListAPI = (data) => { export const deleteLeaseApplyApi = (id) => { return http({ method: 'delete', - url: `/material/lease_apply_info/${id}`, + url: `/material/material_lease_apply_info/${id}`, data: id, }) } @@ -94,7 +94,7 @@ export const getTypeTreeList = (data) => { export const addLeaseTask = (data) => { return http({ method: 'POST', - url: '/material/lease_apply_info', + url: '/material/material_lease_apply_info', data, }) } @@ -102,7 +102,7 @@ export const addLeaseTask = (data) => { export const editLeaseTask = (data) => { return http({ method: 'put', - url: '/material/lease_apply_info', + url: '/material/material_lease_apply_info', data, }) } @@ -110,7 +110,7 @@ export const editLeaseTask = (data) => { export const detailsLeaseTask = (data) => { return http({ method: 'get', - url: `/material/lease_apply_info/${data}`, + url: `/material/material_lease_apply_info/${data}`, // data:data, }) } @@ -118,7 +118,7 @@ export const detailsLeaseTask = (data) => { export const detailsBackTask = (data) => { return http({ method: 'get', - url: `/material/back_apply_info/${data}`, + url: `/material/material_back_apply_info/${data}`, }) } @@ -135,7 +135,7 @@ export const getAgreementInfoByIdApi = (data) => { export const getOutNum = (data) => { return http({ method: 'GET', - url: '/material/lease_apply_info/getOutNum', + url: '/material/material_lease_apply_info/getOutNum', data, }) } @@ -144,7 +144,7 @@ export const getOutNum = (data) => { export const getCodeScanAPI = (data) => { return http({ method: 'GET', - url: '/material/lease_apply_info/getInfoByQrcode', + url: '/material/material_lease_apply_info/getInfoByQrcode', data, }) } @@ -153,7 +153,7 @@ export const getCodeScanAPI = (data) => { export const getMachineByIdApi = (data) => { return http({ method: 'GET', - url: '/material/back_apply_info/getMachineById', + url: '/material/material_back_apply_info/getMachineById', data, }) } @@ -171,7 +171,7 @@ export const getCodeDeviceListAPI = (data) => { export const getBackListAPI = (data) => { return http({ method: 'GET', - url: '/material/back_apply_info/list', + url: '/material/material_back_apply_info/list', data, }) } @@ -180,7 +180,7 @@ export const getBackListAPI = (data) => { export const deleteBackApi = (data) => { return http({ method: 'POST', - url: `/material/back_apply_info/deleteById`, + url: `/material/material_back_apply_info/deleteById`, data, }) } @@ -189,7 +189,7 @@ export const deleteBackApi = (data) => { export const backTask = (data) => { return http({ method: 'POST', - url: '/material/back_apply_info', + url: '/material/material_back_apply_info', data, }) } @@ -198,7 +198,7 @@ export const backTask = (data) => { export const editBackTask = (data) => { return http({ method: 'POST', - url: '/material/back_apply_info/edit', + url: '/material/material_back_apply_info/edit', data, }) } @@ -216,7 +216,7 @@ export const getUseTypeTree = (data) => { export const editBack = (data) => { return http({ method: 'POST', - url: '/material/back_apply_info//edit', + url: '/material/material_back_apply_info//edit', data, }) } @@ -225,7 +225,7 @@ export const editBack = (data) => { export const getMachine = (data) => { return http({ method: 'GET', - url: '/material/back_apply_info/getMachine', + url: '/material/material_back_apply_info/getMachine', data, }) } diff --git a/src/services/wsMaInfo/wsMaInfo.js b/src/services/wsMaInfo/wsMaInfo.js new file mode 100644 index 0000000..cad9f50 --- /dev/null +++ b/src/services/wsMaInfo/wsMaInfo.js @@ -0,0 +1,72 @@ +import { + http +} from '@/utils/http' // 你的 axios 封装,支持 Promise + +// 查询单个机具信息,传 id +export function getWsMaInfoById(id) { + return http({ + url: `/material/wsMaInfo/${id}`, + method: 'get', + }) +} + +// 查询所有机具信息列表 +export function getWsMaInfoList() { + return http({ + url: '/material/wsMaInfo/list', + method: 'get', + }) +} + +// 新增机具信息,传对象 info +export function addWsMaInfo(info) { + return http({ + url: '/material/wsMaInfo/addWsMaInfo', + method: 'post', + data: info, + }) +} + +// 更新机具信息,传对象 info(必须带 id) +export function updateWsMaInfo(info) { + return http({ + url: '/material/wsMaInfo/updateWsMaInfo', + method: 'post', + data: info, + }) +} + +// 删除机具信息,传 id +export function deleteWsMaInfo(id) { + return http({ + url: `/material/wsMaInfo/${id}`, + method: 'post', + }) +} + + +export const getMaTypeData = () => { + return http({ + method: 'POST', + url: '/material/wsMaInfo/getMaTypeData', + data: {} + }) +} + + +export const getMaModeData = (parentId) => { + return http({ + method: 'POST', + url: '/material/wsMaInfo/getMaModeData', + data: {parentId} + }) +} + + +export const getSupplier = () => { + return http({ + method: 'POST', + url: '/material/wsMaInfo/getSupplier', + data: {} + }) +} \ No newline at end of file