From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/quality/packageinspect/index.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/packageinspect/index.vue b/src/views/quality/packageinspect/index.vue
index e8a924d..e6093cd 100644
--- a/src/views/quality/packageinspect/index.vue
+++ b/src/views/quality/packageinspect/index.vue
@@ -17,7 +17,7 @@
<template>
<div class="mod-config">
<basic-container>
- <ttable
+ <ttable
:table="table"
:resultData="resultData"
@handleSelectionChange="handleSelectionChange"
@@ -121,7 +121,7 @@
isTrue: true,
sort: true,
isSearch: true,
- searchInfoType: 'text',
+ searchInfoType: 'date',
formatter: this.formatDateTime,
},
{
@@ -155,7 +155,7 @@
components: {
ttable,
},
- created() {
+ created() {
if(this.permissions.quality_packageinspect_del){
this.table.operator = [{
text: '浣滃簾',
@@ -202,7 +202,7 @@
}
this.$router.push({
name: 'packageInspectForm',
- query: {
+ query: {
id: row == null ? null : row.id
},
params:{resultVal : row.result=='' ? null : row.result}
@@ -229,4 +229,3 @@
}
}
</script>
-
\ No newline at end of file
--
Gitblit v1.9.3