提交

src/api/business/daywork.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { method } from 'lodash-es'
 
 const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
 
@@ -307,7 +308,7 @@ export function getDayworkItemDetail(data) {
 	return request({
 		url: baseUrl + '/business/productionDaywork/getDayworkItemDetail',
 		method: 'post',
-		data:data
+		data: data
 	})
 }
 
@@ -331,3 +332,11 @@ export function delDayworkItem(ids) {
 		method: 'delete'
 	})
 }
+
+export function lotList(query) {
+	return request({
+		url: baseUrl + '/business/productionDaywork/lotList',
+		method: 'get',
+		params: query
+	})
+}

src/views/business/dayworkSelect/index.vue

@@ -16,16 +16,16 @@
             @change="dateRangeChange" />
         </el-form-item>
         <el-form-item label="生产状态：" prop="status" align="center">
-          <el-select v-model="queryDayworkParams.status" placeholder="请选择生产状态" style="width: 200px"
+          <el-select v-model="queryDayworkParams.status" clearable placeholder="请选择生产状态" style="width: 200px"
             @change="handleChangeStatus">
-            <el-option v-for="dict in dynamicOptions" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in statusOptions" :key="dict.value" :label="dict.label"
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="生产状态：" prop="status" align="center">
-          <el-select v-model="queryDayworkParams.status" placeholder="请选择生产状态" style="width: 200px"
+        <el-form-item label="批次状态：" prop="status" align="center">
+          <el-select v-model="queryDayworkParams.reportStatus" clearable placeholder="请选择生产状态" style="width: 200px"
             @change="handleChangeStatus">
-            <el-option v-for="dict in dynamicOptions" :key="dict.value" :label="dict.label"
+            <el-option v-for="dict in daywork_status" :key="dict.value" :label="dict.label"
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
@@ -51,31 +51,39 @@
                 <span v-else>{{ scope.row.lotCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="产品描述" prop="productDescription" align="center" />
+            <el-table-column label="产品描述" prop="product.description" align="center" />
             <el-table-column label="图纸版本" prop="technologyVersion" width="60" align="center" />
-            <el-table-column label="投产量" prop="productionQuantity" width="60" align="center" />
+            <el-table-column label="投产量" prop="daywork.productionQuantity" width="60" align="center">
+              <template #default="scope">
+                {{ scope.row.daywork != null ? scope.row.daywork.productionQuantity : scope.row.productionQuantity }}
+              </template>
+            </el-table-column>
             <el-table-column label="生产状态" prop="status" width="80" align="center">
               <template #default="scope">
-                <el-tag :type="statusFilter(scope.row.status)">{{ statusFilterText(scope.row.status) }}</el-tag>
+                <el-tag
+                  :type="statusFilter(scope.row.daywork != null ? scope.row.daywork.status == 0 ? 1 : scope.row.daywork.status : 0)">{{
+        statusFilterText(scope.row.daywork != null ? scope.row.daywork.status == 0 ? 1 :
+          scope.row.daywork.status : 0)
+      }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column label="批次状态" width="80" align="center">
               <template #default="scope">
-                <dict-tag :options="daywork_status" :value="scope.row.reportStatus" />
+                <dict-tag :options="daywork_status" :value="scope.row.daywork ? scope.row.daywork.reportStatus : 0" />
               </template>
             </el-table-column>
             <el-table-column label="总批数" width="80" prop="totalLotNumber" align="center"></el-table-column>
-            <el-table-column label="合格量" width="80" prop="temporaryProcessQualifiedNum"
+            <el-table-column label="合格量" width="80" prop="daywork.temporaryProcessQualifiedNum"
               align="center"></el-table-column>
-            <el-table-column label="完工日期" width="100" prop="finishedTime" align="center"></el-table-column>
+            <el-table-column label="完工日期" width="100" prop="daywork.finishedTime" align="center"></el-table-column>
             <el-table-column label="下达日期" prop="createTime" width="100" align="center">
               <template #default="scope">
                 <span>{{
-                  proxy.moment(scope.row.createTime).format("YYYY-MM-DD")
-                }}</span>
+        proxy.moment(scope.row.createTime).format("YYYY-MM-DD")
+      }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="报工总时长" prop="totalWorkingHours" width="150" align="center" />
+            <el-table-column label="报工总时长" prop="daywork.totalWorkingHours" width="150" align="center" />
           </el-table>
         </div>
       </div>
@@ -98,6 +106,7 @@ import {
   listDayworkItem,
   getProcessList,
   delDayworkItem,
+  lotList
 } from "@/api/business/daywork.js";
 import { listDeptProcess } from "@/api/business/deptProcess";
 import { selectUserPermissionList } from "@/api/system/user.js";
@@ -134,6 +143,16 @@ const dateRange = ref([
   proxy.moment().subtract(7, "days").format('YYYY-MM-DD'),
   proxy.moment().format('YYYY-MM-DD'),
 ])
+const statusOptions = [{
+  value: 0,
+  label: '下达'
+}, {
+  value: 1,
+  label: '在产'
+}, {
+  value: 2,
+  label: '完工'
+}]
 /**工序 */
 const processList = ref([]);
 /** 查询对象 */
@@ -172,7 +191,7 @@ function handleDeptChange() {
 /** 查询计划明细 */
 function getDayworks() {
   dayworkLoading.value = true;
-  listDaywork(queryDayworkParams.value).then((res) => {
+  lotList(queryDayworkParams.value).then((res) => {
     dayworkList.value = res.rows;
     for (var i = 0; i < dayworkList.value.length; i++) {
       let timeStamp = dayworkList.value[i].totalWorkingHours;
@@ -240,7 +259,7 @@ function handleDayworkCurrentChange(row) {
 //查询报工信息数据
 function handleGetDayworkItems() {
   dayworkLoading.value = true;
-  listDaywork(queryDayworkParams.value).then((res) => {
+  lotList(queryDayworkParams.value).then((res) => {
     dayworkList.value = res.rows;
     for (var i = 0; i < dayworkList.value.length; i++) {
       let timeStamp = dayworkList.value[i].totalWorkingHours;
@@ -269,7 +288,7 @@ function handleDeletedItem(id) {
     delDayworkItem(id).then((res) => {
       if (res.code == 200) {
         proxy.$modal.msgSuccess("删除成功");
-        listDaywork(queryDayworkParams.value).then((res) => {
+        lotList(queryDayworkParams.value).then((res) => {
           dayworkList.value = res.rows;
           for (var i = 0; i < dayworkList.value.length; i++) {
             let timeStamp = dayworkList.value[i].totalWorkingHours;