Merge remote-tracking branch 'origin/master'

src/pages/mes/workScheduling/processReportForm.vue

@@ -112,7 +112,13 @@ function remove(index: number){
 }
 /* 通用方法 */
 onShow(() => {
-  list.value = uni.getStorageSync("processReportList")
+  uni.getStorageSync("processReportList").forEach(person=>{
+    if(person.checked){
+      person.reportList.forEach(report=>{
+        list.value.push(report)
+      })
+    }
+  })
 })
 </script>
 

src/pages/mes/workScheduling/processReportPeopleCheck.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <view class="list">
       <view>
-        <u-search :show-action="true" v-model="data.nickName" action-text="搜索" input-align="left" height="65" border-color="#ff9900" @search="getList" @custom="getList"></u-search>
+        <u-search :show-action="true" v-model="data.nickName" action-text="搜索" input-align="left" height="65" border-color="#ff9900" @search="filterList" @custom="filterList"></u-search>
       </view>
       <scroll-view scroll-y="true" class="scroll-Y" style="height: calc(100vh - 80rpx)">
         <u-checkbox-group class="item" @change="checkChange">
@@ -44,35 +44,11 @@ const data = ref({
   processCode: '',
   nickName: ''
 })
-let checked: string | any[] = []
 /* 是否显示"没有更多了" */
 const status = ref('loadmore')
 /* 列表数据集 */
 const list = ref([])
-
-/* 列表调用API方法 */
-async function getList() {
-  if (status.value === 'nomore') return
-  status.value = 'loading'
-  proxy.$modal.loading('加载中')
-
-  await workSchedulingApi.getConfigProcessWorker(data.value).then((res) => {
-    uni.setStorageSync("isLeader", res.data.leader)
-    if (res.data.leader) {
-      list.value = res.data.list
-    } else {
-      if (res.data.list.length == 0){
-        _toast("没有可以报工项")
-        return
-      }
-      uni.setStorageSync("processReportList", res.data.list)
-      uni.redirectTo({
-        url: "./processReportForm"
-      })
-    }
-  })
-  proxy.$modal.closeLoading()
-}
+let checked: string | any[] = []
 function checkChange(checkedArray: any[]) {
   checked = checkedArray
 }
@@ -81,26 +57,30 @@ function openDetail(item: any) {
   console.log(item)
   // proxy.$tab.navigateTo(`/pages/mes/orderDapPlan/detail?obj=${item}`)
 }
-
+function filterList(){
+  list.value = []
+  uni.getStorageSync("processReportList").forEach(person=>{
+    if (person.personName.includes(data.value.nickName)){
+      list.value.push(person)
+    }
+  })
+}
 /* 通用方法 */
 onShow(() => {
-  list.value = []
-  getList()
 })
 function onSubmit() {
   if (checked.length == 0){
     _toast("请选择人员")
     return
-  }
-  uni.setStorageSync("processReportList", checked)
+  }else{
+    uni.setStorageSync("processReportList", list.value)
     uni.redirectTo({
-    url: "./processReportForm"
+      url: "/pages/mes/workScheduling/processReportForm"
     })
   }
+}
 onLoad((option) => {
-  // "{"status":"1","remark":null,"planMasterCode":"PO20240429-0015","schedulingCode":"9bb4ab0cfcc14e3284833506b5041571","productCode":"015.886-117","productName":null,"workroomCode":"work1","lineCode":"work1-line1","prouteCode":"015.886-117","planCount":25,"finishCount":0,"qualifiedCount":null,"unqualifiedCount":null,"flagDo":"0","planSubCode":null,"workingNode":"QD_HJ_01","workingTaskSort":1,"formType":"BATCH","workSort":0,"currentWorkstation":null,"planStartTime":null,"planEndTime":1714388234000,"realStartTime":null,"realFinishedTime":null,"qualityFormNo":null,"reason":null,"planNoDay":null,"batchCode":"M015.886-117-001","id":61,"createTime":1714370517000,"creator":"1"}"
-  data.value.planDayCode = uni.getStorageSync("processReportListParams").planMasterCode
-  data.value.processCode = uni.getStorageSync("processReportListParams").workingNode
+  list.value = uni.getStorageSync("processReportList")
 })
 </script>
 

src/pages/mes/workScheduling/workScheduling.vue

@@ -83,27 +83,22 @@
 
 <script setup lang="ts">
 
-import {
-  onLoad,
-  onShow,
-  onReachBottom
-} from '@dcloudio/uni-app'
-import {
-  ref,
-  getCurrentInstance
-} from 'vue'
+import { onReachBottom, onShow } from "@dcloudio/uni-app"
+import { getCurrentInstance, ref } from "vue"
 
-import * as workSchedulingListApi from '@/api/mes/workScheduling/index.ts'
+import * as workSchedulingListApi from "@/api/mes/workScheduling/index.ts"
+import * as workSchedulingApi from "@/api/mes/workScheduling"
+import { _toast } from "@/utils/common"
 
 const list1 = ref([
   {
-    name: '全部',
+    name: "全部"
   },
   {
-    name: '待齐套',
+    name: "待齐套"
   },
   {
-    name: '待开工',
+    name: "待开工"
   },
   {
     name: '生产中',
@@ -300,7 +295,7 @@ async function searchTable() {
 	// 完工处理（临时，后续调整）
 function completeHandle(item) {
   console.log(item)
-	proxy.$modal.loading('点击了完工按钮')
+  proxy.$modal.loading("点击了完工按钮")
   setTimeout(() => {
     proxy.$modal.closeLoading()
   }, 1000)
@@ -316,17 +311,34 @@ function completeHandle(item) {
   // 	proxy.$modal.closeLoading()
   // })
 }
-function reportHandle(item) {
-  uni.setStorageSync("processReportListParams", item)
+
+async function reportHandle(item) {
+  proxy.$modal.loading("加载中")
+  await workSchedulingApi.getConfigProcessWorker({
+    planDayCode: item.planMasterCode,
+    processCode: item.workingNode,
+    schedulingCode: item.schedulingCode
+  }).then((res) => {
+    uni.setStorageSync("isLeader", res.data.leader)
+    if (res.data.persons.length == 0) {
+      _toast("没有可以报工项")
+      return
+    }
+    uni.setStorageSync("processReportList", res.data.persons)
     uni.redirectTo({
-    url: "/pages/mes/workScheduling/processReportPeopleCheck"
+      url: res.data.leader ? "/pages/mes/workScheduling/processReportPeopleCheck" : "/pages/mes/workScheduling/processReportForm"
+    })
+  }).finally(() => {
+    proxy.$modal.closeLoading()
   })
 }
+
 // 叫料
 function callBasicItem(item) {
   console.log(item)
   proxy.$tab.navigateTo(`/pages/mes/workScheduling/callMaterial?obj=${JSON.stringify(item)}`)
 }
+
 // 领料
 function receiveBasicItem(item) {
   console.log(item)