bug
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2024-04-15 10:49:13
|
||||
* @LastEditTime: 2024-06-17 16:32:02
|
||||
* @LastEditTime: 2024-06-24 15:08:34
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
@@ -76,7 +76,8 @@ import tableHeightMixin from "@/mixins/tableHeightMixin";
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import AddOrUpdate from './add-or-updata';
|
||||
import { factoryList, factoryArray } from "@/utils/constants";
|
||||
import { publicFormatter } from "@/utils/dict";
|
||||
// import { publicFormatter } from "@/utils/dict";
|
||||
import statusChart from "./statusChart.vue";
|
||||
|
||||
// import FileSaver from 'file-saver'
|
||||
// import * as XLSX from 'xlsx'
|
||||
@@ -206,13 +207,13 @@ export default {
|
||||
prop: 'factory',
|
||||
label: '工厂名称',
|
||||
filter: (val) => factoryList[val],
|
||||
minWidth: 200,
|
||||
minWidth: 220,
|
||||
showOverflowtooltip: true
|
||||
},
|
||||
{
|
||||
prop: 'workOrderNumber',
|
||||
label: '工单号',
|
||||
minWidth: 120,
|
||||
minWidth: 130,
|
||||
showOverflowtooltip: true
|
||||
// filter: (val) => ['玻璃芯片', '标准组件', 'BIPV', '定制组件'][val]
|
||||
},
|
||||
@@ -246,8 +247,8 @@ export default {
|
||||
{
|
||||
prop: 'orderStatus',
|
||||
label: '工单状态',
|
||||
// filter: publicFormatter('workorder_status')
|
||||
filter: (val) => ['', '未开始', '生产中', '已完成'][val],
|
||||
subcomponent: statusChart
|
||||
// filter: (val) => ['', '未开始', '生产中', '已完成'][val],
|
||||
},
|
||||
{
|
||||
prop: 'startTime',
|
||||
|
||||
51
src/views/produce/workOrder/statusChart.vue
Normal file
51
src/views/produce/workOrder/statusChart.vue
Normal file
@@ -0,0 +1,51 @@
|
||||
<!--
|
||||
* @Author: Do not edit
|
||||
* @Date: 2024-06-24 15:03:19
|
||||
* @LastEditTime: 2024-06-24 15:07:42
|
||||
* @LastEditors: DY
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<span class="dot" :class="myClass"></span>
|
||||
<span>{{ state }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: "statusChart",
|
||||
props: {
|
||||
injectData: {
|
||||
type: Object,
|
||||
default: () => ({}),
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
state() {
|
||||
return ['', '未开始', '生产中', '已完成'][this.injectData.orderStatus]
|
||||
},
|
||||
myClass() {
|
||||
return ['', 'yellow', 'blue', 'green'][this.injectData.orderStatus]
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style scoped>
|
||||
.dot {
|
||||
display: inline-block;
|
||||
width: 6px;
|
||||
height: 6px;
|
||||
border-radius: 3px;
|
||||
vertical-align: middle;
|
||||
margin-right: 8px;
|
||||
}
|
||||
.green {
|
||||
background: #10DC76;
|
||||
}
|
||||
.yellow {
|
||||
background: #FFBD02;
|
||||
}
|
||||
.blue {
|
||||
background: #3B79FF;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user