From 7a72616e762d7555a9cebcd3131492eab311790d Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Thu, 9 Jan 2025 09:45:02 +0800
Subject: [PATCH] =?UTF-8?q?change(hwmom-mes):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B9=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=80=BC=E9=BB=98=E8=AE=A4=E4=B8=BA"?=
 =?UTF-8?q?=E6=98=AF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为多个基础数据组件设置 初始化activeFlag 默认值为 '1'（添加对话框默认标识值为是）
- 调整计量单位信息对话框组件的激活标识显示和输入方式
- 移除班组对话框不必要的表单验证规则
---
 src/views/mes/baseClassTeamInfo/index.vue     |  9 +++-----
 src/views/mes/baseEqualMaterialInfo/index.vue |  2 +-
 src/views/mes/baseMaterialInfo/index.vue      |  6 ++---
 src/views/mes/baseMaterialType/index.vue      |  2 +-
 .../mes/baseMeasurementUnitInfo/index.vue     | 22 ++++++++++++++-----
 src/views/mes/baseShiftInfo/index.vue         |  6 ++---
 src/views/mes/baseToolingInfo/index.vue       |  2 +-
 7 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/views/mes/baseClassTeamInfo/index.vue b/src/views/mes/baseClassTeamInfo/index.vue
index 655c639..0ff022e 100644
--- a/src/views/mes/baseClassTeamInfo/index.vue
+++ b/src/views/mes/baseClassTeamInfo/index.vue
@@ -314,7 +314,7 @@ const initFormData: BaseClassTeamInfoForm = {
   processId: undefined,
   stationId: undefined,
   deviceId: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   createDept: undefined,
   createBy: undefined,
   createTime: undefined,
@@ -345,16 +345,13 @@ const data = reactive<PageData<BaseClassTeamInfoForm, BaseClassTeamInfoQuery>>({
     }
   },
   rules: {
-    classTeamId: [
-      { required: true, message: "主键标识不能为空", trigger: "blur" }
-    ],
     teamCode: [
       { required: true, message: "班组编号不能为空", trigger: "blur" }
     ],
     teamName: [
       { required: true, message: "班组名称不能为空", trigger: "blur" }
     ],
-    teamHead: [
+    /*teamHead: [
       { required: true, message: "班组负责人不能为空", trigger: "blur" }
     ],
     shiftId: [
@@ -368,7 +365,7 @@ const data = reactive<PageData<BaseClassTeamInfoForm, BaseClassTeamInfoQuery>>({
     ],
     deviceId: [
       { required: true, message: "设备ID不能为空", trigger: "blur" }
-    ],
+    ],*/
     activeFlag: [
       { required: true, message: "激活标识不能为空", trigger: "change" }
     ],
diff --git a/src/views/mes/baseEqualMaterialInfo/index.vue b/src/views/mes/baseEqualMaterialInfo/index.vue
index ac76396..87aaac6 100644
--- a/src/views/mes/baseEqualMaterialInfo/index.vue
+++ b/src/views/mes/baseEqualMaterialInfo/index.vue
@@ -170,7 +170,7 @@ const initFormData: BaseEqualMaterialInfoForm = {
   equalMaterialInfoId: undefined,
   materialId: undefined,
   equalMaterialId: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   remark: undefined,
 }
 const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery>>({
diff --git a/src/views/mes/baseMaterialInfo/index.vue b/src/views/mes/baseMaterialInfo/index.vue
index 9c7a1fc..d0bd5c5 100644
--- a/src/views/mes/baseMaterialInfo/index.vue
+++ b/src/views/mes/baseMaterialInfo/index.vue
@@ -22,8 +22,8 @@
             <el-form-item label="物料类型ID" prop="materialTypeId">
               <el-input v-model="queryParams.materialTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="物料大类(1原材料  2半成品 3成品)" prop="materialCategories">
-              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类(1原材料  2半成品 3成品)" clearable >
+            <el-form-item label="物料大类" prop="materialCategories">
+              <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>
@@ -719,7 +719,7 @@ const initFormData: BaseMaterialInfoForm = {
   createOrgId: undefined,
   useOrgId: undefined,
   prodLineId: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   deletedFlag: undefined,
   purchasePriceUnitId: undefined,
   approveDate: undefined,
diff --git a/src/views/mes/baseMaterialType/index.vue b/src/views/mes/baseMaterialType/index.vue
index 58172ba..8e5c5b0 100644
--- a/src/views/mes/baseMaterialType/index.vue
+++ b/src/views/mes/baseMaterialType/index.vue
@@ -226,7 +226,7 @@ const initFormData: BaseMaterialTypeForm = {
     materialCategories: undefined,
     materialSubclass: undefined,
     processId: undefined,
-    activeFlag: undefined,
+  activeFlag: '1',
     remark: undefined,
 }
 
diff --git a/src/views/mes/baseMeasurementUnitInfo/index.vue b/src/views/mes/baseMeasurementUnitInfo/index.vue
index a4a1004..e0a2d39 100644
--- a/src/views/mes/baseMeasurementUnitInfo/index.vue
+++ b/src/views/mes/baseMeasurementUnitInfo/index.vue
@@ -71,7 +71,11 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="激活标识(1是 0否)" align="center" prop="activeFlag" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
 <!--        <el-table-column label="创建部门" align="center" prop="createDept" />
         <el-table-column label="创建人" align="center" prop="createBy" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -102,7 +106,7 @@
     </el-card>
     <!-- 添加或修改计量单位信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="baseMeasurementUnitInfoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="baseMeasurementUnitInfoFormRef" :model="form" :rules="rules" label-width="120px">
 <!--        <el-form-item label="主键标识" prop="unitId">
           <el-input v-model="form.unitId" placeholder="请输入主键标识" />
         </el-form-item>-->
@@ -123,7 +127,8 @@
           <el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
         </el-form-item>
         <el-form-item label="计量单位转换" prop="unitConversion">
-          <el-input v-model="form.unitConversion" placeholder="请输入计量单位转换" />
+<!--          <el-input v-model="form.unitConversion" placeholder="请输入计量单位转换" />-->
+          <el-input-number v-model="form.unitConversion"   />
         </el-form-item>
 <!--        <el-form-item label="祖级列表" prop="ancestors">
           <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
@@ -142,7 +147,13 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="激活标识" prop="activeFlag">
-          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -168,6 +179,7 @@ type BaseMeasurementUnitInfoOption = {
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
 
 const { unit_type } = toRefs<any>(proxy?.useDict('unit_type'));
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
 
 const baseMeasurementUnitInfoList = ref<BaseMeasurementUnitInfoVO[]>([]);
 const baseMeasurementUnitInfoOptions = ref<BaseMeasurementUnitInfoOption[]>([]);
@@ -195,7 +207,7 @@ const initFormData: BaseMeasurementUnitInfoForm = {
     ancestors: undefined,
     unitType: undefined,
     remark: undefined,
-    activeFlag: undefined,
+    activeFlag: '1',
 }
 
 const data = reactive<PageData<BaseMeasurementUnitInfoForm, BaseMeasurementUnitInfoQuery>>({
diff --git a/src/views/mes/baseShiftInfo/index.vue b/src/views/mes/baseShiftInfo/index.vue
index e908ada..b72ce37 100644
--- a/src/views/mes/baseShiftInfo/index.vue
+++ b/src/views/mes/baseShiftInfo/index.vue
@@ -307,7 +307,7 @@ const initFormData: BaseShiftInfoForm = {
   endTime: undefined,
   endCrossFlag: undefined,
   workHour: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   createDept: undefined,
   createBy: undefined,
   createTime: undefined,
@@ -350,7 +350,7 @@ const data = reactive<PageData<BaseShiftInfoForm, BaseShiftInfoQuery>>({
     shiftName: [
       { required: true, message: "班次名称不能为空", trigger: "blur" }
     ],
-    startTime: [
+/*    startTime: [
       { required: true, message: "开始时间不能为空", trigger: "blur" }
     ],
     startCrossFlag: [
@@ -361,7 +361,7 @@ const data = reactive<PageData<BaseShiftInfoForm, BaseShiftInfoQuery>>({
     ],
     endCrossFlag: [
       { required: true, message: "结束跨天标识不能为空", trigger: "change" }
-    ],
+    ],*/
 /*    workHour: [
       { required: true, message: "标准工作时长不能为空", trigger: "blur" }
     ],*/
diff --git a/src/views/mes/baseToolingInfo/index.vue b/src/views/mes/baseToolingInfo/index.vue
index a7b6f56..3d7f273 100644
--- a/src/views/mes/baseToolingInfo/index.vue
+++ b/src/views/mes/baseToolingInfo/index.vue
@@ -244,7 +244,7 @@ const initFormData: BaseToolingInfoForm = {
   materialCode: undefined,
   weight: undefined,
   remark: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
 }
 const data = reactive<PageData<BaseToolingInfoForm, BaseToolingInfoQuery>>({
   form: {...initFormData},