From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/CNAS/systemManagement/customerSatisfaction/index.vue |   96 +++++++++++++++--------------------------------
 1 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 8e371d5..dcfdb49 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -1,24 +1,26 @@
 <template>
-  <div>
+  <div class="capacity-scope">
     <div>
-      <div class="search-background">
-        <span v-if="tabIndex === '0'" class="search-group">
-          <span style="width: 150px">鍗曚綅鍚嶇О锛�</span>
-          <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
-        </span>
-        <span v-if="tabIndex === '1'" class="search-group">
-          <span style="width: 150px">鏂囦欢鍚嶇О锛�</span>
-          <el-input v-model="searchForm1.fileName" clearable size="small"></el-input>
-        </span>
-        <span class="search-group">
-          <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
-          <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
-        </span>
-        <div class="btn">
+      <div class="search">
+        <div>
+          <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+            <el-form-item label="鍗曚綅鍚嶇О" prop="unitName" v-if="tabIndex === '0'">
+              <el-input v-model="searchForm.unitName" clearable size="small"></el-input>
+            </el-form-item>
+            <el-form-item label="鏂囦欢鍚嶇О" prop="fileName" v-if="tabIndex === '1'">
+              <el-input v-model="searchForm1.fileName" clearable size="small"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="searchList">鏌� 璇�</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">閲� 缃�</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div>
           <el-button v-if="tabIndex === '0'" size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
           <el-upload v-if="tabIndex === '1'" ref='upload' :action="action" :before-upload="beforeUpload"
-            :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
-            accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
+                     :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
+                     accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
             <el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
           </el-upload>
         </div>
@@ -31,23 +33,15 @@
           </el-radio-group>
         </div>
         <div v-if="tabIndex === '0'">
-          <TableCard :showForm="false" :showTitle="false">
-            <template v-slot:table>
-              <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
-                :table-loading="tableLoading" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination"
-                :page="page">
-              </limsTable>
-            </template>
-          </TableCard>
+          <limsTable :column="tableColumn" :height="'calc(100vh - 22em)'" :table-data="tableData"
+                     :table-loading="tableLoading" @pagination="pagination"
+                     :page="page">
+          </limsTable>
         </div>
         <div v-if="tabIndex === '1'">
-          <TableCard :showForm="false" :showTitle="false">
-            <template v-slot:table>
-              <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
-                :table-loading="tableLoading1" style="padding: 0 15px;margin-bottom: 16px" @pagination="pagination0">
-              </limsTable>
-            </template>
-          </TableCard>
+          <limsTable :column="tableColumn1" :height="'calc(100vh - 22em)'" :table-data="tableData1"
+                     :table-loading="tableLoading1" @pagination="pagination0">
+          </limsTable>
         </div>
       </div>
     </div>
@@ -60,7 +54,6 @@
 </template>
 
 <script>
-import TableCard from '@/components/TableCard/index.vue';
 import limsTable from "@/components/Table/lims-table.vue";
 import FormDialog from './components/formDialog.vue';
 import filePreview from '@/components/Preview/filePreview.vue'
@@ -72,9 +65,9 @@
 } from '@/api/cnas/systemManagement/customerSatisfaction.js'
 
 export default {
-  name: 'a8-customer-satisfaction',
+  name: 'CustomerSatisfaction',
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
-  components: { filePreview, FormDialog, limsTable, TableCard },
+  components: { filePreview, FormDialog, limsTable },
   data() {
     // 杩欓噷瀛樻斁鏁版嵁
     return {
@@ -352,40 +345,13 @@
 </script>
 
 <style scoped>
-.view-title {
+.search {
+  height: 46px;
   display: flex;
   justify-content: space-between;
-  align-items: center;
-  height: 60px;
-  padding-left: 20px;
-}
-
-.search-background {
-  width: 100%;
-  height: 80px;
-  line-height: 80px;
-  background-color: #ffffff;
-  display: flex;
-  position: relative;
-}
-
-.search-group {
-  display: flex;
-  align-items: center;
-  margin: 0 20px;
-}
-
-.table {
-  background-color: #ffffff;
 }
 
 .table-tab {
-  margin: 0 20px 20px 20px;
-}
-
-.btn {
-  position: absolute;
-  top: 16px;
-  right: 20px;
+  margin: 0 0 20px 0;
 }
 </style>

--
Gitblit v1.9.3