fix mes bug

src/api/mes/workreportplan/index.ts

@@ -75,5 +75,8 @@ export const WorkReportPlanApi = {
   getReportPlanViewPage: async (params: any) => {
     return await request.get({ url: `/mes/work-report-plan/pageView`, params })
   },
-
+  // 查询计划进度
+  getReportPlanProgress: async (id: number) => {
+    return await request.get({ url: `/mes/work-report-plan-view/getPlanProgress?id=`, id })
+  },
 }

src/utils/dict.ts

@@ -246,7 +246,7 @@ export enum DICT_TYPE {
   MES_FEEDING_PIPELINE = "mes_feeding_pipeline",
   MES_STOCK_WORKSHOP_DETAIL_TYPE = "mes_stock_workshop_detail_type",
   MES_STOCK_OUT_TYPE = "mes_stock_out_type",
-  MES_PRODUCE_REPORT_TYPE = "mes_product_report_type",
+  MES_PRODUCE_REPORT_TYPE = "mes_produce_report_type",
   //====iot
   IOT_SIEMENS_TYPE = "iot_siemens_type",
   IOT_MODBUS_TYPE = "iot_modbus_type",

src/views/erp/stock/stock/index.vue

@@ -190,12 +190,12 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
+  queryParams.categoryId = 2
   await getList()
   // 加载产品、仓库列表
   productList.value = await ProductApi.getProductSimpleList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   categoryList.value = await ProductCategoryApi.getProductCategorySimpleList()
-  queryParams.categoryId = 2
 })
 
 /** tab 切换 */

src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue

@@ -8,7 +8,7 @@
       <el-table-column label="已下料" align="center" prop="finishNumber"  width="120px"/>
       <el-table-column label="进度" align="center" >
         <template #default="scope">
-          <el-progress :percentage="scope.row.finishNumber/scope.row.number" :stroke-width="15" striped striped-flow />
+          <el-progress :percentage="(scope.row.finishNumber/scope.row.number)*100" :stroke-width="15" striped striped-flow />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center"/>

src/views/mes/plan/components/Paigong.vue

@@ -105,7 +105,7 @@ const open = async (planCode: string, planId: number) => {
     formLoading.value = false
   }
   // 获得制浆工人列表
-  userList.value = await WorkTeamApi.getUserList("zhijiang")
+  userList.value = await WorkTeamApi.getUserList("zhijiang", '')
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 

src/views/mes/planprogress/ProgressList.vue

@@ -22,13 +22,14 @@
   </ContentWrap>
 </template>
 <script setup lang="ts">
-import { ItemRequisitionApi } from '@/api/mes/itemrequisition'
+import { PlanApi } from '@/api/mes/plan'
+import {WorkReportPlanApi} from "@/api/mes/workreportplan";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
-  itemRequisitionId?: number // 领料单ID（主表的关联字段）
+  planId?: number // 领料单ID（主表的关联字段）
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -50,7 +51,7 @@ const wasteColors = [
 const getList = async () => {
   loading.value = true
   try {
-    list.value = await ItemRequisitionApi.getItemRequisitionDetailListByItemRequisitionId(props.itemRequisitionId)
+    list.value = await WorkReportPlanApi.getReportPlanProgress(props.planId)
   } finally {
     loading.value = false
   }

src/views/mes/planprogress/index.vue

@@ -117,12 +117,15 @@
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
-      <!-- 投料进度子表的列表 -->
+      <!-- 进度子表的列表 -->
       <el-table-column  type="expand">
         <template #default="scope">
-          <el-tabs  model-value="itemRequisitionDetail">
-            <el-tab-pane label="各工序进度" name="itemRequisitionDetail">
-              <ProgressList :item-requisition-id="scope.row.requisitionId" />
+          <el-tabs  model-value="progressList">
+            <el-tab-pane label="工序进度" name="progressList">
+              <ProgressList :plan-id="scope.row.id" />
+            </el-tab-pane>
+            <el-tab-pane v-if="scope.row.status > 0" label="投料明细" name="itemRequisitionDetail">
+              <ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
             </el-tab-pane>
           </el-tabs>
         </template>
@@ -145,14 +148,15 @@
           <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
         </template>
       </el-table-column>
+
       <el-table-column label="操作" align="center" fixed="right" width="250">
         <template #default="scope">
           <el-button
             link
             type="info"
-            @click="openItemNeed(scope.row.code, scope.row.id)"
+            @click="message(scope.row.id)"
           >
-            物料
+            详情
           </el-button>
         </template>
       </el-table-column>
@@ -166,8 +170,6 @@
     />
   </ContentWrap>
 
-  <!-- 物料列表 -->
-  <ItemNeedIndex ref="itemFormRef" @success="getList" />
 
 </template>
 
@@ -261,23 +263,13 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
-
-  //处理其他页面跳转过来的参数
-  if(query.taskId)
-    queryParams.taskId = String(query.taskId)
-  if(query.productId)
-    queryParams.productId = String(query.productId)
   // 加载产品、任务单
   productList.value = await ProductApi.getMesProductSimpleList()
   taskList.value = await TaskApi.getTaskList()
   await getList()
 
 })
-/** 物料需求 */
-const itemFormRef = ref()
-const openItemNeed = (planCode:string, planId: number) => {
-  itemFormRef.value.open("plan","计划-"+planCode, planId)
-}
+
 /** tab 切换 */
 let activeName = ''
 const handleTabClick = (tab: TabsPaneContext) => {

src/views/mes/producereport/ProduceReportDetailForm.vue

@@ -163,6 +163,7 @@ import * as UserApi from "@/api/system/user";
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
 import {OrgWorkerApi, OrgWorkerVO} from "@/api/mes/orgworker";
 import {PlanApi} from "@/api/mes/plan";
+import {formatToDate, formatToDateTime} from "@/utils/dateUtil";
 
 /** 生产报工明细 表单 */
 defineOptions({ name: 'ProduceReportDetailForm' })
@@ -223,11 +224,14 @@ const open = async (type: string, id?: number) => {
   formData.value.groupType = 1
   formData.value.orgType = 'zhijiang'
   warningInfo.value = ''
+  isDisable.value = false
+  isDisableUpdate.value = false
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
     try {
       formData.value = await ProduceReportDetailApi.getProduceReportDetail(id)
+      formData.value.reportDate = formatToDateTime(new Date(formData.value.reportDate))
     } finally {
       formLoading.value = false
     }
@@ -240,16 +244,18 @@ const open = async (type: string, id?: number) => {
     formData.value.productId = productList.value[0].id
   if(type === 'replace'){
     dialogTitle.value = "代报工"
-    isDisable.value = false
+    formData.value.reportType = '代报工'
     userList.value = await OrgWorkerApi.getOtherPersonalUser()
   }
   else if(type === 'create'){
+    formData.value.reportType = '个人'
     userList.value = await OrgWorkerApi.getPersonalUser()
     if(userList.value && userList.value.length>0){
       formData.value.userId = userList.value[0].id
     }
   }
   else if(type === 'update'){
+    isDisable.value = true
     userList.value = await UserApi.getSimpleUserList()
   }
   await changeDate()
@@ -265,7 +271,6 @@ const submitForm = async (reportType?:string) => {
   formLoading.value = true
   try {
     formData.value.reportDateString =  formData.value.reportDate
-    formData.value.reportType = reportType
     const data = formData.value as unknown as ProduceReportDetailVO
     if (formType.value === 'create' || formType.value === 'replace') {
       await ProduceReportDetailApi.createProduceReportDetail(data)

src/views/mes/producereport/ProduceReportDetailIndex.vue

@@ -115,7 +115,7 @@
       <el-table-column label="成品数量" align="center" prop="qualityNumber" />
       <el-table-column label="废品数量" align="center" prop="wasteNumber" />
       <el-table-column label="总数量" align="center" prop="totalNumber" />
-      <el-table-column label="成品率%" align="center" prop="qualityRate" />
+      <el-table-column label="成品率%" align="center" prop="qualityRate" :formatter="erpCountTableColumnFormatter"/>
       <el-table-column label="打包数量" align="center" prop="packageNumber" />
 
       <el-table-column label="总时长" align="center" prop="totalTime" />
@@ -210,6 +210,7 @@ import {defaultProps, handleTree} from "@/utils/tree";
 import * as UserApi from "@/api/system/user";
 import {OrganizationApi} from "@/api/mes/organization";
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
+import {erpCountTableColumnFormatter} from "@/utils";
 
 /** 生产报工明细 列表 */
 defineOptions({ name: 'ProduceReportDetail' })

src/views/mes/task/TaskAddSaleForm.vue

@@ -82,6 +82,7 @@ const formData = ref({
 const formRules = reactive({
   code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
   deliveryDate: [{ required: true, message: '交货日期不能为空', trigger: 'blur' }],
+  taskType: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 

src/views/mes/task/index.vue

@@ -107,7 +107,7 @@
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <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="orderDate" :formatter="dateFormatter2" />
       <el-table-column label="交货日期" align="center" prop="deliveryDate" :formatter="dateFormatter2"/>
       <el-table-column label="类型" align="center" prop="taskType">

src/views/mes/tasksummary/index.vue

@@ -83,8 +83,6 @@
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="所有" name="" />
-<!--      <el-tab-pane label="草稿" name="0" />-->
-<!--      <el-tab-pane label="送审" name="1" />-->
       <el-tab-pane label="下达" name="2" />
       <el-tab-pane label="计划" name="3" />
       <el-tab-pane label="开工" name="4" />
@@ -99,7 +97,7 @@
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <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="orderDate" :formatter="dateFormatter2" />
       <el-table-column label="交货日期" align="center" prop="deliveryDate" :formatter="dateFormatter2"/>
       <el-table-column label="状态" align="center" prop="status">