bug 工单详情

src/views/produce/workOrder/add-or-updata.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-03 10:17:33
+ * @LastEditTime: 2024-06-05 15:39:35
  * @LastEditors: DY
  * @Description:
 -->
@@ -94,7 +94,7 @@
 // import basicAdd from './basic-add';
 import * as echarts from 'echarts'
 import resize from '@/mixins/resize'
-import { getWorkOrderDetail, getEqNum, getDailyTrend } from '@/api/produceData/order';
+import { getWorkOrderDetail } from '@/api/produceData/order';
 import SmallTitle from './SmallTitle';
 import jsPDF from 'jspdf';
 import html2canvas from 'html2canvas';
@@ -167,19 +167,33 @@ export default {
       })
       if (id) {
         getWorkOrderDetail(id).then(res => {
-          this.dataForm = res.data
-          this.buildChart(this.dataForm)
-          if (this.dataForm.orderStatus === 1) {
-            this.trend()
-          }
-        })
-        getEqNum(id).then(response => {
-          if (response.code === 0) {
-            const xAxisList = Object.keys(response.data)
-            const yAxisList = Object.values(response.data)
+          if (res.code === 0) {
+            this.dataForm = res.data.prodWorkOrderDO
+            this.buildChart(this.dataForm)
+            // 在制品
+            const xAxisList = Object.keys(res.data.inProcessDis)
+            const yAxisList = Object.values(res.data.inProcessDis)
             this.initEqLineChart(xAxisList, yAxisList)
+            // 趋势图
+            const seriesList = []
+            const dateList = []
+            res.data.his.forEach(element => {
+              seriesList.push(element.actualProduction)
+              dateList.push(element.recordTime[0] + '-' + element.recordTime[1] + '-' + element.recordTime[2])
+            })
+            this.initLineChart(dateList, seriesList)
           }
+          // if (this.dataForm.orderStatus === 1) {
+          //   this.trend()
+          // }
         })
+        // getEqNum(id).then(response => {
+        //   if (response.code === 0) {
+        //     const xAxisList = Object.keys(response.data)
+        //     const yAxisList = Object.values(response.data)
+        //     this.initEqLineChart(xAxisList, yAxisList)
+        //   }
+        // })
         
       }
     },