diff --git a/src/api/basic/basic.js b/src/api/basic/basic.js index 0ee5ac70..fb44a90c 100644 --- a/src/api/basic/basic.js +++ b/src/api/basic/basic.js @@ -135,6 +135,13 @@ export function delUnit(unitId) { }) } +// 删除时获取往来单位绑定的人数 +export function getUnitPerson(unitId) { + return request({ + url: '/material/bm_unit_person/' + unitId, + method: 'get' + }) +} // 往来单位-人员配置-左侧人员 export function getUserList(query) { @@ -301,7 +308,7 @@ export function delPropInfo(id) { // 资产属性管理-详情 export function PropDetail(id) { return request({ - url: `/material/bm_asset_attributes/${id}`, + url: '/material/bm_asset_attributes/'+ id, method: 'get', }) } diff --git a/src/api/purchase/goodsArrived.js b/src/api/purchase/goodsArrived.js new file mode 100644 index 00000000..0f1eeb3b --- /dev/null +++ b/src/api/purchase/goodsArrived.js @@ -0,0 +1,139 @@ +import request from '@/utils/request' + +//机具类型管理列表信息 +export function getListNewBuy(query) { + return request({ + url: '/material/purchase_check_info/list', + method: 'get', + params: query, + }) +} + +//任务 详情 +export function getPurchaseCheckInfo(query) { + return request({ + url: '/material//purchase_check_info/getInfo', + method: 'get', + params: query, + }) +} + +// 保存--新增 +export function addPurchaseCheckInfo(data) { + return request({ + url: '/material/purchase_check_info', + method: 'post', + data: data, + }) +} + +//人员 详情 +export function getNoticePeople(query) { + return request({ + url: '/material/purchase_notice_person/list', + method: 'get', + params: query, + }) +} + +// 人员--删除 +export function delPeople(ids) { + return request({ + url: '/material/purchase_notice_person/' + ids, + method: 'delete', + }) +} + + + +// 人员管理--新增 +export function addNoticeUser(data) { + return request({ + url: '/material/purchase_notice_person/batchAddNoticePerson', + method: 'post', + data: data, + }) +} + +// 仓库管理--修改 +export function bmNoticeInfo(data) { + return request({ + url: '/material/purchase_notice_person/batchSendSms', + method: 'put', + data: data, + }) +} + + +//机具类型管理列表信息 +export function getUserAll() { + return request({ + url: '/system/user/list', + method: 'get', + }) +} + +//获取机具类型树2 +export function equipmentTypeTree(query) { + return request({ + url: '/material/ma_type/equipmentType', + method: 'get', + params: query, + }) +} + +//查看机具类型管理列表详细信息 +export function getHouseDetail(id) { + return request({ + url: '/material/wh_house_info/'+ id, + method: 'get', + }) +} + + +// 物资名称下拉框- +export function queryKeeperNameApi(query) { + return request({ + url: '/material/ma_type/selectMaTypeListByTypeId', + method: 'get', + params: query + }) +} + + + +// 仓库管理--删除 +export function delHouse(id) { + return request({ + url: '/material/wh_house_info/' + id, + method: 'delete', + }) +} + +// 仓库管理--修改 +export function editHouse(data) { + return request({ + url: '/material/wh_house_info', + method: 'put', + data: data, + }) +} + +// 仓库管理--新增 +export function addHouse(data) { + return request({ + url: '/material/wh_house_info', + method: 'post', + data: data, + }) +} + +// 工程项目-列表 +export function getProjectList(query) { + return request({ + url: '/material/base/bmProjectInfo/projectInfoAll', + method: 'get', + params: query + }) +} + diff --git a/src/components/pageHeader/index.vue b/src/components/pageHeader/index.vue new file mode 100644 index 00000000..28ed74bc --- /dev/null +++ b/src/components/pageHeader/index.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/src/views/material/basic/bmAssetAttributes/index.vue b/src/views/material/basic/bmAssetAttributes/index.vue index fa72a205..94ecca1b 100644 --- a/src/views/material/basic/bmAssetAttributes/index.vue +++ b/src/views/material/basic/bmAssetAttributes/index.vue @@ -76,7 +76,6 @@ v-loading="loading" :data="propInfoList" border - @selection-change="handleSelectionChange" > { - this.form.id = response.row.id + PropDetail( row.id ).then((response) => { + this.form = response.data }) this.open = true this.title = '编辑' diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue index 5741aaab..d8cb9924 100644 --- a/src/views/material/basic/bmUnit/index.vue +++ b/src/views/material/basic/bmUnit/index.vue @@ -241,7 +241,7 @@ + diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue new file mode 100644 index 00000000..a9375c2b --- /dev/null +++ b/src/views/material/purchase/goodsArrived/component/home.vue @@ -0,0 +1,876 @@ + + + + diff --git a/src/views/material/purchase/goodsArrived/component/queryTools.vue b/src/views/material/purchase/goodsArrived/component/queryTools.vue new file mode 100644 index 00000000..70131d5f --- /dev/null +++ b/src/views/material/purchase/goodsArrived/component/queryTools.vue @@ -0,0 +1,1229 @@ + + + + diff --git a/src/views/material/purchase/goodsArrived/index.vue b/src/views/material/purchase/goodsArrived/index.vue new file mode 100644 index 00000000..f678e5c7 --- /dev/null +++ b/src/views/material/purchase/goodsArrived/index.vue @@ -0,0 +1,87 @@ + + + \ No newline at end of file