diff --git a/sgzb-ui/prettier.config.js b/sgzb-ui/prettier.config.js index c4bf424e..4d223376 100644 --- a/sgzb-ui/prettier.config.js +++ b/sgzb-ui/prettier.config.js @@ -1,5 +1,5 @@ module.exports = { - tabWidth: 4, + tabWidth: 2, semi: false, vueIndentScriptAndStyle: false, singleQuote: true, diff --git a/sgzb-ui/src/api/repairTest/inventoryScrap.js b/sgzb-ui/src/api/repairTest/inventoryScrap.js new file mode 100644 index 00000000..1390ad5e --- /dev/null +++ b/sgzb-ui/src/api/repairTest/inventoryScrap.js @@ -0,0 +1,77 @@ +import request from '@/utils/request'; + +// +//获取机具类型树 +export function equipmentTypeTree(data) { + return request({ + url: '/material/select/getDeviceTypeTree', + method: 'post', + data: data + }); +} + +//获取设备编号列表 +export function getMachineListByCode(query) { + return request({ + url: '/material/base/machine/getMachineList', + method: 'get', + params: query + }); +} + +//新增盘带报废 +export function addScrapInfo(data) { + return request({ + url: '/material/scrap/addList ', + method: 'post', + data: data + }); +} + +//获取盘带报废列表 +export function getInventoryList(query) { + return request({ + url: '/material/scrap/inventoryList', + method: 'get', + params: query + }); +} + +//获取盘带报废详情 +export function getScrapInfo(query) { + return request({ + url: '/material/scrap/getDetailsList', + method: 'get', + params: query + }); +} + +//修改盘带报废 +export function editScrapInfo(data) { + return request({ + url: '/material/scrap/updateList ', + method: 'post', + data: data + }); +} + +//一级页面删除盘带报废 +export function applyRemove(data) { + return request({ + url: '/material/scrap/delete ', + method: 'post', + data: data + }); +} + +//盘点报废通过与驳回 +export function inventoryPass(data) { + return request({ + url: '/material/scrap/inventoryApprove', + method: 'post', + data: data + }); +} + + + diff --git a/sgzb-ui/src/assets/images/file.png b/sgzb-ui/src/assets/images/file.png new file mode 100644 index 00000000..9289fcd3 Binary files /dev/null and b/sgzb-ui/src/assets/images/file.png differ diff --git a/sgzb-ui/src/utils/download.js b/sgzb-ui/src/utils/download.js new file mode 100644 index 00000000..f39ba7fc --- /dev/null +++ b/sgzb-ui/src/utils/download.js @@ -0,0 +1,37 @@ +// 下载blob文件 +export const downloadFile = ({ fileData, fileType, fileName }) => { + const blob = new Blob([fileData], { + type: fileType + }); + const link = document.createElement('a'); + link.href = URL.createObjectURL(blob); + link.download = fileName; + link.style.display = 'none'; + document.body.appendChild(link); + link.click(); + URL.revokeObjectURL(link.href); + document.body.removeChild(link); +}; + +// 通用a链接下载 +export const downloadFileByUrl = (url) => { + const link = document.createElement('a'); + link.href = url; // 设置文件 URL + link.download = ''; // 提供下载提示 + document.body.appendChild(link); // 将链接添加到 DOM + link.click(); // 模拟点击下载 + document.body.removeChild(link); // 下载后移除链接 +}; + +// pdf、doc、docx等文件下载 +export const downloadFileData = ({ fileName, fileUrl }) => { + const link = document.createElement('a'); + link.setAttribute('download', ''); + link.style.display = 'none'; + link.href = fileUrl; + link.download = fileName; + document.body.appendChild(link); + link.click(); + // URL.revokeObjectURL(link.href) + document.body.removeChild(link); +}; \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue index 52cd45b3..ba7b9f8d 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue @@ -107,6 +107,17 @@ }} --> + + + + +
+ + + + + + + + 库存:{{ item.storageNum }} + + + + + + + + + + +
+ + + +
+ +
+ +

{{ file.name }}

+
+ + + + + + + + + + + +
+ + + +
+ + + + 保存 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + diff --git a/sgzb-ui/src/views/scrapManage/Inventory/component/homeApply.vue b/sgzb-ui/src/views/scrapManage/Inventory/component/homeApply.vue new file mode 100644 index 00000000..aff73acd --- /dev/null +++ b/sgzb-ui/src/views/scrapManage/Inventory/component/homeApply.vue @@ -0,0 +1,424 @@ + + + + diff --git a/sgzb-ui/src/views/scrapManage/Inventory/component/queryToolsApply.vue b/sgzb-ui/src/views/scrapManage/Inventory/component/queryToolsApply.vue new file mode 100644 index 00000000..98daf80e --- /dev/null +++ b/sgzb-ui/src/views/scrapManage/Inventory/component/queryToolsApply.vue @@ -0,0 +1,347 @@ + + + + diff --git a/sgzb-ui/src/views/scrapManage/Inventory/config.js b/sgzb-ui/src/views/scrapManage/Inventory/config.js deleted file mode 100644 index 234fb3f4..00000000 --- a/sgzb-ui/src/views/scrapManage/Inventory/config.js +++ /dev/null @@ -1,31 +0,0 @@ -export const config = { - handleColShow: true, // 是否显示操作列 - pageShow: true, // 是否显示分页组件 - isSelShow: true,// 表格是否需要复选框 - isFormShow: true, // 是否显示表单查询组件 - handleWidth: '', // 操作列宽度 - formLabel: [ - { f_label: '关键字', f_model: 'keyword', f_type: 'ipt' }, - { f_label: '单位名称', f_model: 'backUnit', f_type: 'sel', f_selList: [] }, - { f_label: '工程名称', f_model: 'backPro', f_type: 'sel', f_selList: [] }, - { f_label: '工机具类型', f_model: 'type', f_type: 'selCas', f_selList: [], optionProps: { value: 'id', } }, - { f_label: '报废单号', f_model: 'laiyuan', f_type: 'ipt', }, - { f_label: '审批状态', f_model: 'taskStatus', f_type: 'sel', f_selList: [] }, - { f_label: '报废类型', f_model: 'taskStatus', f_type: 'sel', f_selList: [] }, - { f_label: '创建时间', f_model: 'time', f_type: 'date' }, - ], - columnsList: [ - // { t_width: '55px', t_props: '', t_label: '序号' }, - { t_props: '', t_label: '预报废单号' }, - { t_props: '', t_label: '机具类型' }, - { t_props: '', t_label: '任务创建人' }, - { t_props: '', t_label: '任务创建时间' }, - { t_props: '', t_label: '审核状态' }, - ], - handleBtn: [ - { btn_title: '查看', id: 1 }, - { btn_title: '新增报废', id: 2 }, - { btn_title: '驳回退料', id: 3 }, - { btn_title: '审批详情', id: 4 }, - ], -} \ No newline at end of file diff --git a/sgzb-ui/src/views/scrapManage/Inventory/index.vue b/sgzb-ui/src/views/scrapManage/Inventory/index.vue index 05a8f2bf..0f009680 100644 --- a/sgzb-ui/src/views/scrapManage/Inventory/index.vue +++ b/sgzb-ui/src/views/scrapManage/Inventory/index.vue @@ -1,51 +1,87 @@ - + + components: { + Home, + PageHeader, + AddTools, + QueryTools, + }, + data() { + return { + isShowComponent: "Home", + pageContent: "盘点报废申请", + isEdit: false, + editTaskId: "", + editId: "", + queryId: "", + queryTaskId: "", + isView: false, + codingTaskId: "", + }; + }, - + methods: { + /* 新增工机具 */ + addTools() { + this.isEdit = false; + this.editTaskId = ""; + this.queryTaskId = ""; + this.pageContent = "报废新增"; + this.isShowComponent = "AddTools"; + }, + /* 新增成功 */ + addToolsSuccess() { + this.isShowComponent = "Home"; + }, + /* 编辑工机具 */ + editTools(taskId, id) { + this.isEdit = true; + this.pageContent = "报废编辑"; + this.editTaskId = taskId; + this.editId = id; + this.isShowComponent = "AddTools"; + }, + /* 查询工机具 */ + queryTools(taskId, id) { + this.isView = true; + this.pageContent = "详情信息"; + this.queryTaskId = taskId; + this.queryId = id; + this.isShowComponent = "QueryTools"; + }, + /* 返回按钮 */ + goBack() { + this.isShowComponent = "Home"; + }, + }, +}; + \ No newline at end of file diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 7acfb39e..9702ee15 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,7 +43,7 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - target: `http://192.168.2.127:28080`, //超 + target: `http://192.168.2.131:28080`, //超 // target: `http://10.40.92.81:28080`, //韩/ // target: `http://192.168.2.82:28080`,//旭/ // target: `http://192.168.2.248:28080`, //帅