From a5ab070162d97d16aaec2667c217e5c9b5db6370 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Sun, 28 Apr 2024 14:39:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=B7=A5-?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=8A=A5=E5=B7=A5=E9=A1=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/workScheduling/index.ts           |  13 ++
 src/components/tags/index.vue                 |  87 ++++++++++
 src/pages.json                                |   2 +-
 src/pages/mes/workOrder/processReport.vue     |  14 --
 .../mes/workScheduling/processReport.vue      | 161 ++++++++++++++++++
 5 files changed, 262 insertions(+), 15 deletions(-)
 create mode 100644 src/components/tags/index.vue
 delete mode 100644 src/pages/mes/workOrder/processReport.vue
 create mode 100644 src/pages/mes/workScheduling/processReport.vue

diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts
index 16e0d1a..9d65dbf 100644
--- a/src/api/mes/workScheduling/index.ts
+++ b/src/api/mes/workScheduling/index.ts
@@ -56,3 +56,16 @@ export function getEquipmentInfoList(params) {
 export function updateWorkSchedulingInfo(params) {
     return http.post('/mes/complete-inspect/update', params)
 }
+export interface getConfigProcessWorkerVO {
+    planDayCode: string
+    processCode: string
+    teamCode: string
+}
+// 查询已经配置工序人员
+export const getConfigProcessWorker = async (params: any) => {
+    return http.get('/mes/work-scheduling-detail/getPeopleReportList', {params})
+}
+// 工序报工
+export const reportWorkByProcess = async (params: any) => {
+    return http.post('/mes/work-scheduling-detail/reportWorkByProcess', params)
+}
diff --git a/src/components/tags/index.vue b/src/components/tags/index.vue
new file mode 100644
index 0000000..ae17ae3
--- /dev/null
+++ b/src/components/tags/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <view class="container" v-for="item in data">
+    <u-tag key="{{item.value}}">{{ item.text }}</u-tag>
+  </view>
+</template>
+
+<script setup lang="ts">
+/* 初始化 */
+import { onShow } from '@dcloudio/uni-app'
+import { getCurrentInstance, ref, defineExpose } from 'vue'
+
+const { proxy } = getCurrentInstance()
+
+const data = ref([])
+defineExpose({ data })
+</script>
+
+<style scoped lang="scss">
+.container {
+  background: #f5f5f5;
+  min-height: 100vh;
+  margin: 10rpx;
+}
+
+.list {
+  background: #f5f5f5;
+  margin-top: 20rpx;
+
+  .item {
+    padding: 30rpx 30rpx 0px 30rpx;
+    margin-top: 20rpx;
+    background: white;
+    position: relative;
+
+    .title {
+      display: flex;
+      align-items: center;
+      padding-bottom: 20rpx;
+
+      .title-txt {
+        color: #409eff;
+        font-weight: bold;
+        font-size: 36rpx;
+        width: 0px;
+        flex: 1;
+        word-wrap: break-word;
+      }
+
+      .time {
+        color: #919191;
+      }
+    }
+
+    .dec {
+      padding-bottom: 20rpx;
+      display: flex;
+      align-items: center;
+
+      view {
+        &:nth-child(1) {
+          width: 160rpx;
+        }
+
+        &:nth-child(2) {
+          color: #999999;
+          flex: 1;
+          width: 0px;
+          word-wrap: break-word;
+        }
+      }
+    }
+
+    .last {
+      padding-bottom: 30rpx;
+    }
+
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-top: 1px solid #e4e4e4;
+      padding: 20rpx 0px;
+      height: 90rpx;
+    }
+  }
+}
+</style>
diff --git a/src/pages.json b/src/pages.json
index 6ac7c30..cb3d80f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1950,7 +1950,7 @@
 			"enablePullDownRefresh": true
 		}
 	},{
-			"path": "pages/mes/workOrder/processReport",
+			"path": "pages/mes/workScheduling/processReport",
 			"style": {
 				"navigationBarTitleText": "工序报工",
 				"enablePullDownRefresh": true
diff --git a/src/pages/mes/workOrder/processReport.vue b/src/pages/mes/workOrder/processReport.vue
deleted file mode 100644
index 2c75593..0000000
--- a/src/pages/mes/workOrder/processReport.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <view>
-
-  </view>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/pages/mes/workScheduling/processReport.vue b/src/pages/mes/workScheduling/processReport.vue
new file mode 100644
index 0000000..46ebc60
--- /dev/null
+++ b/src/pages/mes/workScheduling/processReport.vue
@@ -0,0 +1,161 @@
+<template>
+  <view class="container">
+    <view class="list">
+      <view>
+        <u-search :show-action="true" v-model="data.searchValue" action-text="搜索" input-align="left" height="65" border-color="#ff9900" @search="alert()"></u-search>
+      </view>
+      <scroll-view scroll-y="true" class="scroll-Y">
+        <u-checkbox-group class="item" @change="checkChange">
+          <u-checkbox class="dec" v-model="item.checked" v-for="(item, index) in list" :key="index" :name="item.personName">{{ item.personName }}</u-checkbox>
+        </u-checkbox-group>
+      </scroll-view>
+
+
+<!--      <view class="item" v-for="(item, index) in list" :key="index" @click="openDetail(item)">-->
+<!--        <view class="dec">-->
+<!--          <view>{{ item.workerName }}</view>-->
+<!--          <view>1</view>-->
+<!--        </view>-->
+<!--      </view>-->
+    </view>
+  </view>
+  <u-alert-tips type="error" :title="系统提示" close-text="close" :description="请选择人员" :close-able="true" :show="show"></u-alert-tips>
+</template>
+
+<script setup lang="ts">
+/* 初始化 */
+import { onShow } from '@dcloudio/uni-app'
+import { getCurrentInstance, ref } from 'vue'
+/* 引入API */
+import tags from '@components/tags/index.vue'
+import * as workSchedulingApi from '@/api/mes/workScheduling'
+
+const { proxy } = getCurrentInstance()
+
+tags.data = ref([
+  {
+    text: '1',
+    value: '2'
+  }
+])
+const data = ref({
+  searchValue: ''
+})
+let show = false
+
+/* 是否显示"没有更多了" */
+const status = ref('loadmore')
+/* 列表数据集 */
+const list = ref([])
+function checkChange(checkedArray: string | any[]) {
+  if (checkedArray.length == 0){
+    show = true
+  }
+}
+/* 列表调用API方法 */
+async function getList() {
+  if (status.value === 'nomore') return
+  status.value = 'loading'
+  proxy.$modal.loading('加载中')
+  await workSchedulingApi
+    .getConfigProcessWorker({
+      planDayCode: 'PO20240426-0022',
+      processCode: 'FF-CY-002',
+      teamCode: 'T01'
+    })
+    .then((res) => {
+      proxy.$modal.closeLoading()
+      if (res.data.length > 0) {
+        list.value = res.data
+      }
+    })
+    .catch(() => {
+      proxy.$modal.closeLoading()
+    })
+}
+
+/* 打开详情页 */
+function openDetail(item: any) {
+  console.log(item)
+  // proxy.$tab.navigateTo(`/pages/mes/orderDapPlan/detail?obj=${item}`)
+}
+
+/* 通用方法 */
+onShow(() => {
+  list.value = []
+  getList()
+})
+</script>
+
+<style lang="scss" scoped>
+.container {
+  background: #f5f5f5;
+  min-height: 100vh;
+}
+
+.list {
+  background: #f5f5f5;
+  margin-top: 20rpx;
+
+  .item {
+    padding: 30rpx 30rpx 0px 30rpx;
+    margin-top: 20rpx;
+    background: white;
+    position: relative;
+
+    .title {
+      display: flex;
+      align-items: center;
+      padding-bottom: 20rpx;
+
+      .title-txt {
+        color: #409eff;
+        font-weight: bold;
+        font-size: 36rpx;
+        width: 0px;
+        flex: 1;
+        word-wrap: break-word;
+      }
+
+      .time {
+        color: #919191;
+      }
+    }
+
+    .dec {
+      padding-bottom: 20rpx;
+      display: flex;
+      align-items: center;
+
+      view {
+        &:nth-child(1) {
+          width: 160rpx;
+        }
+
+        &:nth-child(2) {
+          color: #999999;
+          flex: 1;
+          width: 0px;
+          word-wrap: break-word;
+        }
+      }
+    }
+
+    .last {
+      padding-bottom: 30rpx;
+    }
+
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-top: 1px solid #e4e4e4;
+      padding: 20rpx 0px;
+      height: 90rpx;
+    }
+  }
+}
+::v-deep .u-checkbox-group {
+  display: grid !important;
+}
+</style>