From eeac10db3b9fe5a4ba6a6cadb350a7726e382637 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 26 Apr 2024 12:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/biz/taskreport/index.vue        | 197 +++++++-----------
 1 file changed, 79 insertions(+), 118 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
index 392fee7f..4ef30923 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/taskreport/index.vue
@@ -1,130 +1,91 @@
 <template>
-<el-card class="hl-card">
-  <template #header>
-    <span>每日报工记录</span>
-  </template>
+  <el-card class="hl-card">
+    <template #header>
+      <span>每日报工记录</span>
+    </template>
     <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="110px"
-    >
-      <el-form-item label="项目编号" prop="projectCode">
-        <el-input
-          v-model="queryParams.projectCode"
-          placeholder="请输入项目编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="项目名称" prop="projectName">
-        <el-input
-          v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="子项目名称" prop="projectSubName">
-        <el-input
-          v-model="queryParams.projectSubName"
-          placeholder="请输入子项目名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="零件名称" prop="materialName">
-        <el-input
-          v-model="queryParams.materialName"
-          placeholder="请输入零件名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item style="margin-left: 20px">
-        <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
-      <el-table-column fixed type="index" width="100" label="序号" align="center" />
-      <el-table-column fixed label="项目编号" align="center" prop="projectCode" width="220" />
-      <el-table-column fixed label="项目名称" align="center" prop="projectName" width="180" />
-      <el-table-column fixed label="子项目名称" align="center" prop="projectSubName" width="180" />
-      <el-table-column label="子项目编号" align="center" prop="projectSubCode" width="260" />
-      <el-table-column label="派工单号" align="center" prop="dispatchCode" width="180" />
-      <el-table-column label="零件名称" align="center" prop="materialName" width="180" />
-      <el-table-column label="规格型号" align="center" prop="spec" width="160" />
-      <el-table-column label="报工人" align="center" prop="ownerName" />
-      <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
-      <el-table-column label="报工工时" align="center" prop="workTime" width="160" />
-      <el-table-column label="报工数量" align="center" prop="amount" width="120" />
-      <el-table-column
-        label="生产起止时间"
-        align="center"
-        prop="startTime"
-        width="400"
-      >
-        <template #default="scope">
-          {{formatDate(scope.row.startTime)+'~'+formatDate(scope.row.endTime)}}
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="报工记录提交时间"
-        align="center"
-        prop="reportTime"
-        :formatter="dateFormatter"
-        width="220"
-      />
-      <el-table-column label="修改人" align="center" prop="updaterName" />
-      <el-table-column
-        label="修改时间"
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="220"
-      />
-      <el-table-column fixed="right" label="操作" align="center" width="140">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['biz:task-report:update']"
-          >
-            编辑
+      <!-- 搜索工作栏 -->
+      <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="110px">
+        <!-- 项目编号修改为生产订单号 -->
+        <el-form-item label="生产订单号" prop="projectCode">
+          <el-input v-model="queryParams.projectCode" placeholder="请输入生产订单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        </el-form-item>
+        <!-- 新增生产计划单号 -->
+        <el-form-item label="生产计划单号" prop="projectCode">
+          <el-input v-model="queryParams.projectCode" placeholder="请输入生产计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        </el-form-item>
+        <!-- 新增生产派工单号 -->
+        <el-form-item label="生产派工单号" prop="projectCode">
+          <el-input v-model="queryParams.projectCode" placeholder="请输入生产计划单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        </el-form-item>
+        <!-- 项目名称修改i为产品编码名称 -->
+        <el-form-item label="产品编码/名称" prop="projectName">
+          <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+        </el-form-item>
+        <el-form-item style="margin-left: 20px">
+          <el-button @click="handleQuery" type="primary">
+            <Icon icon="ep:search" class="mr-5px" /> 查询
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
+        </el-form-item>
+      </el-form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
+        <el-table-column fixed type="index" width="100" label="序号" align="center" />
+        <!-- 项目编号修改为生产订单号 -->
+        <el-table-column fixed label="生产订单号" align="center" prop="projectCode" width="220" />
+        <!-- 新增生产计划单号 -->
+        <el-table-column fixed label="生产计划单号" align="center" prop="projectCode" width="220" />
+        <!-- 派工单号修改为生产派工单号 -->
+        <el-table-column label="生产派工单号" align="center" prop="dispatchCode" width="180" />
+        <!-- 新增产品编码 -->
+        <el-table-column fixed label="产品编码" align="center" prop="projectCode" width="180" />
+        <!-- 项目名称修改为产品名称 -->
+        <el-table-column fixed label="产品名称" align="center" prop="projectName" width="180" />
+        <el-table-column label="规格型号" align="center" prop="spec" width="160" />
+        <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
+        <el-table-column label="报工人" align="center" prop="ownerName" />
+        <el-table-column label="报工工时" align="center" prop="workTime" width="160" />
+        <el-table-column label="报工数量" align="center" prop="amount" width="120" />
+        <!-- 新增单位 -->
+        <el-table-column label="单位" align="center" prop="unit" min-width="120">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
+          </template>
+        </el-table-column>
+        <el-table-column label="生产起止时间" align="center" prop="startTime" width="400">
+          <template #default="scope">
+            {{formatDate(scope.row.startTime)+'~'+formatDate(scope.row.endTime)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="报工记录提交时间" align="center" prop="reportTime" :formatter="dateFormatter" width="220" />
+        <el-table-column label="修改人" align="center" prop="updaterName" />
+        <el-table-column label="修改时间" align="center" prop="updateTime" :formatter="dateFormatter" width="220" />
+        <el-table-column fixed="right" label="操作" align="center" width="140">
+          <template #default="scope">
+            <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['biz:task-report:update']">
+              编辑
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </ContentWrap>
 
-</el-card>
+  </el-card>
   <!-- 表单弹窗：添加/修改 -->
   <TaskReportForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import {dateFormatter, formatDate} from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as TaskReportApi from '@/api/biz/taskreport'
 import TaskReportForm from './TaskReportForm.vue'
@@ -148,7 +109,7 @@ const queryParams = reactive({
   reportTime: [],
   hasReport: undefined,
   status: undefined,
-  createTime: [],
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中