diff --git a/src/views/modules/production/liuhuaProductView.vue b/src/views/modules/production/liuhuaProductView.vue index a05dd2f..9e58538 100644 --- a/src/views/modules/production/liuhuaProductView.vue +++ b/src/views/modules/production/liuhuaProductView.vue @@ -10,6 +10,9 @@ + + + 产品编码 @@ -88,7 +91,7 @@ import Chooselist from '@/views/modules/common/Chooselist' export default { - name: 'searchSfdc', + name: 'liuhuaProductView', components: { Chooselist }, @@ -154,6 +157,23 @@ serialNumber: null, columnType: null, align: 'left' + }, { + tableId: "liuhuaView", + tableName: this.$route.meta.title, + columnProp: "operatorDesc", + columnLabel: "操作员姓名", + columnHidden: false, + columnImage: false, + columnSortable: false, + columnWidth: 80, + format: null, + functionId: this.$route.meta.menuId, + sortLv: 0, + status: true, + fixed: '', + serialNumber: null, + columnType: null, + align: 'left' }, { tableId: "liuhuaView", tableName: this.$route.meta.title, @@ -209,7 +229,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "xiubianWancheng", - columnLabel: "修边合格率", + columnLabel: "修边完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -226,7 +246,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "hongkaoWancheng", - columnLabel: "烘烤合格率", + columnLabel: "烘烤完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -243,7 +263,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "jiagongWancheng", - columnLabel: "加工合格率", + columnLabel: "加工完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -260,7 +280,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "jianyanWancheng", - columnLabel: "检验合格率", + columnLabel: "检验完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -277,7 +297,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "baozhuangWancheng", - columnLabel: "包装合格率", + columnLabel: "包装完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -294,7 +314,7 @@ tableId: "liuhuaView", tableName: this.$route.meta.title, columnProp: "liuhuaWancheng", - columnLabel: "总合格率", + columnLabel: "总完成率", columnHidden: false, columnImage: false, columnSortable: false, @@ -318,6 +338,7 @@ page: 1, limit: 20, site:'', + operatorDesc:'', orderNo: '', partNo: '', partSpec:'', @@ -369,7 +390,9 @@ }, search() { - if (this.searchData.site === ''&&this.searchData.orderNo === ''&&this.searchData.partNo === ''&&this.searchData.partSpec === ''&&this.searchData.startDate === ''&&this.searchData.endDate === ''&&this.searchData.seqNo === ''){ + if (this.searchData.site === ''&&this.searchData.orderNo === ''&&this.searchData.partNo === '' + &&this.searchData.partSpec === ''&&this.searchData.startDate === ''&&this.searchData.endDate === '' + &&this.searchData.seqNo === ''&&this.searchData.operatorDesc === ''){ this.$alert('计算量过大,请至少填写一个筛选条件!', '错误', { confirmButtonText: '确定' })