From c6906b43a6fa9b0b6bb93c68136190b29c11b063 Mon Sep 17 00:00:00 2001
From: ljh <ljh@LJH>
Date: Wed, 3 Jul 2024 15:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E4=BD=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/api/main/materials.ts                 | 10 +++++++++-
 .../component/editClassifyOpenAccess.vue      |  2 +-
 Web/src/views/basics-date/matter/index.vue    | 11 +++++++----
 Web/src/views/basics-date/unit/index.vue      | 19 +++++++++++++++----
 4 files changed, 32 insertions(+), 10 deletions(-)

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 @@
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="物料类型" :rules="[{ required: true, message: '物料类型不能为空', trigger: 'blur' }]">
-                            <el-input v-model="ruleForm.name" placeholder="请输入名称" clearable />
+                            <el-input v-model="ruleForm.name" placeholder="请输入名称" clearable maxlength="32" />
                         </el-form-item>
                     </el-col>
                 </el-row>
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 @@
             <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
               <el-form-item label="分类">
                 <el-input v-model="queryParams.classify" clearable="" placeholder="请输入分类"/>
-                
+
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
@@ -89,7 +89,6 @@
           highlight-current-row
           @current-change="radioChangeEvent"
          >
-        <el-table-column type="index" label="序号" width="55" align="center"/>
         <el-table-column prop="name" label="名称"  show-overflow-tooltip="" />
         <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')"   >
           <template #default="scope">
@@ -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 ? '是' : '否' }}
                       </template>
                     </el-table-column>
-                    <el-table-column label="操作"align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')">
+                    <el-table-column width="200" label="操作"align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')">
                       <template #default="scope">
                         <vxe-button type="text" @click="editUnit(scope.row)" icon="vxe-icon-edit">修改</vxe-button>
                         <vxe-button type="text" @click="deleteUnit(scope.row)" icon="vxe-icon-delete" style="color: rgb(223, 65, 65)">删除</vxe-button>
@@ -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='编辑'