From 1b9f4b30b40c03a7168b249173c5db23e12a7bea Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Sat, 25 May 2024 09:52:18 +0800
Subject: [PATCH] fix unit

---
 src/views/erp/mold/components/MoldForm.vue    | 20 ++++-
 src/views/erp/mold/index.vue                  | 48 +-----------
 src/views/mes/bom/BomForm.vue                 | 16 +++-
 .../mes/bom/components/BomDetailForm.vue      | 39 +++++-----
 .../mes/bom/components/BomDetailList.vue      |  4 +-
 src/views/mes/bom/index.vue                   | 31 +-------
 src/views/mes/organization/index.vue          | 40 +---------
 src/views/mes/plan/index.vue                  | 31 +-------
 src/views/mes/producereport/index.vue         | 21 +-----
 src/views/mes/record/DabaoIndex.vue           | 73 +------------------
 src/views/mes/record/DajiangIndex.vue         | 73 +------------------
 src/views/mes/record/GanzaoIndex.vue          | 73 +------------------
 src/views/mes/record/JiashiIndex.vue          | 72 +-----------------
 src/views/mes/record/PinjianIndex.vue         | 73 +------------------
 src/views/mes/record/QieBianIndex.vue         | 27 +------
 src/views/mes/record/ReyaIndex.vue            | 27 +------
 src/views/mes/record/SuijiangIndex.vue        | 36 +--------
 src/views/mes/record/index.vue                | 27 +------
 18 files changed, 74 insertions(+), 657 deletions(-)

diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue
index ee507c83..cbf15ae5 100644
--- a/src/views/erp/mold/components/MoldForm.vue
+++ b/src/views/erp/mold/components/MoldForm.vue
@@ -13,8 +13,15 @@
       <el-form-item label="模具名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入模具名称" />
       </el-form-item>
-      <el-form-item label="单位ID" prop="unitId">
-        <el-input v-model="formData.unitId" placeholder="请输入单位ID" />
+      <el-form-item label="单位" prop="unitId">
+            <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
+              <el-option
+                v-for="unit in unitList"
+                :key="unit.id"
+                :label="unit.name"
+                :value="unit.id"
+              />
+            </el-select>
       </el-form-item>
       <el-form-item label="机台ID" prop="machineId">
         <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
@@ -73,6 +80,8 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import { MoldBrandApi } from '@/api/erp/mold'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -98,10 +107,10 @@ const formData = ref({
 const formRules = reactive({
   code: [{ required: true, message: '模具编码不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '模具名称不能为空', trigger: 'blur' }],
-  unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
   inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
-  brandId: [{ required: true, message: '型号id不能为空', trigger: 'blur' }]
+  brandId: [{ required: true, message: '型号不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -121,6 +130,9 @@ const open = async (type: string, id?: number, brandId: number) => {
       formLoading.value = false
     }
   }
+
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/erp/mold/index.vue b/src/views/erp/mold/index.vue
index e3496e26..2ad1245e 100644
--- a/src/views/erp/mold/index.vue
+++ b/src/views/erp/mold/index.vue
@@ -44,17 +44,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="预期寿命(小时)" prop="useTime">
-        <el-date-picker
-          v-model="queryParams.useTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="维保模式" prop="maintainType">
         <el-select
           v-model="queryParams.maintainType"
@@ -63,24 +53,14 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MAINTAIN_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.ERP_MAINTAIN_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="维保周期" prop="maintainTime">
-        <el-date-picker
-          v-model="queryParams.maintainTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="模具系数" prop="moldSize">
         <el-input
           v-model="queryParams.moldSize"
@@ -99,27 +79,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/bom/BomForm.vue b/src/views/mes/bom/BomForm.vue
index 351ee72f..4e49ed74 100644
--- a/src/views/mes/bom/BomForm.vue
+++ b/src/views/mes/bom/BomForm.vue
@@ -16,8 +16,15 @@
       <el-form-item label="产品ID" prop="productId">
         <el-input v-model="formData.productId" placeholder="请输入产品ID" />
       </el-form-item>
-      <el-form-item label="单位ID" prop="unitId">
-        <el-input v-model="formData.unitId" placeholder="请输入单位ID" />
+      <el-form-item label="单位" prop="unitId">
+            <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
+              <el-option
+                v-for="unit in unitList"
+                :key="unit.id"
+                :label="unit.name"
+                :value="unit.id"
+              />
+            </el-select>
       </el-form-item>
       <el-form-item label="成品率%" prop="yieldRate">
         <el-input v-model="formData.yieldRate" placeholder="请输入成品率%" />
@@ -53,6 +60,8 @@
 import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { BomApi, BomVO } from '@/api/mes/bom'
 import BomDetailForm from './components/BomDetailForm.vue'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 
 /** 产品BOM 表单 */
 defineOptions({ name: 'BomForm' })
@@ -102,6 +111,9 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 8935de1f..197aafd7 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -9,18 +9,26 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
-      <el-table-column label="产品ID" min-width="150">
+      <el-table-column label="产品" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-input v-model="row.productId" placeholder="请输入产品ID" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="单位ID" min-width="150">
+      <el-table-column label="单位" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!">
-            <el-input v-model="row.unitId" placeholder="请输入单位ID" />
+            <el-select v-model="row.unitId" clearable placeholder="请选择单位" class="w-1/1">
+              <el-option
+                v-for="unit in unitList"
+                :key="unit.id"
+                :label="unit.name"
+                :value="unit.id"
+              />
+            </el-select>
           </el-form-item>
+          
         </template>
       </el-table-column>
        <el-table-column label="用量" min-width="150">
@@ -44,21 +52,6 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="是否启用" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.isEnable`" :rules="formRules.isEnable" class="mb-0px!">
-            <el-radio-group v-model="row.isEnable">
-                <el-radio
-                  v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-                  :key="dict.value"
-                  :label="dict.value"
-                >
-                  {{ dict.label }}
-                </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </template>
-      </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
           <el-button @click="handleDelete($index)" link>—</el-button>
@@ -71,8 +64,10 @@
   </el-row>
 </template>
 <script setup lang="ts">
-import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+
 import { BomApi } from '@/api/mes/bom'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 
 const props = defineProps<{
   bomId: undefined // BOM ID（主表的关联字段）
@@ -81,8 +76,7 @@ const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
   productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
-  unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }],
-  bomId: [{ required: true, message: 'BOM ID不能为空', trigger: 'blur' }],
+  bomId: [{ required: true, message: 'BOM 不能为空', trigger: 'blur' }],
   usageNumber: [{ required: true, message: '用量不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -103,8 +97,11 @@ watch(
     } finally {
       formLoading.value = false
     }
+    // 产品单位
+    unitList.value = await ProductUnitApi.getProductUnitSimpleList()
   },
   { immediate: true }
+  
 )
 
 /** 新增按钮操作 */
diff --git a/src/views/mes/bom/components/BomDetailList.vue b/src/views/mes/bom/components/BomDetailList.vue
index 46d0a1ae..939bc073 100644
--- a/src/views/mes/bom/components/BomDetailList.vue
+++ b/src/views/mes/bom/components/BomDetailList.vue
@@ -3,8 +3,8 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="产品ID" align="center" prop="productId" />
-      <el-table-column label="单位ID" align="center" prop="unitId" />
+      <el-table-column label="产品" align="center" prop="productId" />
+      <el-table-column label="单位" align="center" prop="unitId" />
        <el-table-column label="用量" align="center" prop="usageNumber" />
       <el-table-column label="损耗率%" align="center" prop="yieldRate" />
       <el-table-column label="备注" align="center" prop="remark" />
diff --git a/src/views/mes/bom/index.vue b/src/views/mes/bom/index.vue
index c15b575a..418fca46 100644
--- a/src/views/mes/bom/index.vue
+++ b/src/views/mes/bom/index.vue
@@ -35,24 +35,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="单位ID" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="成品率%" prop="yieldRate">
-        <el-input
-          v-model="queryParams.yieldRate"
-          placeholder="请输入成品率%"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+    
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -77,17 +60,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index 199131f8..2e5543e6 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -26,15 +26,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="显示顺序" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入显示顺序"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+     
       <el-form-item label="负责人" prop="workerUserId">
         <el-input
           v-model="queryParams.workerUserId"
@@ -53,24 +45,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入联系电话"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          placeholder="请输入邮箱"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="是否启用" prop="isEnable">
         <el-select
           v-model="queryParams.isEnable"
@@ -131,17 +105,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+    
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index a706b89e..a89535a6 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -44,24 +44,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="数量" prop="planNumber">
-        <el-input
-          v-model="queryParams.planNumber"
-          placeholder="请输入数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="成品数量" prop="finishNumber">
-        <el-input
-          v-model="queryParams.finishNumber"
-          placeholder="请输入成品数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+     
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -154,17 +137,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue
index 3e240263..fb3325d1 100644
--- a/src/views/mes/producereport/index.vue
+++ b/src/views/mes/producereport/index.vue
@@ -8,15 +8,7 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+     
       <el-form-item label="组别ID" prop="workTeamId">
         <el-input
           v-model="queryParams.workTeamId"
@@ -86,17 +78,6 @@
         />
       </el-form-item>
       
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/DabaoIndex.vue b/src/views/mes/record/DabaoIndex.vue
index 8a99574a..8fcaf88f 100644
--- a/src/views/mes/record/DabaoIndex.vue
+++ b/src/views/mes/record/DabaoIndex.vue
@@ -66,51 +66,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
-        <el-input
-          v-model="queryParams.groupManagerApproveId1"
-          placeholder="请输入组长上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
-        <el-input
-          v-model="queryParams.groupManagerApproveId2"
-          placeholder="请输入组长下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
-        <el-input
-          v-model="queryParams.productionManagerApproveId1"
-          placeholder="请输入主管上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
-        <el-input
-          v-model="queryParams.productionManagerApproveId2"
-          placeholder="请输入主管下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -150,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/DajiangIndex.vue b/src/views/mes/record/DajiangIndex.vue
index 8072a628..a5d696b9 100644
--- a/src/views/mes/record/DajiangIndex.vue
+++ b/src/views/mes/record/DajiangIndex.vue
@@ -66,51 +66,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
-        <el-input
-          v-model="queryParams.groupManagerApproveId1"
-          placeholder="请输入组长上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
-        <el-input
-          v-model="queryParams.groupManagerApproveId2"
-          placeholder="请输入组长下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
-        <el-input
-          v-model="queryParams.productionManagerApproveId1"
-          placeholder="请输入主管上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
-        <el-input
-          v-model="queryParams.productionManagerApproveId2"
-          placeholder="请输入主管下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -150,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/GanzaoIndex.vue b/src/views/mes/record/GanzaoIndex.vue
index 8612c578..3e4400b7 100644
--- a/src/views/mes/record/GanzaoIndex.vue
+++ b/src/views/mes/record/GanzaoIndex.vue
@@ -66,51 +66,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
-        <el-input
-          v-model="queryParams.groupManagerApproveId1"
-          placeholder="请输入组长上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
-        <el-input
-          v-model="queryParams.groupManagerApproveId2"
-          placeholder="请输入组长下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
-        <el-input
-          v-model="queryParams.productionManagerApproveId1"
-          placeholder="请输入主管上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
-        <el-input
-          v-model="queryParams.productionManagerApproveId2"
-          placeholder="请输入主管下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -150,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+    
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/JiashiIndex.vue b/src/views/mes/record/JiashiIndex.vue
index 99b475a9..77b86632 100644
--- a/src/views/mes/record/JiashiIndex.vue
+++ b/src/views/mes/record/JiashiIndex.vue
@@ -66,51 +66,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
-        <el-input
-          v-model="queryParams.groupManagerApproveId1"
-          placeholder="请输入组长上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
-        <el-input
-          v-model="queryParams.groupManagerApproveId2"
-          placeholder="请输入组长下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
-        <el-input
-          v-model="queryParams.productionManagerApproveId1"
-          placeholder="请输入主管上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
-        <el-input
-          v-model="queryParams.productionManagerApproveId2"
-          placeholder="请输入主管下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -150,32 +106,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/PinjianIndex.vue b/src/views/mes/record/PinjianIndex.vue
index b391890b..dedc98af 100644
--- a/src/views/mes/record/PinjianIndex.vue
+++ b/src/views/mes/record/PinjianIndex.vue
@@ -66,51 +66,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长上午审批id" prop="groupManagerApproveId1">
-        <el-input
-          v-model="queryParams.groupManagerApproveId1"
-          placeholder="请输入组长上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="组长下午审批id" prop="groupManagerApproveId2">
-        <el-input
-          v-model="queryParams.groupManagerApproveId2"
-          placeholder="请输入组长下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管上午审批id" prop="productionManagerApproveId1">
-        <el-input
-          v-model="queryParams.productionManagerApproveId1"
-          placeholder="请输入主管上午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="主管下午审批id" prop="productionManagerApproveId2">
-        <el-input
-          v-model="queryParams.productionManagerApproveId2"
-          placeholder="请输入主管下午审批id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -150,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/QieBianIndex.vue b/src/views/mes/record/QieBianIndex.vue
index 563c25c7..071d4bf3 100644
--- a/src/views/mes/record/QieBianIndex.vue
+++ b/src/views/mes/record/QieBianIndex.vue
@@ -105,32 +105,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/ReyaIndex.vue b/src/views/mes/record/ReyaIndex.vue
index 9230d0bc..91b2f805 100644
--- a/src/views/mes/record/ReyaIndex.vue
+++ b/src/views/mes/record/ReyaIndex.vue
@@ -106,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/SuijiangIndex.vue b/src/views/mes/record/SuijiangIndex.vue
index 1921339b..a857552e 100644
--- a/src/views/mes/record/SuijiangIndex.vue
+++ b/src/views/mes/record/SuijiangIndex.vue
@@ -67,15 +67,6 @@
         />
       </el-form-item>
       
-      <el-form-item label="流程实例的编号" prop="processInstanceId">
-        <el-input
-          v-model="queryParams.processInstanceId"
-          placeholder="请输入流程实例的编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -115,32 +106,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+      
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
diff --git a/src/views/mes/record/index.vue b/src/views/mes/record/index.vue
index dbeaf67d..90190267 100644
--- a/src/views/mes/record/index.vue
+++ b/src/views/mes/record/index.vue
@@ -115,32 +115,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
+     
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>