diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index e4e2a22..f310a7e 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -101,6 +101,7 @@ + diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index e4e2a22..f310a7e 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -101,6 +101,7 @@ + diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 717ed4d..8d313ea 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -279,7 +279,7 @@ diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 717ed4d..8d313ea 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -279,7 +279,7 @@ diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index e4e2a22..f310a7e 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -101,6 +101,7 @@ + diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 717ed4d..8d313ea 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -279,7 +279,7 @@ diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index df1d62b..567362e 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -77,17 +77,9 @@ } } else { - // 基本信息 const data = JSON.parse($route.query.row as string) + ruleForm.value.year = String(currentYear.value) typeFlag.value = data.planType - ruleForm.value = { - ...data, - equipmentIds: [], - } - // 获取计划列表 - getInfoList(data.id, '').then((res) => { - ruleForm.value.equipmentIds = res.data - }) // 判断是否追加计划 if ($route.query.append) { // 修改计量计划为追加 @@ -97,7 +89,20 @@ ruleForm.value.createUserName = userStore.name ruleForm.value.createDeptId = userStore.deptId ruleForm.value.createDeptName = userStore.deptName + if (typeFlag.value === '0') { + ruleForm.value.planName = '2023年年度计量计划' + } + return } + // 基本信息 + ruleForm.value = { + ...data, + equipmentIds: [], + } + // 获取计划列表 + getInfoList(data.id, '').then((res) => { + ruleForm.value.equipmentIds = res.data + }) // detailPlan(data.id).then((res) => { // // ruleForm.value = res.data // console.log(res.data, '基本信息') @@ -137,11 +142,11 @@ type: 'warning', }, ).then((_res) => { - if ($route.query.category as string === 'season') { + if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' } - else if ($route.query.category as string === 'month') { + else if ($route.query.category as string === 'month' || typeFlag.value === '2') { ruleForm.value.planName = `${currentYear.value}年${ruleForm.value.month}月月度计量计划` ruleForm.value.planType = '2' } @@ -302,10 +307,10 @@ - {{ currentYear }}年第 季度计量计划 + {{ currentYear }}年第 季度计量计划 - {{ currentYear }}年 月月度计量计划 + {{ currentYear }}年 月月度计量计划 diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index e4e2a22..f310a7e 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -101,6 +101,7 @@ + diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 717ed4d..8d313ea 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -279,7 +279,7 @@ diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index df1d62b..567362e 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -77,17 +77,9 @@ } } else { - // 基本信息 const data = JSON.parse($route.query.row as string) + ruleForm.value.year = String(currentYear.value) typeFlag.value = data.planType - ruleForm.value = { - ...data, - equipmentIds: [], - } - // 获取计划列表 - getInfoList(data.id, '').then((res) => { - ruleForm.value.equipmentIds = res.data - }) // 判断是否追加计划 if ($route.query.append) { // 修改计量计划为追加 @@ -97,7 +89,20 @@ ruleForm.value.createUserName = userStore.name ruleForm.value.createDeptId = userStore.deptId ruleForm.value.createDeptName = userStore.deptName + if (typeFlag.value === '0') { + ruleForm.value.planName = '2023年年度计量计划' + } + return } + // 基本信息 + ruleForm.value = { + ...data, + equipmentIds: [], + } + // 获取计划列表 + getInfoList(data.id, '').then((res) => { + ruleForm.value.equipmentIds = res.data + }) // detailPlan(data.id).then((res) => { // // ruleForm.value = res.data // console.log(res.data, '基本信息') @@ -137,11 +142,11 @@ type: 'warning', }, ).then((_res) => { - if ($route.query.category as string === 'season') { + if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' } - else if ($route.query.category as string === 'month') { + else if ($route.query.category as string === 'month' || typeFlag.value === '2') { ruleForm.value.planName = `${currentYear.value}年${ruleForm.value.month}月月度计量计划` ruleForm.value.planType = '2' } @@ -302,10 +307,10 @@ - {{ currentYear }}年第 季度计量计划 + {{ currentYear }}年第 季度计量计划 - {{ currentYear }}年 月月度计量计划 + {{ currentYear }}年 月月度计量计划 diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue index 0e5d0af..e7c3cd2 100644 --- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue +++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue @@ -65,10 +65,10 @@ - {{ currentYear }}年第 季度计量计划 + {{ currentYear }}年第 季度计量计划 - {{ currentYear }}年 月月度计量计划 + {{ currentYear }}年 月月度计量计划 @@ -93,8 +93,8 @@ diff --git a/.env.development b/.env.development index 35bd2f1..52b6555 100644 --- a/.env.development +++ b/.env.development @@ -2,8 +2,8 @@ VITE_APP_TITLE = 计量信息系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 # VITE_APP_API_BASEURL = http://139.198.29.133:8089 -# VITE_APP_API_BASEURL = http://111.198.10.15:21611 -VITE_APP_API_BASEURL = http://192.168.8.107:5909 +VITE_APP_API_BASEURL = http://111.198.10.15:21611 +# VITE_APP_API_BASEURL = http://192.168.8.107:5909 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0127d2f..3bd0a89 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://192.168.8.107:5909" + "baseUrl": "http://111.198.10.15:21611" } diff --git a/src/api/approval.ts b/src/api/approval.ts new file mode 100644 index 0000000..3a4f688 --- /dev/null +++ b/src/api/approval.ts @@ -0,0 +1,18 @@ +// 审批接口 +import request from './index' + +// 设备审批记录 +export function fetchApprovalDevice(params: object) { + return request({ + url: '/equipment/approval/equipmentLog', + method: 'get', + params, + }) +} +export function fetchApproval(params: object) { + return request({ + url: '/approval/operate/approvalLog', + method: 'get', + params, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts index e1bbc12..c4066d0 100644 --- a/src/api/eqpt/subpackage/directory.ts +++ b/src/api/eqpt/subpackage/directory.ts @@ -2,7 +2,7 @@ * 分包名录管理接口 */ import request from '@/api/index' - +const $route = useRoute() // 不同状态列表分页 export function getListPage(params: object, statusName: string) { if (statusName === '全部') { @@ -43,12 +43,22 @@ }) } // 保存编辑 -export function editDirectory(data: object) { - return request({ - url: '/subcontractor/approval/saveOrUpdate', - method: 'post', - data, - }) +export function editDirectory(data: object, type: string) { + console.log($route, 'route') + if (type === '全部' && window.location.href.includes('update')) { + return request({ + url: '/subcontractor/update', + method: 'post', + data, + }) + } + else { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) + } } // 提交 export function submitDirectory(data: object) { @@ -59,11 +69,19 @@ }) } // 删除记录 -export function deleteDirectory(data: object) { - return request({ - url: `/subcontractor/remove?id=${data.id}`, - method: 'post', - }) +export function deleteDirectory(data: object, type: string) { + if (type === '全部') { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) + } + else { + return request({ + url: `/subcontractor/approval/delete?id=${data.id}`, + method: 'post', + }) + } } // 取消 export function cancelDirectory(data: object) { diff --git a/src/components.d.ts b/src/components.d.ts index ace8c08..bb75c7a 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -13,6 +13,8 @@ AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default'] ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default'] + ApprovalRecordTable: typeof import('./components/ApprovalRecord/ApprovalRecordTable.vue')['default'] + ApprovalRecordTableDevice: typeof import('./components/ApprovalRecord/ApprovalRecordTableDevice.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] diff --git a/src/components/ApprovalRecord/ApprovalRecordTable.vue b/src/components/ApprovalRecord/ApprovalRecordTable.vue new file mode 100644 index 0000000..fb29223 --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTable.vue @@ -0,0 +1,158 @@ + + + + diff --git a/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue new file mode 100644 index 0000000..8e2887a --- /dev/null +++ b/src/components/ApprovalRecord/ApprovalRecordTableDevice.vue @@ -0,0 +1,173 @@ + + + + diff --git a/src/components/ApprovalRecord/approval-interface.ts b/src/components/ApprovalRecord/approval-interface.ts new file mode 100644 index 0000000..b950897 --- /dev/null +++ b/src/components/ApprovalRecord/approval-interface.ts @@ -0,0 +1,12 @@ +export interface IList { + assigneeName: string // 审批人姓名 + cindex?: number + type: string // 状态 + finishTime: string // 审批时间 + comment: string // 审批意见 + nodeNumber: number // 节点号 + approvalStatus: string // 审批类型 + duration: string // 用时 + approvalLogs?: any[] + approvalLogsList?: any[] +} diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index e4e2a22..f310a7e 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -101,6 +101,7 @@ + diff --git a/src/views/tested/MeasurementPlan/early/components/list.vue b/src/views/tested/MeasurementPlan/early/components/list.vue index 717ed4d..8d313ea 100644 --- a/src/views/tested/MeasurementPlan/early/components/list.vue +++ b/src/views/tested/MeasurementPlan/early/components/list.vue @@ -279,7 +279,7 @@ diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue index df1d62b..567362e 100644 --- a/src/views/tested/MeasurementPlan/plan/components/edit.vue +++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue @@ -77,17 +77,9 @@ } } else { - // 基本信息 const data = JSON.parse($route.query.row as string) + ruleForm.value.year = String(currentYear.value) typeFlag.value = data.planType - ruleForm.value = { - ...data, - equipmentIds: [], - } - // 获取计划列表 - getInfoList(data.id, '').then((res) => { - ruleForm.value.equipmentIds = res.data - }) // 判断是否追加计划 if ($route.query.append) { // 修改计量计划为追加 @@ -97,7 +89,20 @@ ruleForm.value.createUserName = userStore.name ruleForm.value.createDeptId = userStore.deptId ruleForm.value.createDeptName = userStore.deptName + if (typeFlag.value === '0') { + ruleForm.value.planName = '2023年年度计量计划' + } + return } + // 基本信息 + ruleForm.value = { + ...data, + equipmentIds: [], + } + // 获取计划列表 + getInfoList(data.id, '').then((res) => { + ruleForm.value.equipmentIds = res.data + }) // detailPlan(data.id).then((res) => { // // ruleForm.value = res.data // console.log(res.data, '基本信息') @@ -137,11 +142,11 @@ type: 'warning', }, ).then((_res) => { - if ($route.query.category as string === 'season') { + if ($route.query.category as string === 'season' || typeFlag.value === '1') { ruleForm.value.planName = `${currentYear.value}年第${ruleForm.value.season}季度计量计划` ruleForm.value.planType = '1' } - else if ($route.query.category as string === 'month') { + else if ($route.query.category as string === 'month' || typeFlag.value === '2') { ruleForm.value.planName = `${currentYear.value}年${ruleForm.value.month}月月度计量计划` ruleForm.value.planType = '2' } @@ -302,10 +307,10 @@ - {{ currentYear }}年第 季度计量计划 + {{ currentYear }}年第 季度计量计划 - {{ currentYear }}年 月月度计量计划 + {{ currentYear }}年 月月度计量计划 diff --git a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue index 0e5d0af..e7c3cd2 100644 --- a/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue +++ b/src/views/tested/MeasurementPlan/plan/components/infoDetail.vue @@ -65,10 +65,10 @@ - {{ currentYear }}年第 季度计量计划 + {{ currentYear }}年第 季度计量计划 - {{ currentYear }}年 月月度计量计划 + {{ currentYear }}年 月月度计量计划 @@ -93,8 +93,8 @@ diff --git a/src/views/tested/MeasurementPlan/plan/components/list.vue b/src/views/tested/MeasurementPlan/plan/components/list.vue index ea18fd7..893e7d5 100644 --- a/src/views/tested/MeasurementPlan/plan/components/list.vue +++ b/src/views/tested/MeasurementPlan/plan/components/list.vue @@ -73,11 +73,6 @@ value: 'createTime', align: 'center', }, - { - text: '审批状态', - value: 'approvalStatusName', - align: 'center', - }, ]) const list = ref([]) const total = ref(0) @@ -284,13 +279,18 @@ :list-loading="listLoading" :is-showmulti-select="true" @change="changePage" >