From b172994cb67bd03949e40dd810fffd0293054929 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 二月 2024 16:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/equipment/mouldrecord/index.vue | 80 ++++++++++++----------------------------
1 files changed, 24 insertions(+), 56 deletions(-)
diff --git a/src/views/equipment/mouldrecord/index.vue b/src/views/equipment/mouldrecord/index.vue
index 2a03676..1bb7756 100644
--- a/src/views/equipment/mouldrecord/index.vue
+++ b/src/views/equipment/mouldrecord/index.vue
@@ -6,7 +6,7 @@
:isShowHide="true"
:ajaxFun="ajaxFun"
:prelang="prelang"
- :options="options"
+ :options="options"
ref="processconfiguration"
>
<template #toolbar>
@@ -19,8 +19,9 @@
<script>
import ttable from '@/views/common/ztt-table.vue'
-import { fetchList, } from '@/api/quality/finishedDelivery'
-
+import * as fecha from 'element-ui/lib/utils/date'
+import { fetchList, } from '@/api/equipment/mouldRecord'
+import { mapGetters } from 'vuex'
export default {
data(){
return {
@@ -50,22 +51,14 @@
column: [
{
minWidth: '140',
- prop: 'packageNo',
- label: '璁惧',
+ prop: 'mouldCode',
+ label: '妯″叿缂栫爜',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},{
minWidth: '140',
- prop: 'outBatchNo',
- label: '妯″叿缂栧彿',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'partNo',
+ prop: 'mouldName',
label: '妯″叿鍚嶇О',
isTrue: true,
isSearch: true,
@@ -73,23 +66,14 @@
},
{
minWidth: '140',
- prop: 'partName',
- label: '宸ュ簭',
+ prop: 'productNo',
+ label: '鎶ュ伐鍗曞彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- },
- {
+ },{
minWidth: '140',
- prop: 'specs',
- label: '宸ユ',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '140',
- prop: 'unit',
+ prop: 'batchNo',
label: '鎵瑰彿',
isTrue: true,
isSearch: true,
@@ -97,55 +81,39 @@
},
{
minWidth: '140',
- prop: 'number',
- label: '浜ч噺',
+ prop: 'optaskNo',
+ label: '宸ュ崟缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
{
minWidth: '140',
- prop: 'number',
- label: '瀵垮懡杞崲绯绘暟',
+ prop: 'workstationName',
+ label: '宸ヤ綔绔欏悕绉�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
{
minWidth: '140',
- prop: 'number',
- label: '浣跨敤閲�',
+ prop: 'staffNo',
+ label: '浣跨敤浜虹紪鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
- {
- minWidth: '140',
- prop: 'number',
- label: '鎶ュ伐鍗曞彿',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
- {
- minWidth: '130',
- prop: 'createUser',
- label: '鐘舵��',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'text',
- },
+
],
toolbar: [],
- // operator: [],
- // operatorConfig: {}
+ operator: null,
+ operatorConfig: {}
},
}
},
- // computed: {
- // ...mapGetters(['permissions'])
- // },
+ computed: {
+ ...mapGetters(['permissions'])
+ },
components: {
ttable
},
@@ -155,4 +123,4 @@
},
},
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3