From f0bb390907616536a4d76774d4b558a9aec72b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Wed, 4 Sep 2024 15:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/orders.js | 14 ++ src/api/model/setup.js | 44 +++++ src/assets/icons/RegularTime.vue | 17 ++ src/assets/icons/index.js | 1 + src/utils/websocket.js | 6 +- src/views/order/inventoryList/index.vue | 2 +- src/views/setting/advanced/index.vue | 12 +- .../setting/advanced/setup/regularTime.vue | 181 ++++++++++++++++++ 8 files changed, 269 insertions(+), 8 deletions(-) create mode 100644 src/assets/icons/RegularTime.vue create mode 100644 src/views/setting/advanced/setup/regularTime.vue diff --git a/src/api/model/orders.js b/src/api/model/orders.js index f85431f..33be3e1 100644 --- a/src/api/model/orders.js +++ b/src/api/model/orders.js @@ -221,6 +221,13 @@ export default { get: async function (params) { return await http.post(this.url, params); }, + }, + field:{ + url: `${config.API_URL}/inventory.field.list`, + name: "库存列表检索", + post: async function (params) { + return await http.post(this.url,params); + } } }, out:{ @@ -230,6 +237,13 @@ export default { get: async function (params) { return await http.post(this.url, params); }, + }, + field:{ + url: `${config.API_URL}/out.stock.field.list`, + name: "销售出库清单检索", + post: async function (params) { + return await http.post(this.url,params); + } } } } diff --git a/src/api/model/setup.js b/src/api/model/setup.js index 5c9d8bf..afed544 100644 --- a/src/api/model/setup.js +++ b/src/api/model/setup.js @@ -103,6 +103,50 @@ export default { } }, }, + crontab:{ + configList:{ + url: `${config.API_URL}/crontab.config.list`, + name: "定时系统配置列表", + get: async function (data) { + return await http.post(this.url, data); + }, + }, + list:{ + url: `${config.API_URL}/crontab.list`, + name: "定时任务列表", + get: async function (data) { + return await http.post(this.url, data); + }, + }, + add:{ + url: `${config.API_URL}/crontab.add`, + name: "添加配置", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + status:{ + url: `${config.API_URL}/crontab.status`, + name: "定时任务状态", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + delete:{ + url: `${config.API_URL}/crontab.delete`, + name: "删除配置", + post: async function (data) { + return await http.post(this.url, data); + }, + }, + describe:{ + url: `${config.API_URL}/crontab.describe`, + name: "定时任务表达式转换", + post: async function (data) { + return await http.post(this.url, data); + }, + } + }, bom:{ list:{ url: `${config.API_URL}/bom.list`, diff --git a/src/assets/icons/RegularTime.vue b/src/assets/icons/RegularTime.vue new file mode 100644 index 0000000..cacedf8 --- /dev/null +++ b/src/assets/icons/RegularTime.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index 76a25b0..b262b39 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -27,6 +27,7 @@ export { default as FormXls } from './FormXls.vue' export { default as AgentMaintenance } from './AgentMaintenance.vue' export { default as CostAllocation } from './CostAllocation.vue' export { default as K3Api } from './K3Api.vue' +export { default as RegularTime } from './RegularTime.vue' export { default as CostSetup } from './CostSetup.vue' export { default as MaterialSetup } from './MaterialSetup.vue' export { default as MaintenanceSetup } from './MaintenanceSetup.vue' diff --git a/src/utils/websocket.js b/src/utils/websocket.js index 1594b7e..1d9a935 100644 --- a/src/utils/websocket.js +++ b/src/utils/websocket.js @@ -139,11 +139,9 @@ function webSocketOnMessage(msg) { global_callback(result); } } - if (result.data && (result.data.type == -1 || result.data.type == 0 || result.data.type == 8 || result.data.type == 9)) { + if (result.data && (result.data.type == -1 || result.data.type == 0 || result.data.type == 9 || result.data.type == 13)) { if(result.data.type == -1 || result.data.type == 0){ - if(result.data && result.data.data.token){ - console.log(result.data.data.token) - // tool.cookie.set("TOKEN", result.data.data.token); + if(result.data && result.data.data && result.data.data.token){ let reToken = result.data.data.token.replace(/Bearer /g, ""); tool.cookie.set("TOKEN", reToken); } diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue index 5e2cc40..e5390ec 100644 --- a/src/views/order/inventoryList/index.vue +++ b/src/views/order/inventoryList/index.vue @@ -2,7 +2,7 @@
- 新增工单 + 新增库存