From 7af24e2656ddae37f03f1ae62b439f1bbf6a9dc4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 六月 2025 18:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/business/caseEntry.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/company/src/views/business/caseEntry.vue b/company/src/views/business/caseEntry.vue
index 3b83398..6faa002 100644
--- a/company/src/views/business/caseEntry.vue
+++ b/company/src/views/business/caseEntry.vue
@@ -23,10 +23,10 @@
<el-form-item label="鍑洪櫓鏃堕棿" prop="createDate">
<el-date-picker
v-model="searchForm.createDate"
- type="datetime"
+ type="date"
placeholder="閫夋嫨鏃ユ湡"
- format="yyyy-MM-dd hh:mm:ss"
- value-format="yyyy-MM-dd hh:mm:ss">
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="鍑洪櫓浜�" prop="extData.memberName">
@@ -76,12 +76,12 @@
<el-table-column prop="reportNum" label="妗堜欢鍙�" min-width="150px" align="center"></el-table-column>
<el-table-column prop="companyName" label="鎶曚繚鍗曚綅" min-width="150px" align="center"></el-table-column>
<el-table-column prop="informantName" label="鎶ユ浜�" min-width="150px" align="center"></el-table-column>
- <el-table-column prop="reportDate" label="鎶ユ鏃堕棿" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="createDateStr" label="鎶ユ鏃堕棿" min-width="100px" align="center"></el-table-column>
<el-table-column prop="happenTime" label="鍑洪櫓鏃堕棿" min-width="120px" align="center"></el-table-column>
<el-table-column prop="memberName" label="鍑洪櫓浜�" min-width="120px" align="center"></el-table-column>
- <el-table-column prop="memberIdcard" label="韬唤璇佸彿" min-width="120px" align="center"></el-table-column>
+ <el-table-column prop="memberIdcardNo" label="韬唤璇佸彿" min-width="120px" align="center"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="120px" align="center"></el-table-column>
- <el-table-column prop="code" label="淇濆崟鍙�" min-width="120px" align="center"></el-table-column>
+ <el-table-column prop="applyCode" label="淇濆崟鍙�" min-width="120px" align="center"></el-table-column>
<el-table-column prop="baoxianStartTime" label="淇濋櫓鐢熸晥璧锋湡" min-width="120px" align="center"></el-table-column>
<el-table-column prop="baoxianEndTime" label="淇濋櫓鐢熸晥姝㈡湡" min-width="120px" align="center"></el-table-column>
<el-table-column label="灏辫瘖绫诲瀷" min-width="120px" align="center">
@@ -100,7 +100,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text">璇︽儏</el-button>
+<!-- <el-button type="text">璇︽儏</el-button>-->
<el-button type="text" @click="$refs.opearaCaseEntryWindow.open('妗堜欢褰曞叆', row.id)">缂栬緫</el-button>
<el-button type="text" @click="deleRow(row.id)">鍒犻櫎</el-button>
</template>
--
Gitblit v1.9.3