From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/FinishedDelivery/index.vue | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/src/views/warehouse/FinishedDelivery/index.vue b/src/views/warehouse/FinishedDelivery/index.vue
index 18d3879..a50adde 100644
--- a/src/views/warehouse/FinishedDelivery/index.vue
+++ b/src/views/warehouse/FinishedDelivery/index.vue
@@ -4,6 +4,7 @@
<ttable
:table="table"
:isShowHide="true"
+ :ajaxFun="ajaxFun"
:prelang="prelang"
:options="options"
ref="processconfiguration"
@@ -16,9 +17,12 @@
<script>
import ttable from '@/views/common/ztt-table.vue'
+import { fetchList, } from '@/api/quality/finishedDelivery'
+
export default {
data(){
return {
+ ajaxFun: fetchList,
prelang: 'operation',
dataListLoading: false,
options: {
@@ -44,22 +48,30 @@
column: [
{
minWidth: '140',
- prop: 'oo',
- label: '璁㈠崟缂栧彿',
+ prop: 'packageNo',
+ label: '鍖呰缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},{
minWidth: '140',
- prop: 'materhhooial',
- label: '璐ㄩ噺杩芥函鍙�',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
},
{
minWidth: '140',
- prop: 'mateuurial',
+ prop: 'partNo',
+ label: '浜у搧缂栧彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'partName',
label: '浜у搧鍚嶇О',
isTrue: true,
isSearch: true,
@@ -67,7 +79,7 @@
},
{
minWidth: '140',
- prop: 'materoiial',
+ prop: 'specs',
label: '瑙勬牸鍨嬪彿',
isTrue: true,
isSearch: true,
@@ -75,7 +87,7 @@
},
{
minWidth: '140',
- prop: 'matperoial',
+ prop: 'unit',
label: '鍗曚綅',
isTrue: true,
isSearch: true,
@@ -83,7 +95,7 @@
},
{
minWidth: '140',
- prop: 'materpial',
+ prop: 'number',
label: '鏁伴噺',
isTrue: true,
isSearch: true,
@@ -91,34 +103,40 @@
},
{
minWidth: '130',
- width: '150',
- prop: 'dealTime',
+ prop: 'createTime',
label: '鍏ュ簱鏃堕棿',
sort: true,
isTrue: true,
isSearch: true,
searchInfoType: 'datetimerange',
- // formatter: this.formatDateTime,
- },
- ],
- toolbar: [
+ formatter: this.formatDateTime,
+ },
{
- text: 'xxx',
- type: 'primary',
- // fun: this.addOrUpdateHandle
+ minWidth: '130',
+ prop: 'createUser',
+ label: '鍒涘缓浜�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
},
],
+ toolbar: [],
// operator: [],
// operatorConfig: {}
},
}
},
- medthods: {},
-// computed: {
-// ...mapGetters(['permissions'])
-// },
+ // computed: {
+ // ...mapGetters(['permissions'])
+ // },
components: {
- ttable
+ ttable
+ },
+ medthods: {
+ formatDateTime(row, column, cellValue) {
+ return cellValue ? fecha.format(new Date(cellValue), 'yyyy-MM-dd') : ''
+ },
},
}
</script>
\ No newline at end of file
--
Gitblit v1.9.3