报工、计划详情

src/views/erp/component/product/ProductForm.vue

@@ -61,7 +61,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="采购价格" prop="purchasePrice">
             <el-input-number
               v-model="formData.purchasePrice"
@@ -71,7 +71,7 @@
               class="!w-1/1"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="预警库存" prop="safetyNumber">
             <el-input-number

src/views/mes/baogongrecord/components/BaogongRecordList.vue

@@ -2,7 +2,9 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="报工数量" prop="num" align="center"/>
+      <el-table-column label="合格数量" prop="num" align="center"/>
+      <el-table-column label="不合格数量" prop="noPassNum" align="center"/>
+      <el-table-column label="原因" prop="remark" align="center"/>
       <el-table-column
         label="报工时间"
         align="center"

src/views/mes/feedingrecord/FeedingRecordForm.vue

@@ -20,22 +20,6 @@
                   placeholder="请选择制浆线"
                 />
       </el-form-item> -->
-      <el-form-item label="生产计划" prop="planId">
-            <el-select
-              v-model="formData.planId"
-              @change="handleQuery(formData.planId)"
-              clearable
-              filterable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in planList"
-                :key="item.id"
-                :label="item.code"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
       <el-form-item prop="feedingType">
         <template #label>
             <span>
@@ -55,6 +39,32 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="生产计划" prop="planId" v-if = "formData.feedingType == 'org'">
+            <el-select
+              v-model="formData.planId"
+              @change="handleQuery(formData.planId)"
+              clearable
+              filterable
+              placeholder="请选择生产计划"
+            >
+              <el-option
+                v-for="item in planList"
+                :key="item.id"
+                :label="item.code"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="制浆线:" prop="feedingPipeline" v-if = "formData.feedingType != 'org'">
+          <el-tree-select
+                  v-model="formData.feedingPipeline"
+                  :data="organizationTree"
+                  :props="defaultProps"
+                  check-strictly
+                  default-expand-all
+                  placeholder="请选择制浆线"
+                />
+      </el-form-item>
       <el-form-item label="产品" prop="productId" v-if="formData.feedingType !='org'">
         <el-select
           v-model="formData.productId"
@@ -93,7 +103,8 @@
       <el-tab-pane label="投料明细" name="feedingRecordDetail">
         <!-- <FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" /> -->
            <el-form
-    ref="formRef"
+    ref="recordFormRef"
+    :rules="recordFormRules"
     :model="recordData"
     v-loading="formLoading"
     label-width="0px"
@@ -101,47 +112,11 @@
   >
     <el-table :data="recordData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="100" />
-       <el-table-column label="原料" min-width="150">
+      <el-table-column label="原料" prop="productName" width="100" />
-         <template #default="{ row, $index }">
+      <el-table-column label="单位" prop="unitName" width="100" />
-           <el-form-item :prop="`${$index}.itemId`" class="mb-0px!">
-             <el-select
-               v-model="row.itemId"
-               clearable
-               filterable
-               placeholder="请选择原料"
-             >
-               <el-option
-                 v-for="item in productList"
-                 :key="item.id"
-                 :label="item.name"
-                 :value="item.id"
-               />
-             </el-select>
-           </el-form-item>
-         </template>
-      </el-table-column>
-      <el-table-column label="单位" min-width="80">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.unitId`" class="mb-0px!">
-            <el-select
-              v-model="row.unitId"
-              clearable
-              filterable
-              placeholder="请选择原料"
-            >
-              <el-option
-                v-for="item in unitList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </template>
-      </el-table-column>
       <el-table-column label="数量" min-width="150">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.weight`" class="mb-0px!">
+          <el-form-item :prop="`${$index}.weight`" :rules="recordFormRules.weight">
             <el-input-number v-model="row.weight" :min="0" :precision="2" class="!w-1/1" placeholder=""
             />
           </el-form-item>
@@ -202,7 +177,11 @@ const formData = ref({
 })
 const formRules = reactive({
   feedingType: [{ required: true, message: '投料类型不能为空', trigger: 'blur' }],
-  feedingPipeline: [{ required: true, message: '制浆线不能为空', trigger: 'blur' }]
+  feedingPipeline: [{ required: true, message: '制浆线不能为空', trigger: 'blur' }],
+  planId: [{ required: true, message: '生产计划不能为空', trigger: 'change' }]
+})
+const recordFormRules = reactive({
+  weight: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -212,7 +191,7 @@ const recordData = ref([])
 
 /** 子表的表单 */
 const subTabsName = ref('feedingRecordDetail')
-const feedingRecordDetailFormRef = ref()
+const recordFormRef = ref()
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -246,7 +225,7 @@ const submitForm = async () => {
   if(formData.value.feedingType == 'org'){
     // 校验子表单
     try {
-      await feedingRecordDetailFormRef.value.validate()
+      await recordFormRef.value.validate()
     } catch (e) {
       subTabsName.value = 'feedingRecordDetail'
       return
@@ -258,7 +237,9 @@ const submitForm = async () => {
     const data = formData.value as unknown as FeedingRecordVO
     // 拼接子表的数据
     if(formData.value.feedingType == 'org'){
-      data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
+      //data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
+      data.feedingRecordDetails = recordData.value
+      console.log(data.feedingRecordDetails)
     }
     if (formType.value === 'create') {
       await FeedingRecordApi.createFeedingRecord(data)
@@ -291,6 +272,7 @@ const resetForm = () => {
     remark: undefined,
     recordStatus: undefined,
   }
+  recordData.value = []
   formRef.value?.resetFields()
 }
 
@@ -307,12 +289,12 @@ const getOrganizationTree = async () => {
 const data = ref({
   requisitionId : undefined
 })
+const to = ref(0) // 列表的总页数
 const handleQuery = async(planId : number) => {
   data.value = await PlanApi.getPlan(planId)
-  console.log(data.value)
+  //console.log(data.value)
   list.value = await ItemRequisitionApi.getItemRequisitionDetailListByItemRequisitionId(data.value.requisitionId)
-  if (data.value.requisitionId == 233) {
+  recordData.value = list.value
-    formData.id = 1
+  to.value = list.total
-  }
 }
 </script>

src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue

@@ -135,11 +135,6 @@ const handleAdd = () => {
   formData.value.push(row)
 }
 
-/** 删除按钮操作 */
-const handleDelete = (index) => {
-  formData.value.splice(index, 1)
-}
-
 /** 表单校验 */
 const validate = () => {
   return formRef.value.validate()

src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue

@@ -3,7 +3,7 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
-      <el-table-column label="原料" align="center" prop="itemName" />
+      <el-table-column label="原料" align="center" prop="productName" />
       <el-table-column label="数量" align="center" prop="weight" />
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="投料时间" align="center" prop="feedingTime"  :formatter="dateFormatter"/>

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

@@ -10,9 +10,15 @@
     <el-form-item v-show="false" label="计划" prop="planId">
         <el-input v-model="formData.planId" placeholder="请输入计划ID" />
       </el-form-item>
-      <el-form-item label="数量" prop="num">
+      <el-form-item label="合格数量" prop="num">
         <el-input-number v-model="formData.num" placeholder="请输入数量" class="!w-240px"/>
       </el-form-item>
+      <el-form-item label="不合格数量" prop="noPassNum">
+        <el-input-number v-model="formData.noPassNum" placeholder="请输入数量" class="!w-240px"/>
+      </el-form-item>
+      <el-form-item label="原因" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入原因"/>
+      </el-form-item>
     </el-form>
 
     <template #footer>
@@ -40,9 +46,12 @@ const formData = ref({
   planId: undefined,
   num: undefined,
   baogongTime: undefined,
+  noPassNum: undefined,
+  remark: undefined,
 })
 const formRules = reactive({
   num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+  noPassNum: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 

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

@@ -0,0 +1,215 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+    <el-form-item label="任务单" prop="taskId">
+        <el-select
+          disabled
+          v-model="formData.taskId"
+          clearable
+          filterable
+          placeholder="请选择"
+          @change="handleTaskChange"
+        >
+          <el-option
+            v-for="item in taskList"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细项" prop="taskId">
+        <el-select
+          disabled
+          v-model="formData.taskDetailId"
+          clearable
+          filterable
+          placeholder="请选择"
+          @change="handleTaskDetailChange"
+        >
+          <el-option
+            v-for="item in taskDetailList"
+            :key="item.id"
+            :label="item.productName+'-未计划:'+(item.number-item.planNumber)"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="计划编码" prop="code">
+        <el-input  disabled v-model="formData.code" placeholder="请输入计划编码" />
+      </el-form-item>   
+      <el-form-item label="生产线" prop="feedingPipelineName">
+        <el-input  disabled v-model="formData.feedingPipelineName" placeholder="请输入生产线名称" />
+      </el-form-item>
+      <el-form-item label="领料人" prop="worker">
+        <el-input  disabled v-model="formData.worker" placeholder="请输入领料人" />
+      </el-form-item>
+<!--      <el-form-item label="产品" prop="productId">-->
+<!--        <el-select-->
+<!--          :disabled='editDisable'-->
+<!--          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="数量" prop="planNumber">
+        <el-input disabled v-model="formData.planNumber"  />
+      </el-form-item>
+      <el-form-item label="是否试生产" prop="isPreProduction">
+        <el-radio-group disabled v-model="formData.isPreProduction">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- <el-form-item label="热压数量" prop="reyaNumber">
+        <el-input v-model="formData.reyaNumber" />
+      </el-form-item> -->
+      <el-form-item label="计划开始" prop="planStartTime">
+        <el-date-picker
+          disabled
+          v-model="formData.planStartTime"
+          type="date"
+          value-format="x"
+          placeholder="选择计划开始时间"
+        />
+      </el-form-item>
+      <el-form-item label="计划结束" prop="planEndTime">
+        <el-date-picker
+          disabled
+          v-model="formData.planEndTime"
+          type="date"
+          value-format="x"
+          placeholder="选择计划结束时间"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="班别" prop="groupType">
+        <el-radio-group v-model="formData.groupType">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item> -->
+      <el-form-item label="备注" prop="remark">
+        <el-input disabled type="textarea" v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> -->
+      <el-button @click="dialogVisible = false">关 闭</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+
+import { PlanApi, PlanVO } from '@/api/mes/plan'
+
+import { TaskApi, TaskDetailVO, TaskVO} from "@/api/mes/task";
+
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
+
+/** 生产计划 表单 */
+defineOptions({ name: 'PlanDetail' })
+
+const taskList = ref<TaskVO[]>([]) // 用户列表
+const taskDetailList = ref<TaskDetailVO[]>([]) // 用户列表
+
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const editDisable = ref(false) // 编辑状态禁用
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  code: undefined,
+  productId: undefined,
+  taskDetailId: undefined,
+  taskId: undefined,
+  planNumber: undefined,
+  reyaNumber: undefined,
+  finishNumber: undefined,
+  status: undefined,
+  planStartTime: undefined,
+  planEndTime: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  productionManagerId: undefined,
+  remark: undefined,
+  groupType: undefined,
+  isEnable: undefined,
+  feedingPipeline: undefined,
+  feedingPipelineName: undefined,
+  workerId: undefined,
+  worker: undefined,
+  isPreProduction: undefined
+})
+
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id?: number) => {
+  dialogVisible.value = true
+  // dialogTitle.value = t('action.' + type)
+  // formType.value = type
+  editDisable.value = false
+  resetForm()
+  formData.value = await PlanApi.getPlan(id)
+  console.log()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    code: undefined,
+    productId: undefined,
+    taskDetailId: undefined,
+    taskId: undefined,
+    planNumber: 0,
+    finishNumber: 0,
+    status: undefined,
+    planStartTime: undefined,
+    planEndTime: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    productionManagerId: undefined,
+    remark: undefined,
+    groupType: undefined,
+    isEnable: undefined,
+    isPreProduction: 0,
+    feedingPipelineName: undefined,
+    worker: undefined,
+  }
+  formRef.value?.resetFields()
+}
+
+</script>

src/views/mes/plan/index.vue

@@ -156,7 +156,9 @@
       <el-table-column label="产品" align="center" prop="productName" min-width="200px" sortable/>
 <!--      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />-->
       <el-table-column label="生产线" align="center" prop="feedingPipelineName"/> 
-      <el-table-column label="数量" align="center" prop="planNumber" />
+      <el-table-column label="计划数量" align="center" prop="planNumber" />
+      <el-table-column label="完工数量" align="center" prop="wangongNumber" />
+      <el-table-column label="合格率(%)" align="center" prop="passRate" />
       <!-- <el-table-column label="热压数量" align="center" prop="reyaNumber" /> -->
       <el-table-column label="状态" align="center" prop="status" sortable>
         <template #default="scope">
@@ -168,7 +170,7 @@
           <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
         </template>
       </el-table-column>
-      <el-table-column label="领料人" align="center" prop="productionManagerName" />  
+      <!-- <el-table-column label="领料人" align="center" prop="productionManagerName" />   -->
       <el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
       <el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>  
       <el-table-column label="是否检验" align="center" prop="isZj" v-if="activeName === '6'">
@@ -176,9 +178,17 @@
           <dict-tag :type="DICT_TYPE.MES_ZJ_PRODUCT" :value="scope.row.isZj" />
         </template>  
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />  
+      <!-- <el-table-column label="备注" align="center" prop="remark" />   -->
       <el-table-column label="操作" align="center" fixed="right" width="350">
         <template #default="scope">
+          <el-button
+          link
+          type="info"
+          @click="openDetail(scope.row.id)"
+          v-hasPermi="['mes:plan:query']"
+        >
+          详情
+        </el-button>
           <el-button
             link
             type="primary"
@@ -311,6 +321,9 @@
 
     <!-- 报工弹出 -->
   <Baogong ref="baogongFormRef" @success="getList" />
+
+    <!-- 详情弹窗 -->
+  <PlanDetail ref="detailRef" />
 </template>
 
 <script setup lang="ts">
@@ -324,6 +337,7 @@ import {TaskApi, TaskVO} from "@/api/mes/task";
 import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
 import Paigong from "./components/Paigong.vue";
 import TypePaigong from "./components/TypePaigong.vue";
+import PlanDetail from "./components/PlanDetail.vue";
 import Baogong from "./components/Baogong.vue";
 import ItemRequisitionDetailList from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
 import ZjProductPreList from "@/views/mes/zjproduct/components/ZjProductPreList.vue";
@@ -365,6 +379,12 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true