From 0e5b330304ef3a726e0b31df70a497c1a8fb2893 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 14 Jan 2025 13:52:25 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BF=AE=E6=94=B9=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整表单标签宽度为 120px
- 移除或注释掉不必要的字段
- 优化物料类型选择器的提示文本
---
 src/views/mes/baseEqualMaterialInfo/index.vue | 11 ++++++----
 src/views/mes/baseMaterialType/index.vue      |  8 +++----
 .../mes/baseMeasurementUnitInfo/index.vue     |  4 ++--
 src/views/mes/baseShiftInfo/index.vue         |  2 +-
 src/views/mes/baseSupplierInfo/index.vue      | 22 +++++++++----------
 src/views/mes/baseToolingInfo/index.vue       |  2 +-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/baseEqualMaterialInfo/index.vue b/src/views/mes/baseEqualMaterialInfo/index.vue
index 87aaac6..6b7e06a 100644
--- a/src/views/mes/baseEqualMaterialInfo/index.vue
+++ b/src/views/mes/baseEqualMaterialInfo/index.vue
@@ -87,7 +87,7 @@
     </el-card>
     <!-- 添加或修改等同物料信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseEqualMaterialInfoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseEqualMaterialInfoFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="主键标识" prop="equalMaterialInfoId">
           <el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
         </el-form-item>-->
@@ -129,6 +129,7 @@
 <script setup name="BaseEqualMaterialInfo" lang="ts">
 import { listBaseEqualMaterialInfo, getBaseEqualMaterialInfo, delBaseEqualMaterialInfo, addBaseEqualMaterialInfo, updateBaseEqualMaterialInfo } from '@/api/mes/baseEqualMaterialInfo';
 import { BaseEqualMaterialInfoVO, BaseEqualMaterialInfoQuery, BaseEqualMaterialInfoForm } from '@/api/mes/baseEqualMaterialInfo/types';
+import {getBaseMaterialInfoList} from "@/api/mes/baseMaterialInfo";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@@ -141,7 +142,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const materialList = ref([]);
+
 
 const queryFormRef = ref<ElFormInstance>();
 const baseEqualMaterialInfoFormRef = ref<ElFormInstance>();
@@ -282,12 +283,14 @@ const handleExport = () => {
 }
 
 /*w物料下拉框*/
-const getListsSelect = () => {
-  let res = getBaseMaterialInfoList(null);
+let materialList = ref([]);
+const getListsSelect = async() => {
+  let res = await getBaseMaterialInfoList(null);
   materialList.value = res.data;
 }
 
 onMounted(() => {
+  getListsSelect();
   getList();
 });
 </script>
diff --git a/src/views/mes/baseMaterialType/index.vue b/src/views/mes/baseMaterialType/index.vue
index 8e5c5b0..578ffb6 100644
--- a/src/views/mes/baseMaterialType/index.vue
+++ b/src/views/mes/baseMaterialType/index.vue
@@ -10,9 +10,9 @@
 <!--            <el-form-item label="父级标识" prop="parentId">
               <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="物料类型编号" prop="matrialTypeCode">
+<!--            <el-form-item label="物料类型编号" prop="matrialTypeCode">
               <el-input v-model="queryParams.matrialTypeCode" placeholder="请输入物料类型编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item label="物料类型名称" prop="matrialTypeName">
               <el-input v-model="queryParams.matrialTypeName" placeholder="请输入物料类型名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -20,7 +20,7 @@
               <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
             <el-form-item label="物料大类" prop="materialCategories">
-              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类(1原材料  2半成品 3成品)" clearable>
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable>
                 <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
@@ -113,7 +113,7 @@
     </el-card>
     <!-- 添加或修改物料类型信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseMaterialTypeFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseMaterialTypeFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="物料类型ID" prop="matrialTypeId">
           <el-input v-model="form.matrialTypeId" placeholder="请输入物料类型ID" />
         </el-form-item>-->
diff --git a/src/views/mes/baseMeasurementUnitInfo/index.vue b/src/views/mes/baseMeasurementUnitInfo/index.vue
index e0a2d39..b1d97c8 100644
--- a/src/views/mes/baseMeasurementUnitInfo/index.vue
+++ b/src/views/mes/baseMeasurementUnitInfo/index.vue
@@ -60,11 +60,11 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
 <!--        <el-table-column label="主键标识" align="center" prop="unitId" />-->
-        <el-table-column label="父级标识" prop="parentId" />
+<!--        <el-table-column label="父级标识" prop="parentId" />-->
         <el-table-column label="计量单位编号" align="center" prop="unitCode" />
         <el-table-column label="计量单位名称" align="center" prop="unitName" />
         <el-table-column label="计量单位转换" align="center" prop="unitConversion" />
-        <el-table-column label="祖级列表" align="center" prop="ancestors" />
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
         <el-table-column label="单位类型" align="center" prop="unitType">
           <template #default="scope">
             <dict-tag :options="unit_type" :value="scope.row.unitType"/>
diff --git a/src/views/mes/baseShiftInfo/index.vue b/src/views/mes/baseShiftInfo/index.vue
index b72ce37..ed2cbd5 100644
--- a/src/views/mes/baseShiftInfo/index.vue
+++ b/src/views/mes/baseShiftInfo/index.vue
@@ -146,7 +146,7 @@
     </el-card>
     <!-- 添加或修改班次信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseShiftInfoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseShiftInfoFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="主键标识" prop="shiftId">
           <el-input v-model="form.shiftId" placeholder="请输入主键标识" />
         </el-form-item>
diff --git a/src/views/mes/baseSupplierInfo/index.vue b/src/views/mes/baseSupplierInfo/index.vue
index 14a52f4..edc724d 100644
--- a/src/views/mes/baseSupplierInfo/index.vue
+++ b/src/views/mes/baseSupplierInfo/index.vue
@@ -7,9 +7,9 @@
 <!--            <el-form-item label="主键标识" prop="supplierId">
               <el-input v-model="queryParams.supplierId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="供应商编号" prop="supplierCode">
+<!--            <el-form-item label="供应商编号" prop="supplierCode">
               <el-input v-model="queryParams.supplierCode" placeholder="请输入供应商编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item label="供应商名称" prop="supplierName">
               <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -32,7 +32,7 @@
                 :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
               />
             </el-form-item>
-            <el-form-item label="erp最后更新时间" style="width: 308px">
+<!--            <el-form-item label="erp最后更新时间" style="width: 308px">
               <el-date-picker
                 v-model="dateRangeErpModifyDate"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -42,7 +42,7 @@
                 end-placeholder="结束日期"
                 :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
               />
-            </el-form-item>
+            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -123,7 +123,7 @@
     </el-card>
     <!-- 添加或修改供应商信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseSupplierInfoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseSupplierInfoFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="主键标识" prop="supplierId">
           <el-input v-model="form.supplierId" placeholder="请输入主键标识" />
         </el-form-item>-->
@@ -133,9 +133,9 @@
         <el-form-item label="供应商名称" prop="supplierName">
           <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
         </el-form-item>
-        <el-form-item label="erp的主键" prop="erpId">
+<!--        <el-form-item label="erp的主键" prop="erpId">
           <el-input v-model="form.erpId" placeholder="请输入erp的主键" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="激活状态" prop="supplierStatus">
           <el-radio-group v-model="form.supplierStatus">
             <el-radio
@@ -153,14 +153,14 @@
             placeholder="请选择审核日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="erp最后更新时间" prop="erpModifyDate">
+<!--        <el-form-item label="erp最后更新时间" prop="erpModifyDate">
           <el-date-picker clearable
             v-model="form.erpModifyDate"
             type="datetime"
             value-format="YYYY-MM-DD HH:mm:ss"
             placeholder="请选择erp最后更新时间">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -209,10 +209,10 @@ const columns = ref<FieldOption[]>([
         { key: 1, label: `租户编号`, visible: true },*/
         { key: 0, label: `供应商编号`, visible: true },
         { key: 1, label: `供应商名称`, visible: true },
-        { key: 2, label: `erp的主键`, visible: true },
+        { key: 2, label: `erp`, visible: false },
         { key: 3, label: `激活状态`, visible: true },
         { key: 4, label: `审核日期`, visible: true },
-        { key: 5, label: `erp最后更新时间`, visible: true },
+        { key: 5, label: `erp最后更新时间`, visible: false },
         { key: 6, label: `备注`, visible: true },
 /*        { key: 9, label: `创建部门`, visible: true },
         { key: 10, label: `创建人`, visible: true },
diff --git a/src/views/mes/baseToolingInfo/index.vue b/src/views/mes/baseToolingInfo/index.vue
index 3d7f273..39cce2f 100644
--- a/src/views/mes/baseToolingInfo/index.vue
+++ b/src/views/mes/baseToolingInfo/index.vue
@@ -123,7 +123,7 @@
     </el-card>
     <!-- 添加或修改载具工装信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseToolingInfoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseToolingInfoFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="主键标识" prop="toolingId">
           <el-input v-model="form.toolingId" placeholder="请输入主键标识" />
         </el-form-item>-->