0118

src/api/business/daywork.js

@@ -6,11 +6,11 @@ const baseUrl = import.meta.env.VITE_APP_PRODUCTION_API
  * @param {*} data
  * @returns
  */
-export function listDaywork(data) {
+export function listDaywork(query) {
   return request({
     url: baseUrl + '/business/productionDaywork/list',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
@@ -27,3 +27,16 @@ export function listDayworkItem(data) {
     data: data
   })
 }
+
+/**
+ * 获取报工批次工序列表
+ * @param {*} data
+ * @returns
+ */
+export function getProcessList(query) {
+  return request({
+    url: baseUrl + '/business/productionDaywork/getProcessList',
+    method: 'get',
+    params: query
+  })
+}

src/views/business/daywork/index.vue

@@ -44,6 +44,9 @@
         <el-form-item>
           <el-button type="success" icon="Refresh" @click="handleQueryDayworkItem" v-hasPermi="['business:daywork:query']">刷新</el-button>
         </el-form-item>
+        <el-form-item class="section-title" label="请选择工序：">
+          <el-select-v2 v-model="queryItemParams.technologicalProcessDetailId" filterable :options="processList" placeholder="请选择工序" style="width: 100%" @change="handleProcessChange" />
+        </el-form-item>
       </el-form>
 
       <div class="el-table-container">
@@ -66,14 +69,15 @@
         </div>
       </div>
       <!-- 分页 -->
-      <pagination v-show="itemTotal > 0" :total="itemTotal" v-model:page="queryItemParams.pageNum" v-model:limit="queryItemParams.pageSize" @pagination="getDayworks" />
+      <pagination v-show="itemTotal > 0" :total="itemTotal" v-model:page="queryItemParams.pageNum" v-model:limit="queryItemParams.pageSize" @pagination="getDayworkItems" />
     </section>
   </div>
 </template>
 
 <script setup>
-import { listDaywork, listDayworkItem } from '@/api/business/daywork.js'
+import { listDaywork, listDayworkItem,getProcessList } from '@/api/business/daywork.js'
 import {toHHmmss} from '@/components/Time/time.js'
+import { get } from '@vueuse/core'
 const { proxy } = getCurrentInstance()
 
 /** 字典 */
@@ -88,6 +92,8 @@ const dayworkTable = ref(null)
 const currentDaywork = ref({})
 const dayworkLoading = ref(true)
 const dayworkItemLoading = ref(false)
+const processList = ref([])
+const technologicalProcessId =ref('')
 
 const total = ref(0)
 const itemTotal = ref(0)
@@ -108,9 +114,9 @@ const queryItemParams = ref({
 /***********************  方法区  ****************************/
 
 /** 查询计划明细 */
-const getDayworks = () => {
+function getDayworks() {
   dayworkLoading.value = true
-  console.log(typeof queryDayworkParams.value.lotCode)
+console.log(queryDayworkParams.value)
   listDaywork(queryDayworkParams.value).then((res) => {
     dayworkList.value = res.rows
     console.log(dayworkList.value)
@@ -123,15 +129,25 @@ const getDayworks = () => {
   })
 }
 
+function handleProcessChange() {
+  getDayworkItems()
+}
+
 /** 查询报工详情列表 */
-const getDayworkItems = () => {
+function getDayworkItems() {
   dayworkItemLoading.value = true
   listDayworkItem(queryItemParams.value).then((res) => {
     dayworkItemList.value = res.rows
+    console.log(dayworkItemList.value)
    for(var i = 0;i<dayworkItemList.value.length;i++) {
     let timeStamp = dayworkItemList.value[i].workingHours;
 					dayworkItemList.value[i].workingHours = toHHmmss(timeStamp);
    }
+    console.log(queryItemParams.value.technologicalProcessId)
+   getProcessList({technologicalProcessId:queryItemParams.value.technologicalProcessId}).then((res) => {
+    processList.value = res.data
+   })
+
     itemTotal.value = res.total
     dayworkItemLoading.value = false
   })
@@ -148,6 +164,8 @@ function handleDayworkCurrentChange(row) {
   if (row) {
     currentDaywork.value = row
     queryItemParams.value.dayworkId = currentDaywork.value.id
+    queryItemParams.value.technologicalProcessDetailId =''
+    queryItemParams.value.technologicalProcessId = row.technologicalProcessId
     getDayworkItems()
   } else {
     dayworkItemList.value = []

src/views/business/resourcePlan/index.vue

@@ -56,7 +56,7 @@
         <div class="el-table-container">
           <div class="el-table-inner-container">
             <el-table ref="planDetailsTable"  v-loading="planDetailLoading" row-key="id" :data="planDetailList" highlight-current-row height="100%" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="40" align="center" :reserve-selection="true" />
+              <el-table-column type="selection" width="40" align="center" />
               <el-table-column type="index" label="行号" width="50" align="center" />
               <el-table-column label="厂家" prop="companyAlias" width="150" align="center" />
               <el-table-column label="生产计划单号" prop="productionPlanNo" width="110" align="center" />
@@ -94,7 +94,6 @@ const resourceGroupLoading = ref(false)
 const planDetailList = ref([])
 const planDetailLoading = ref(false)
 const planDetailIds = ref([])
-
 const currentResourceGroup = ref({})
 const total = ref(0)
 const itemTotal = ref(0)
@@ -192,7 +191,6 @@ function handleOpenPlanDetailDialog() {
 /** 生产计划批量删除*/
   function handleSelectionChange(selection) {
   planDetailIds.value = selection.map((item) => item.id)
-  console.log(planDetailIds.value)
 }
 
   function handleDeletePlanDetail() {

src/views/dialog/person.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="员工选择" v-model="visible" :width="width" @close="close" append-to-body draggable>
-    <el-form ref="dialogForm" class="list-search-container" :inline="true" :model="queryParams" style="margin-top: 20px;">
+    <el-form ref="dialogForm" class="list-search-container" :inline="true" :model="queryParams" >
       <el-form-item label="员工编码：" prop="userName">
         <el-input v-model.trim="queryParams.userName" type="text" placeholder="请输入员工编码" @keydown.enter.prevent @keyup.enter="handleSearch" style="width: 180px" clearable />
       </el-form-item>