fix some bug

src/views/erp/mold/MoldBrandForm.vue

@@ -32,7 +32,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="预期寿命(小时)" prop="useTime">
+      <el-form-item label="模具系数" prop="moldSize">
+        <el-input v-model="formData.moldSize" placeholder="请输入模具系数" />
+      </el-form-item>
+      <el-form-item label="预期寿命" prop="useTime">
         <el-input-number
           v-model="formData.useTime"
           :min="0"
@@ -60,23 +63,10 @@
           placeholder="输入维保周期"
         />
       </el-form-item>
-      <el-form-item label="模具系数" prop="moldSize">
-        <el-input v-model="formData.moldSize" placeholder="请输入模具系数" />
-      </el-form-item>
+
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-radio-group v-model="formData.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>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -116,8 +106,7 @@ const formRules = reactive({
   name: [{ required: true, message: '型号名称不能为空', trigger: 'blur' }],
   moldType: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
-  moldSize: [{ required: true, message: '模具系数不能为空', trigger: 'blur' }],
-  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
+  moldSize: [{ required: true, message: '模具系数不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -137,7 +126,7 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 加载产品、
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -149,6 +138,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    formData.value.isEnable = true
     const data = formData.value as unknown as MoldBrandVO
     if (formType.value === 'create') {
       await MoldBrandApi.createMoldBrand(data)

src/views/erp/mold/components/MoldForm.vue

@@ -23,10 +23,7 @@
               />
             </el-select>
       </el-form-item>
-      <el-form-item label="机台ID" prop="machineId">
-        <el-input v-model="formData.machineId" placeholder="请输入机台ID" />
-      </el-form-item>
-      <el-form-item label="使用时间(小时)" prop="useTime">
+      <el-form-item label="预期寿命" prop="useTime">
         <el-input-number
           v-model="formData.useTime"
           :min="0"

src/views/erp/mold/components/MoldList.vue

@@ -10,11 +10,10 @@
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
     <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="模具编码" align="center" prop="code" />
+      <el-table-column label="模具编码" align="center" prop="code" width="150px"/>
       <el-table-column label="模具名称" align="center" prop="name" />
       <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="机台ID" align="center" prop="machineId" />
+      <el-table-column label="机台" align="center" prop="machineId" />
       <el-table-column label="使用时间(小时)" align="center" prop="useTime" />
       <el-table-column
         label="入库时间"
@@ -43,7 +42,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-       <el-table-column label="操作" align="center">
+       <el-table-column label="操作" align="center"  fixed="right" width="150px">
         <template #default="scope">
           <el-button
             link

src/views/erp/mold/index.vue

@@ -68,15 +68,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="模具系数" prop="moldSize">
-        <el-input
-          v-model="queryParams.moldSize"
-          placeholder="请输入模具系数"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -121,13 +112,11 @@
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="型号编码" align="center" prop="code" />
-      <el-table-column label="型号名称" align="center" prop="name" />
+      <el-table-column label="型号编码" align="center" prop="code" width="150px" />
+      <el-table-column label="型号名称" align="center" prop="name"  width="130px"/>
       <el-table-column label="规格" align="center" prop="moldType" />
-      <!-- <el-table-column label="产品ID" align="center" prop="productId" /> -->
       <el-table-column label="产品" align="center" prop="productName" />
-      <el-table-column label="预期寿命(小时)" align="center" prop="useTime" />
+      <el-table-column label="预期寿命/h" align="center" prop="useTime" />
       <el-table-column label="维保模式" align="center" prop="maintainType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ERP_MAINTAIN_TYPE" :value="scope.row.maintainType" />
@@ -136,11 +125,7 @@
       <el-table-column label="维保周期" align="center" prop="maintainTime" />
       <el-table-column label="模具系数" align="center" prop="moldSize" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" prop="isEnable" >
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
+
       <el-table-column
         label="创建时间"
         align="center"
@@ -148,7 +133,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" fixed="right" width="150px">
         <template #default="scope">
           <el-button
             link
@@ -294,6 +279,6 @@ const handleCurrentChange = (row) => {
 onMounted(async () => {
   await getList()
   // 加载产品、
-  productList.value = await ProductApi.getProductSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
 })
 </script>

src/views/mes/feedingrecord/FeedingRecordForm.vue

@@ -32,6 +32,22 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="产品" prop="productId" v-if="formData.feedingType !='org'">
+        <el-select
+          v-model="formData.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item  label="重量(kg):" prop="weight" v-if="formData.feedingType !='org'">
         <el-input-number v-model="formData.weight" :min="0" :precision="2" class="!w-1/1" placeholder="请输入重量"
         />
@@ -65,13 +81,14 @@
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
 import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
 
 /** 投料记录 表单 */
 defineOptions({ name: 'FeedingRecordForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const productList = ref<ProductVO[]>([]) // 产品列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -81,6 +98,7 @@ const formData = ref({
   feedingRecordCode: undefined,
   productId: undefined,
   planId: undefined,
+  productId: undefined,
   itemId: undefined,
   feedingPipeline: undefined,
   feedingType: undefined,
@@ -117,6 +135,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 加载产品、
+  productList.value = await ProductApi.getMesProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

src/views/mes/machine/index.vue

@@ -152,6 +152,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
+      <el-tab-pane label="品印" name="pinjian" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
 

src/views/mes/organization/WorkerIndex.vue

@@ -83,6 +83,7 @@
     <el-tab-pane label="品检" name="pinjian" />
     <el-tab-pane label="打包" name="dabao" />
     <el-tab-pane label="贴标" name="tiebiao" />
+    <el-tab-pane label="品印" name="pinjian" />
     <el-tab-pane label="塑封" name="sufeng" />
   </el-tabs>
 

src/views/mes/organization/index.vue

@@ -123,6 +123,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
+      <el-tab-pane label="品印" name="pinjian" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
     <el-table

src/views/mes/producereport/DailyReportIndex.vue

@@ -9,7 +9,7 @@
       label-width="68px"
     >
       <el-row>
-        <el-col :span="8">
+        <el-col :span="7">
           <el-form-item label="日期" prop="reportDate">
             <el-date-picker
               v-model="queryParams.reportDate"
@@ -22,6 +22,18 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="人员" prop="userId">
+            <el-select v-model="queryParams.userId" clearable filterable placeholder="请选择人员"  class="!w-180px">
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="工位" prop="orgId">
             <el-tree-select
@@ -48,17 +60,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
-          <el-form-item label="备注" prop="remark">
-            <el-input
-              v-model="queryParams.remark"
-              placeholder="请输入备注"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-180px"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <el-form-item>
@@ -88,6 +89,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
+      <el-tab-pane label="品印" name="pinjian" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
@@ -278,6 +280,7 @@ onMounted(async () => {
   userList.value = await UserApi.getSimpleUserList()
   // 加载产品、
   productList.value = await ProductApi.getMesProductSimpleList()
+
 })
 /** tab 切换 */
 let activeName = 'chengxing'

src/views/mes/producereport/components/ReplaceForm.vue

@@ -222,7 +222,7 @@ const open = async (type: string, id?: number) => {
   resetForm()
   formData.value.reportDate = getCurrentDate()
   formData.value.groupType = 1
-  formData.value.orgType = 'zhijiang'
+  formData.value.orgType = 'chengxing'
   warningInfo.value = ''
   isDisableUpdate.value = false
   // 修改时，设置数据