diff --git a/prettier.config.js b/prettier.config.js index e5197092..2fc52788 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -1,6 +1,6 @@ module.exports = { printWidth: 120, - tabWidth: 4, + tabWidth: 2, semi: false, vueIndentScriptAndStyle: false, singleQuote: true, diff --git a/src/api/toolsManage/index.js b/src/api/toolsManage/index.js index 3f943b50..f31453dd 100644 --- a/src/api/toolsManage/index.js +++ b/src/api/toolsManage/index.js @@ -5,7 +5,7 @@ export const getToolLedgerListApi = (data = {}) => { return request({ url: '/material-mall/toolLedger/list', method: 'GET', - params: data + params: data, }) } @@ -14,6 +14,78 @@ export const getToolSelectApi = (data = {}) => { return request({ url: '/material-mall/tool/getSelect', method: 'POST', - data: data + data: data, }) -} \ No newline at end of file +} + +// 工具录入申请-列表 +export const getToolApplyListApi = (data = {}) => { + return request({ + url: '/material-mall/toolApply/list', + method: 'GET', + params: data, + }) +} + +// 工具录入申请-删除 +export const deleteToolApplyApi = (data) => { + return request({ + url: '/material-mall/toolApply/delete', + method: 'POST', + data: data, + }) +} + +// 新增工具-列表 +export const getListByApplyIdApi = (data) => { + return request({ + url: '/material-mall/toolApply/listByApplyId', + method: 'GET', + params: data, + }) +} + +// 新增工具-删除 +export const deleteToolApi = (data) => { + return request({ + url: '/material-mall/toolApply/deleteDetail', + method: 'POST', + data: data, + }) +} + +// 类型树 +export const getTreeSelectApi = (data = {}) => { + return request({ + url: '/material-mall/toolApply/getTreeSelect', + method: 'GET', + params: data, + }) +} + +// 新增订单号 +export const addApplyCodeApi = (data = {}) => { + return request({ + url: '/material-mall/toolApply/add', + method: 'POST', + data: data, + }) +} + +// 新增工具 +export const addToolApi = (data = {}) => { + return request({ + url: '/material-mall/toolApply/addDetail', + method: 'POST', + data: data, + }) +} + +// 提交申请 +export const updateToolApplyApi = (data = {}) => { + return request({ + url: '/material-mall/toolApply/update', + method: 'POST', + data: data, + }) +} diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index aec6fed9..54a0d25d 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -126,7 +126,7 @@ aside { box-sizing: border-box; // display: flex; // flex-direction: column; - //overflow-y: auto; + overflow-y: auto; } .components-container { diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue index c0a08167..a63bbdf4 100644 --- a/src/views/material/ma/type/index.vue +++ b/src/views/material/ma/type/index.vue @@ -166,7 +166,7 @@ - + diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue new file mode 100644 index 00000000..2ec9e322 --- /dev/null +++ b/src/views/toolsManage/codeToolsLedger/index.vue @@ -0,0 +1,386 @@ + + + + + diff --git a/src/views/toolsManage/toolsApplication/addTools.vue b/src/views/toolsManage/toolsApplication/addTools.vue new file mode 100644 index 00000000..63b78126 --- /dev/null +++ b/src/views/toolsManage/toolsApplication/addTools.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/toolsManage/toolsApplication/applicantList.vue b/src/views/toolsManage/toolsApplication/applicantList.vue new file mode 100644 index 00000000..a22b7af6 --- /dev/null +++ b/src/views/toolsManage/toolsApplication/applicantList.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/src/views/toolsManage/toolsApplication/components/AddCode.vue b/src/views/toolsManage/toolsApplication/components/AddCode.vue new file mode 100644 index 00000000..a52da34b --- /dev/null +++ b/src/views/toolsManage/toolsApplication/components/AddCode.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/src/views/toolsManage/toolsApplication/components/AddNum.vue b/src/views/toolsManage/toolsApplication/components/AddNum.vue new file mode 100644 index 00000000..6b3f3fc3 --- /dev/null +++ b/src/views/toolsManage/toolsApplication/components/AddNum.vue @@ -0,0 +1,216 @@ + + + + +