diff --git a/nc_wms_web/src/App.vue b/nc_wms_web/src/App.vue
index 0da5d38..6198035 100644
--- a/nc_wms_web/src/App.vue
+++ b/nc_wms_web/src/App.vue
@@ -14,6 +14,7 @@
:theme="{
algorithm: compactFlag ? theme.compactAlgorithm : theme.defaultAlgorithm,
token: {
+ fontFamily: '微软雅黑, Arial, sans-serif',
colorPrimary: themeColors[colorIndex].primaryColor,
colorLink: themeColors[colorIndex].primaryColor,
colorLinkActive: themeColors[colorIndex].activeColor,
diff --git a/nc_wms_web/src/config/app-config.ts b/nc_wms_web/src/config/app-config.ts
index 68f9151..092821d 100644
--- a/nc_wms_web/src/config/app-config.ts
+++ b/nc_wms_web/src/config/app-config.ts
@@ -25,7 +25,7 @@ export const appDefaultConfig: AppConfig = {
// 菜单主题
sideMenuTheme: 'dark',
// 主题颜色索引
- colorIndex: 0,
+ colorIndex: 1,
// 顶部菜单页面宽度
pageWidth: '99%',
// 圆角
@@ -41,13 +41,13 @@ export const appDefaultConfig: AppConfig = {
// 页脚
footerFlag: true,
// 帮助文档
- helpDocFlag: true,
+ helpDocFlag: false,
// 帮助文档默认展开
- helpDocExpandFlag: true,
+ helpDocExpandFlag: false,
// 水印
- watermarkFlag: true,
+ watermarkFlag: false,
// 网站名称
- websiteName: 'SmartAdmin 3.X',
+ websiteName: 'wms',
// 主题颜色
primaryColor: '#1677ff',
// 紧凑
diff --git a/nc_wms_web/src/views/business/wms/base/address/address-list.vue b/nc_wms_web/src/views/business/wms/base/address/address-list.vue
index 2733f21..c72e7b9 100644
--- a/nc_wms_web/src/views/business/wms/base/address/address-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/address/address-list.vue
@@ -96,18 +96,18 @@
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -218,7 +218,8 @@ const columns = ref([
title: '操作',
dataIndex: 'action',
fixed: 'right',
- width: 140,
+ align: 'center',
+ width: 150,
},
]);
@@ -279,7 +280,7 @@ onMounted(queryData);
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
-function showForm(data:object) {
+function showForm(data: object) {
formRef.value.show(data);
}
@@ -319,7 +320,7 @@ async function requestDelete(data: any) {
// 选择表格行
const selectedRowKeyList = ref([]);
-function onSelectChange(selectedRowKeys:any) {
+function onSelectChange(selectedRowKeys: any) {
selectedRowKeyList.value = selectedRowKeys;
}
diff --git a/nc_wms_web/src/views/business/wms/base/area/area-list.vue b/nc_wms_web/src/views/business/wms/base/area/area-list.vue
index 2c37c06..fdf8b8b 100644
--- a/nc_wms_web/src/views/business/wms/base/area/area-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/area/area-list.vue
@@ -79,7 +79,12 @@
-->
- {{ text ? '启用' : '禁用' }}
+ handleChangeDisabled(checked, record)"
+ :checked="record.disabledFlag"
+ checked-children="启用"
+ un-checked-children="禁用"
+ />
@@ -93,18 +98,19 @@
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
+
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -142,7 +148,6 @@ import TableOperator from '/@/components/support/table-operator/index.vue';
import AreaForm from '/@/views/business/wms/base/area/area-form.vue';
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
import AreaSelect from "/@/views/business/wms/base/area/area-select.vue";
-
// ---------------------------- 表格列 ----------------------------
const columns = ref([
@@ -180,7 +185,8 @@ const columns = ref([
title: '操作',
dataIndex: 'action',
fixed: 'right',
- width: 140,
+ align: 'center',
+ width: 150,
},
]);
@@ -217,7 +223,7 @@ function onSearch() {
//选择库区
function changeAreaSelect(selectValue: any) {
- if(selectValue){
+ if (selectValue) {
queryForm.areaId = selectValue.areaId;
}
}
@@ -236,8 +242,37 @@ async function queryData() {
}
}
+// ----------------------- 启用/禁用 ------------------------
+function handleChangeDisabled(disabledFlag:boolean, record:object) {
+ const content = disabledFlag ? '"启用"' + record.areaName : '"禁用"' + record.areaName + ",确认是否继续?";
+ Modal.confirm({
+ title: '提示',
+ content: '此操作将' + content,
+ okText: '确认',
+ okType: 'danger',
+ onOk() {
+ requestChangeDisabled(disabledFlag, record);
+ },
+ cancelText: '取消',
+ onCancel() {
+ },
+ });
+}
+
+async function requestChangeDisabled(disabledFlag:boolean, record:object) {
+ SmartLoading.show();
+ try {
+ record.disabledFlag = disabledFlag;
+ await areaApi.update(record);
+ message.success('操作成功');
+ onSearch();
+ } catch (e) {
+ smartSentry.captureError(e);
+ } finally {
+ SmartLoading.hide();
+ }
+}
-onMounted(queryData);
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
@@ -321,4 +356,6 @@ async function requestBatchDelete() {
SmartLoading.hide();
}
}
+
+onMounted(queryData);
diff --git a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
index 13cef1a..7624e87 100644
--- a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
@@ -74,24 +74,29 @@
- {{ text ? '启用' : '禁用' }}
+ handleChangeDisabled(checked, record)"
+ :checked="record.disabledFlag"
+ checked-children="启用"
+ un-checked-children="禁用"
+ />
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -177,7 +182,8 @@ const columns = ref([
title: '操作',
dataIndex: 'action',
fixed: 'right',
- width: 140,
+ align: 'center',
+ width: 150,
},
]);
@@ -233,8 +239,36 @@ async function queryData() {
}
}
+// ----------------------- 启用/禁用 ------------------------
+function handleChangeDisabled(disabledFlag: boolean, record: object) {
+ const content = disabledFlag ? '"启用"' + record.customerName : '"禁用"' + record.customerName + ",确认是否继续?";
+ Modal.confirm({
+ title: '提示',
+ content: '此操作将' + content,
+ okText: '确认',
+ okType: 'danger',
+ onOk() {
+ requestChangeDisabled(disabledFlag, record);
+ },
+ cancelText: '取消',
+ onCancel() {
+ },
+ });
+}
-onMounted(queryData);
+async function requestChangeDisabled(disabledFlag: boolean, record: object) {
+ SmartLoading.show();
+ try {
+ record.disabledFlag = disabledFlag;
+ await customerApi.update(record);
+ message.success('操作成功');
+ onSearch();
+ } catch (e) {
+ smartSentry.captureError(e);
+ } finally {
+ SmartLoading.hide();
+ }
+}
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
@@ -305,11 +339,13 @@ async function requestBatchDelete() {
SmartLoading.show();
await customerApi.batchDelete(selectedRowKeyList.value);
message.success('删除成功');
- queryData();
+ await queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
+
+onMounted(queryData);
diff --git a/nc_wms_web/src/views/business/wms/base/item/item-list.vue b/nc_wms_web/src/views/business/wms/base/item/item-list.vue
index 99da532..0c3fca1 100644
--- a/nc_wms_web/src/views/business/wms/base/item/item-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/item/item-list.vue
@@ -87,7 +87,12 @@
- {{ text ? '启用' : '禁用' }}
+ handleChangeDisabled(checked, record)"
+ :checked="record.disabledFlag"
+ checked-children="启用"
+ un-checked-children="禁用"
+ />
@@ -100,18 +105,16 @@
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -232,7 +235,8 @@ const columns = ref([
title: '操作',
dataIndex: 'action',
fixed: 'right',
- width: 140,
+ align: 'center',
+ width: 150,
},
]);
@@ -288,8 +292,36 @@ async function queryData() {
}
}
+// ----------------------- 启用/禁用 ------------------------
+function handleChangeDisabled(disabledFlag: boolean, record: object) {
+ const content = disabledFlag ? '"启用"' + record.itemCode : '"禁用"' + record.itemCode + ",确认是否继续?";
+ Modal.confirm({
+ title: '提示',
+ content: '此操作将' + content,
+ okText: '确认',
+ okType: 'danger',
+ onOk() {
+ requestChangeDisabled(disabledFlag, record);
+ },
+ cancelText: '取消',
+ onCancel() {
+ },
+ });
+}
-onMounted(queryData);
+async function requestChangeDisabled(disabledFlag: boolean, record: object) {
+ SmartLoading.show();
+ try {
+ record.disabledFlag = disabledFlag;
+ await itemApi.update(record);
+ message.success('操作成功');
+ onSearch();
+ } catch (e) {
+ smartSentry.captureError(e);
+ } finally {
+ SmartLoading.hide();
+ }
+}
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
@@ -435,4 +467,6 @@ async function onImportItems() {
function onExportItems() {
itemApi.exportItems();
}
+
+onMounted(queryData);
diff --git a/nc_wms_web/src/views/business/wms/base/location/location-list.vue b/nc_wms_web/src/views/business/wms/base/location/location-list.vue
index 7e10820..223d05f 100644
--- a/nc_wms_web/src/views/business/wms/base/location/location-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/location/location-list.vue
@@ -122,7 +122,12 @@
-->
- {{ text ? '启用' : '禁用' }}
+ handleChangeDisabled(checked, record)"
+ :checked="record.disabledFlag"
+ checked-children="启用"
+ un-checked-children="禁用"
+ />
@@ -137,18 +142,16 @@
-
-
-
-
- 编辑
-
-
-
-
-
- 删除
-
+
+
+ 编辑
+
+
+ 删除
+
+
@@ -289,7 +292,8 @@ const columns = ref([
title: '操作',
dataIndex: 'action',
fixed: 'right',
- width: 140,
+ align: 'center',
+ width: 150,
},
]);
@@ -357,8 +361,37 @@ async function queryData() {
}
}
+// ----------------------- 启用/禁用 ------------------------
+function handleChangeDisabled(disabledFlag: boolean, record: object) {
+ const content = disabledFlag ? '"启用"' + record.locationCode : '"禁用"' + record.locationCode + ",确认是否继续?";
+ Modal.confirm({
+ title: '提示',
+ content: '此操作将' + content,
+ okText: '确认',
+ okType: 'danger',
+ onOk() {
+ requestChangeDisabled(disabledFlag, record);
+ },
+ cancelText: '取消',
+ onCancel() {
+ },
+ });
+}
+
+async function requestChangeDisabled(disabledFlag: boolean, record: object) {
+ SmartLoading.show();
+ try {
+ record.disabledFlag = disabledFlag;
+ await locationApi.update(record);
+ message.success('操作成功');
+ onSearch();
+ } catch (e) {
+ smartSentry.captureError(e);
+ } finally {
+ SmartLoading.hide();
+ }
+}
-onMounted(queryData);
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
@@ -519,6 +552,7 @@ function onExportLocations() {
locationApi.exportLocations();
}
+onMounted(queryData);
diff --git a/nc_wms_web/src/views/support/message/components/message-receiver-modal.vue b/nc_wms_web/src/views/support/message/components/message-receiver-modal.vue
index 87a3422..75ae591 100644
--- a/nc_wms_web/src/views/support/message/components/message-receiver-modal.vue
+++ b/nc_wms_web/src/views/support/message/components/message-receiver-modal.vue
@@ -54,13 +54,11 @@
-