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 @@
-
新增工单
+
新增库存
批量导入
diff --git a/src/views/setting/advanced/index.vue b/src/views/setting/advanced/index.vue
index 368f768..e1fcc10 100644
--- a/src/views/setting/advanced/index.vue
+++ b/src/views/setting/advanced/index.vue
@@ -39,10 +39,10 @@ import { defineAsyncComponent } from 'vue'
export default {
components: {
pushSettings: defineAsyncComponent(() => import('./setup/computerRoom')),
- password: defineAsyncComponent(() => import('./setup/computerRoom')),
upToEnterprise: defineAsyncComponent(() => import('./setup/computerRoom')),
+ password: defineAsyncComponent(() => import('./setup/computerRoom')),
+ regularTime: defineAsyncComponent(() => import('./setup/regularTime')),
account: defineAsyncComponent(() => import('./setup/computerRoom')),
- bind: defineAsyncComponent(() => import('./setup/computerRoom')),
mail: defineAsyncComponent(() => import('./setup/mail')),
interface: defineAsyncComponent(() => import('./setup/interface')),
cost: defineAsyncComponent(() => import('./setup/cost')),
@@ -78,7 +78,13 @@ export default {
title: "物料成本配置",
component: "material",
actions:'materialCostAdd'
- }
+ },
+ {
+ icon: "sc-icon-RegularTime",
+ title: "系统定时任务维护",
+ component: "regularTime",
+ actions:'crontabAdd'
+ },
]
},
{
diff --git a/src/views/setting/advanced/setup/regularTime.vue b/src/views/setting/advanced/setup/regularTime.vue
new file mode 100644
index 0000000..70f863d
--- /dev/null
+++ b/src/views/setting/advanced/setup/regularTime.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
任务信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存配置
+
+
+
配置列表
+
+
+ 删除配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+