diff --git a/Web/src/api/main/materials.ts b/Web/src/api/main/materials.ts
index 614213d..d207b44 100644
--- a/Web/src/api/main/materials.ts
+++ b/Web/src/api/main/materials.ts
@@ -6,7 +6,8 @@ enum Api {
PageMaterials = '/api/materials/page',
DetailMaterials = '/api/materials/detail',
ListMaterials = '/api/materials/list',
- MtListBySourceId = '/api/materialList/listBySourceId'
+ MtListBySourceId = '/api/materialList/listBySourceId',
+ CheckMaterials = '/api/materials/CheckById',
}
// 增加物料
@@ -48,6 +49,13 @@ export const detailMaterials = (id: any) =>
method: 'get',
data: { id },
});
+// 校验物料是否存在
+export const checkMaterials = (classifyId: any) =>
+ request({
+ url: Api.CheckMaterials,
+ method: 'get',
+ data: { classifyId },
+ });
// 物料列表
export const listMaterials = () =>
diff --git a/Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue b/Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
index 39b4802..54da3f1 100644
--- a/Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
+++ b/Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
@@ -6,7 +6,7 @@
-
+
diff --git a/Web/src/views/basics-date/matter/index.vue b/Web/src/views/basics-date/matter/index.vue
index 97a56d0..04f9da1 100644
--- a/Web/src/views/basics-date/matter/index.vue
+++ b/Web/src/views/basics-date/matter/index.vue
@@ -18,7 +18,7 @@
-
+
@@ -89,7 +89,6 @@
highlight-current-row
@current-change="radioChangeEvent"
>
-
@@ -170,7 +169,7 @@
import editDialog from '/@/views/basics-date/matter/component/editOpenAccess.vue'
import editClassifyDialog from '/@/views/basics-date/matter/component/editClassifyOpenAccess.vue'
- import { pageMaterials, deleteMaterials } from '/@/api/main/materials';
+ import {pageMaterials, deleteMaterials, detailMaterials, checkMaterials} from '/@/api/main/materials';
import {
deleteMaterialsClassify,
listMaterialsClassify,
@@ -277,7 +276,11 @@
};
// 物料类型删除
- const delMaterialsClassify = (row: any) => {
+ const delMaterialsClassify = async (row: any) => {
+ const materResult = await checkMaterials(row.id);
+ if(materResult.data.result) {
+ return ElMessage.error("存在物料数据,不允许删除")
+ }
ElMessageBox.confirm(`确定要删除吗?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
diff --git a/Web/src/views/basics-date/unit/index.vue b/Web/src/views/basics-date/unit/index.vue
index a451004..58e9d2a 100644
--- a/Web/src/views/basics-date/unit/index.vue
+++ b/Web/src/views/basics-date/unit/index.vue
@@ -86,7 +86,7 @@
{{ scope.row.isBaseUnit ? '是' : '否' }}
-
+
修改
删除
@@ -348,9 +348,9 @@ const handleCurrentChange = (val: number) => {
const addUnit= ()=>{
-
- dialogTableVisible.value=true;
- mTitle.value='新增'
+ unitFrom.value.codeNum = 'DW'+ getCurrentDate();
+ dialogTableVisible.value=true;
+ mTitle.value='新增'
}
//提交
@@ -386,6 +386,17 @@ const unitSubmit = async () => {
}
}
+const getCurrentDate = () => {
+ const now = new Date();
+ const year = now.getFullYear();
+ const month = (now.getMonth() + 1).toString().padStart(2, '0');
+ const day = now.getDate().toString().padStart(2, '0');
+ const hours = now.getHours().toString().padStart(2, '0');
+ const minutes = now.getMinutes().toString().padStart(2, '0');
+ const seconds = now.getSeconds().toString().padStart(2, '0');
+ return `${year}${month}${day}${hours}${minutes}${seconds}`;
+}
+
const editUnit=async(row:any)=>{
unitFrom.value=row;
mTitle.value='编辑'