工单

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-05 15:39:35
+ * @LastEditTime: 2024-06-07 14:15:00
  * @LastEditors: DY
  * @Description:
 -->
@@ -43,7 +43,7 @@
         </el-col>
         <el-col :span="3">
           <p class="title">投入状态</p>
-          <p class="text">{{ dataForm.inStatus }}</p>
+          <p class="text">{{ getDictDataLabel('work_order_in_status', dataForm.inStatus) }}</p>
         </el-col>
       </el-row>
       <el-row :gutter="20">
@@ -98,6 +98,7 @@ import { getWorkOrderDetail } from '@/api/produceData/order';
 import SmallTitle from './SmallTitle';
 import jsPDF from 'jspdf';
 import html2canvas from 'html2canvas';
+import { getDictDataLabel } from "@/utils/dict";
 
 export default {
   components: {
@@ -266,7 +267,7 @@ export default {
       this.pieChart = echarts.init(this.$refs['pie'])
       this.pieChart.setOption({
         title: {
-          text: '产品良率',
+          text: '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%',
           left: 'center'
           // subtext: 'Fake Data'
         },
@@ -280,7 +281,7 @@ export default {
         },
         series: [
           {
-            name: 'Access From',
+            // name: 'Access From',
             type: 'pie',
             radius: ['40%', '70%'],
             avoidLabelOverlap: false,

src/views/produce/workOrder/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-06-03 15:15:18
+ * @LastEditTime: 2024-06-07 10:35:48
  * @LastEditors: DY
  * @Description:
 -->
@@ -47,6 +47,7 @@ import moment from 'moment'
 import basicPage from '@/mixins/basic-page'
 import AddOrUpdate from './add-or-updata';
 import { factoryList, factoryArray } from "@/utils/constants";
+import { publicFormatter } from "@/utils/dict";
 
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
@@ -183,7 +184,8 @@ export default {
         {
           prop: 'workOrderType',
           label: '工单类型',
-          filter: (val) => ['', '芯片订单', '组件类型', 'bipv类型'][val],
+          // filter: publicFormatter('workorder_status')
+          filter: (val) => ['', '芯片工单', '组件类型', 'bipv类型'][val],
         },
         {
           prop: 'plannedInvestment',
@@ -209,7 +211,8 @@ export default {
         {
           prop: 'orderStatus',
           label: '工单状态',
-          filter: (val) => ['未开始', '生产中', '已完成'][val],
+          filter: publicFormatter('workorder_status')
+          // filter: (val) => ['未开始', '生产中', '已完成'][val],
         },
         {
           prop: 'startTime',