From c40fe153e13be534544b066a2f753c22985f7de6 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 16 Jul 2024 10:40:19 +0800
Subject: [PATCH] add record detail

---
 src/api/mes/record.js       |   2 +-
 src/api/system/dict/data.js |   7 ++-
 src/config.js               |   2 +-
 src/pages.json              |   9 ++-
 src/pages/index.vue         |   8 +--
 src/pages/work.vue          | 117 +++++++++++++++++++++++-------------
 src/utils/dateUtil.ts       |  11 ++++
 7 files changed, 103 insertions(+), 53 deletions(-)

diff --git a/src/api/mes/record.js b/src/api/mes/record.js
index 803346d..c81f4b1 100644
--- a/src/api/mes/record.js
+++ b/src/api/mes/record.js
@@ -48,7 +48,7 @@ export function deleteById(id) {
 // 查询明细列表
 export function getDetailByRecordId(id) {
   return request({
-    url: '/admin-api/mes/feeding-record/feeding-record-detail/list-by-record-id?id='+id,
+    url: '/admin-api/mes/feeding-record/feeding-record-detail/list-by-record-id?recordId='+id,
     method: 'get'
   })
 }
diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index 454b669..ca0c999 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -63,7 +63,12 @@ export const groupTypes = [
   {text: '白班', value: 1}, {text: '夜班', value: 2},
   {text: '长白班', value: 3}
 ]
-
+export const pipelineTypes = [
+  {text: '2立方制浆', value: 'zhijiang2'}, {text: '5立方制浆', value: 'zhijiang5'}
+]
+export const feedingTypes = [
+  {text: '领料', value: 'org'}, {text: '干废品', value: 'dry'}, {text: '湿废品', value: 'wet'}
+]
 export function findTextByValue(enums,value){
   const foundItem = enums.find(item => item.value === value);
   return foundItem ? foundItem.text : null;
diff --git a/src/config.js b/src/config.js
index e3d4cf7..01f1100 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
 // 应用全局配置
 const config = {
   // baseUrl: 'http://47.106.185.127:48080',127.0.0.1
-  baseUrl: 'http://47.106.185.127:48080',
+  baseUrl: 'http://127.0.0.1:48080',
    // 应用信息
    appInfo: {
      // 应用名称
diff --git a/src/pages.json b/src/pages.json
index 3156899..3ab28ee 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -15,7 +15,8 @@
     {
       "path": "pages/index",
       "style": {
-        "navigationBarTitleText": "生产计划"
+        "navigationBarTitleText": "生产计划",
+        "enablePullDownRefresh": true
       }
     },
     {
@@ -27,7 +28,8 @@
     {
       "path": "pages/work",
       "style": {
-        "navigationBarTitleText": "工作台"
+        "navigationBarTitleText": "近三天投料记录",
+        "enablePullDownRefresh": true
       }
     },
 
@@ -52,7 +54,8 @@
     {
       "path": "pages/report",
       "style": {
-        "navigationBarTitleText": "生产报工"
+        "navigationBarTitleText": "生产报工",
+        "enablePullDownRefresh": true
       }
     }
   ],
diff --git a/src/pages/index.vue b/src/pages/index.vue
index e0dbcbb..6c743f9 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -1,9 +1,8 @@
 <template>
   <view >
-    <uni-notice-bar show-icon scrollable
-                    text="安全生产！有序生产！高效生产！" />
-<!--    开工中-->
-    <uni-section title="开工中" type="line" title-color="#18bc37"></uni-section>
+    <uni-notice-bar show-icon scrollable text="安全生产！有序生产！高效生产！" />
+
+    <uni-section title="开工中" type="line" title-color="#18bc37"> </uni-section>
     <el-collapse accordion>
       <el-collapse-item v-for="(item, index) in startList"  :name="item.id">
         <template #title>
@@ -134,7 +133,6 @@
         <el-text>备注:{{ item.remark }}</el-text>
       </el-collapse-item>
     </el-collapse>
-
 <!--    <view class="charts-box">-->
 <!--      <qiun-data-charts :chartData="chartData" type="column"/>-->
 <!--    </view>-->
diff --git a/src/pages/work.vue b/src/pages/work.vue
index 38e461d..5a7d762 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -5,34 +5,33 @@
 <!--    已提交-->
     <uni-section title="已提交" type="line" title-color="#18bc37"></uni-section>
     <el-collapse accordion>
-      <el-collapse-item v-for="(item, index) in finishList"  :name="item.id">
+      <el-collapse-item v-for="(item, index) in finishList"  :name="item.id" @click="handleFinishClick(item.id,index)">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.feedingTime}}</el-text>-
-          <el-text  size="large">{{item.feedingRecordCode}}</el-text>
+          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>-
+          <el-text  size="large">{{item.feedingRecordCode}}</el-text>-
+          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
         </template>
         <el-row>
-          <el-col :span="12">
-            <el-text  type="success">制浆线:{{ timestampToTime(item.planStartTime) }}</el-text>
+          <el-col :span="6">投料类型:
+            <el-text type="warning">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">记录人:{{ item.userName }}</el-text>
+          <el-col :span="8">记录人:
+            <el-text type="success">{{ item.userName }}</el-text>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
-          </el-col>
-          <el-col :span="8">
-            <el-text type="warning">投料类型:{{ item.feedingType }}</el-text>
+          <el-col :span="8" v-if="item.feedingType !=='org'">重量/kg:
+            <el-text>{{ item.weight }} </el-text>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-text>备注:{{ item.remark }}</el-text>
+        <el-row v-for="(item2, index2) in finishList[index].detailList">
+          <el-col :span="8">原料:
+            <el-text type="warning">{{item2.itemName}}</el-text>
           </el-col>
-          <el-col :span="4">
-
+          <el-col :span="8">数量:
+            <el-text type="success">{{ item2.weight }}</el-text>
+          </el-col>
+          <el-col :span="8">单位:
+            <el-text>{{item2.unitName }} </el-text>
           </el-col>
         </el-row>
       </el-collapse-item>
@@ -40,39 +39,39 @@
     <!--    草稿状态-->
     <uni-section title="草稿" type="line" title-color="#f3a73f"></uni-section>
     <el-collapse accordion>
-      <el-collapse-item v-for="(item, index) in draftList"  :name="item.id">
+      <el-collapse-item v-for="(item, index) in draftList"  :name="item.id"  @click="handleDraftClick(item.id,index)">
         <template #title>
           <el-icon><Tickets /></el-icon>
-          <el-text type="success">{{item.feedingTime}}</el-text>-
-          <el-text  size="large">{{item.feedingRecordCode}}</el-text>
+          <el-text type="success">{{timestampToTime(item.feedingTime)}}</el-text>-
+          <el-text  size="large">{{item.feedingRecordCode}}</el-text>-
+          <el-text  type="warning">{{ findTextByValue(pipelineTypes, item.feedingPipeline)}}</el-text>
         </template>
         <el-row>
-          <el-col :span="12">
-            <el-text  type="success">制浆线:{{ timestampToTime(item.planStartTime) }}</el-text>
+          <el-col :span="6">投料类型:
+            <el-text type="warning">{{findTextByValue(feedingTypes, item.feedingType)  }}</el-text>
           </el-col>
-          <el-col :span="8">
-            <el-text type="success">记录人:{{ item.userName }}</el-text>
+          <el-col :span="8">记录人:
+            <el-text type="success">{{ item.userName }}</el-text>
           </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="success" plain  @click="updatePlan(item.id, item.code,'end')">提交</el-button>
+          <el-col :span="4" v-if="item.feedingType !=='org'">重量/kg:
+            <el-text>{{ item.weight }} </el-text>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
+          <el-col :span="3">
+            <el-button type="info"  @click="handleUpdate(item.id)">提交</el-button>
           </el-col>
-          <el-col :span="8">
-            <el-text type="warning">投料类型:{{ item.feedingType }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="warning" plain  @click="updatePlan(item.id,item.code,'pause')">删除</el-button>
+          <el-col :span="3">
+            <el-button type="danger"  @click="handleDelete(item.id)">删除</el-button>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-text>备注:{{ item.remark }}</el-text>
+        <el-row v-for="(item2, index2) in draftList[index].detailList">
+          <el-col :span="8">原料:
+            <el-text type="warning">{{item2.itemName}}</el-text>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="8">数量:
+            <el-text type="success">{{ item2.weight }}</el-text>
+          </el-col>
+          <el-col :span="8">单位:
+            <el-text>{{item2.unitName }} </el-text>
           </el-col>
         </el-row>
       </el-collapse-item>
@@ -83,7 +82,8 @@
 <script setup>
 import {ref, onMounted} from 'vue';
 import {getRecordList, updateStatus, deleteById, getDetailByRecordId} from "@/api/mes/record"
-import {timestampToTime} from "@/utils/dateUtil";
+import {timestampToTime,timestampToDateTime} from "@/utils/dateUtil";
+import { pipelineTypes,feedingTypes, findTextByValue} from "@/api/system/dict/data";
 import {Tickets} from "@element-plus/icons-vue";
 import modal from "@/plugins/modal";
 import tab from "@/plugins/tab";
@@ -95,6 +95,7 @@ const finishList = ref([]);
 //草稿状态的列表
 const draftList = ref([]);
 
+
 onMounted(() => {
   getList()
 });
@@ -107,6 +108,38 @@ function getList() {
     draftList.value = response.data
   })
 }
+function handleFinishClick(id, index){
+  getDetailByRecordId(id).then(response => {
+    finishList.value[index].detailList = response.data
+  })
+}
+function handleDraftClick(id, index){
+  getDetailByRecordId(id).then(response => {
+    draftList.value[index].detailList = response.data
+  })
+}
+/** 提交 */
+function handleUpdate(id){
+  showConfirm("确认提交投料记录吗？").then(res => {
+    if (res.confirm) {
+      updateStatus(id, 2).then(response => {
+        modal.msgSuccess("操作成功")
+        getList()
+      })
+    }
+  })
+}
+/** 提交 */
+function handleDelete(id){
+  showConfirm("确认删除投料记录吗？").then(res => {
+    if (res.confirm) {
+      deleteById(id).then(response => {
+        modal.msgSuccess("操作成功")
+        getList()
+      })
+    }
+  })
+}
 
 //看进度
 function planProgress(plan){
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index cfc53b5..fbdd2bb 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -12,6 +12,17 @@ export function timestampToTime(timestamp: number | null): string {
   // let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
   return Y + M + D;
 }
+export function timestampToDateTime(timestamp: number | null): string {
+  timestamp = timestamp ? timestamp : null;
+  let date = new Date(timestamp!); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+  let Y = date.getFullYear() + '-';
+  let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+  let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate());
+  let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+  let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+  let s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
+  return Y + M + D +' '+ h + m + s;
+}
 export function getCurrentDate(){
   let result = '';
   let now = new Date();