diff --git a/sgzb-ui/src/api/store/putInStore.js b/sgzb-ui/src/api/store/putInStore.js index dbf7ead5..96fb0922 100644 --- a/sgzb-ui/src/api/store/putInStore.js +++ b/sgzb-ui/src/api/store/putInStore.js @@ -2,52 +2,52 @@ import request from '@/utils/request' //机具退料入库 export function getReturnOfMaterialsInfoAll(query) { - return request({ - url: '/material/inventoryAndWarehousing/getList', - method: 'get', - params: query - }) - } + return request({ + url: '/material/inventoryAndWarehousing/getList', + method: 'get', + params: query + }) +} //机具退料入库--机具类型,规格型号下拉数据 export function getTypeList(query) { - return request({ - url: '/material/returnOfMaterialsInfo/getTypeList', - method: 'get', - params: query - }) - } + return request({ + url: '/material/returnOfMaterialsInfo/getTypeList', + method: 'get', + params: query + }) +} //修试后入库--列表 export function getRepairedList(data) { - return request({ - url: '/material/RepairTestInput/getRepairedList', - method: 'get', - params: data - }) - } - + return request({ + url: '/material/RepairTestInput/getRepairedList', + method: 'get', + params: data + }) +} + //修试后入库--详情 export function getRepairedDetailList(data) { - return request({ - url: '/material//RepairTestInput/getRepairedDetailList', - method: 'get', - params: data - }) - } - //修试后入库--审核 + return request({ + url: '/material//RepairTestInput/getRepairedDetailList', + method: 'get', + params: data + }) +} +//修试后入库--审核 export function inputByType(data) { - return request({ - url: '/material/RepairTestInput/inputByType', - method: 'post', - data: data - }) - } + return request({ + url: '/material/RepairTestInput/inputByType', + method: 'post', + data: data + }) +} // 获取 设备树 -export function getDeviceTypeTree(params = {}){ +export function getDeviceTypeTree(params = {}) { return request({ url: '/system/select/getDeviceTypeTree', method: 'post', @@ -64,6 +64,13 @@ export function inputByCode(data) { }) } +// 查看盘点入库详情接口 +export const getInventoryWarehousingApi = (data) => { + return request.get(`/material/inventoryAndWarehousing/getDetail`, { + params: data + }) +} + diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue index e2fd1e78..11700e98 100644 --- a/sgzb-ui/src/components/TableModel/index.vue +++ b/sgzb-ui/src/components/TableModel/index.vue @@ -32,6 +32,14 @@ :selectable="selectable" v-if="config.isSelShow" /> + + + }, +} + diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js index 0f2c33d9..0ec50372 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/auditingReturn/config.js @@ -12,7 +12,7 @@ export const config = { { f_label: '规格型号', f_model: 'backPro', f_type: 'sel', f_selList: [] }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'demo', t_label: '类型名称' }, { t_width: '', t_props: '', t_label: '规格型号' }, { t_width: '', t_props: '', t_label: '数量' }, @@ -44,7 +44,7 @@ export const dialogConfig = { ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'demo', t_label: '设备类型' }, { t_width: '', t_props: '', t_label: '规格型号' }, { t_width: '', t_props: '', t_label: '设备编码' }, diff --git a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js index d4d156b1..0f7b25d9 100644 --- a/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js +++ b/sgzb-ui/src/views/scrapManage/forecastWaste/listing/config.js @@ -41,7 +41,7 @@ export const config = { }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'scrapNum', t_label: '报废单号' }, { t_width: '', t_props: '', t_label: '报废来源', t_slot: 'source' }, { t_width: '', t_props: 'repairNum', t_label: '预报废单号' }, @@ -75,7 +75,7 @@ export const dialogConfig = { ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' }, diff --git a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js index 7b006239..914cde0c 100644 --- a/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js +++ b/sgzb-ui/src/views/scrapManage/scrap/disposition/config.js @@ -30,7 +30,7 @@ export const config = { { f_label: '创建时间', f_model: 'time', f_type: 'date' }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_props: 'scrapNum', t_label: '报废单号' }, { t_props: '', t_label: '报废来源', t_slot: 'source' }, { t_props: 'repairNum', t_label: '预报废单号' }, @@ -59,7 +59,7 @@ export const dialogConfig = { { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' }, diff --git a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js index 2748e351..39e909ac 100644 --- a/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js +++ b/sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/config.js @@ -38,7 +38,7 @@ export const config = { { f_label: '创建时间', f_model: 'time', f_type: 'date' }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_props: 'scrapNum', t_label: '报废单号' }, { t_props: 'scrapSource', t_label: '报废来源', t_slot: 'source' }, { t_props: 'repairNum', t_label: '预报废单号' }, @@ -67,7 +67,7 @@ export const dialogConfig = { { f_label: '类型名称', f_model: 'keywords', f_type: 'ipt' }, ], columnsList: [ - { t_width: '55px', t_props: '', t_label: '序号' }, + // { t_width: '55px', t_props: '', t_label: '序号' }, { t_width: '', t_props: 'machineTypeName', t_label: '设备类型' }, { t_width: '', t_props: 'specificationType', t_label: '规格型号' }, { t_width: '', t_props: 'maCode', t_label: '设备编码' }, diff --git a/sgzb-ui/src/views/store/warehousing/config.js b/sgzb-ui/src/views/store/warehousing/config.js new file mode 100644 index 00000000..ea9ecb84 --- /dev/null +++ b/sgzb-ui/src/views/store/warehousing/config.js @@ -0,0 +1,24 @@ + +export const dialogConfig = { + outerWidth: '70%', + outerTitle: '查看', + outerVisible: false, + handleColShow: false, // 是否显示操作列 + pageShow: true, // 是否显示分页组件 + isSelShow: false,// 表格是否需要复选框 + isFormShow: true, // 是否显示表单查询组件 + formLabel: [ + { f_label: '关键字', f_model: 'keyWord', f_type: 'ipt', }, + ], + + columnsList: [ + { t_width: '', t_props: 'putInType', t_label: '入库来源' }, + { t_width: '', t_props: 'typeName', t_label: '设备类型' }, + { t_width: '', t_props: 'typeModelName', t_label: '规格型号' }, + { t_width: '', t_props: 'maCode', t_label: '设备编码' }, + { t_width: '', t_props: 'modelName', t_label: '入库人' }, + { t_width: '', t_props: 'createDate', t_label: '入库日期' }, + ], + +} + diff --git a/sgzb-ui/src/views/store/warehousing/putInStore.vue b/sgzb-ui/src/views/store/warehousing/putInStore.vue index 00ee711a..c5e2af40 100644 --- a/sgzb-ui/src/views/store/warehousing/putInStore.vue +++ b/sgzb-ui/src/views/store/warehousing/putInStore.vue @@ -55,6 +55,7 @@ v-loading="loading" :data="returnList" @selection-change="handleSelectionChange" + border > - + + + 取 消 + + + + + @@ -774,14 +789,23 @@ import { getTypeList, getDeviceTypeTree, inputByCode, + getInventoryWarehousingApi, } from '@/api/store/putInStore' import { getInfo } from '@/api/login' import { supplierInfoList } from '@/api/store/tools' import { getUnitData, getProData } from '@/api/claimAndRefund/receive' +import DialogModel from '@/components/DialogModel' +import TableMode from '@/components/TableModel' +import { dialogConfig } from './config' + export default { name: 'DevicesWarehousing', // dicts: ['sys_normal_disable'], + components: { + DialogModel, + TableMode, + }, data() { return { // 用户信息 @@ -919,6 +943,12 @@ export default { }, ], }, + + // 详情弹框配置 + dialogConfig, + getInventoryWarehousingApi, + sendParams: {}, + detailsList: [], } }, created() { @@ -1447,6 +1477,25 @@ export default { this.codeForm.proId = val // console.log('🚀 ~ changeProList ~ this.codeForm:', this.codeForm.proId); }, + + /** + * ----------------------------------------------------------------------------------------------------------------------------- + */ + /* 查看详情 */ + async queryDetails(row) { + this.sendParams.kindName = row.kindName + const { data: res } = await getInventoryWarehousingApi( + this.sendParams, + ) + this.detailsList = res.rows + console.log(res, '详情--') + // this.dialogConfig.outerVisible = true + }, + + /* 外层弹框关闭 */ + closeDialogOuter() { + this.dialogConfig.outerVisible = false + }, }, }