From 3d160d29c481f0091dc855bc4c754f71eb41b870 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 6 May 2025 13:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=AD=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/element-ui.scss                |  5 +++++
 .../key-person/components/addAndEditForm.vue     |  8 ++++----
 .../components/addAndEditForm.vue                | 14 +++++++-------
 .../company-manage/performance-manage/index.vue  | 14 +++++++-------
 src/views/data-create/nw-template/index.vue      | 16 ++++++++--------
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 363092a..ee4f750 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -89,4 +89,9 @@
   > .el-submenu__title
   .el-submenu__icon-arrow {
   display: none;
+}
+
+/* 单元格内容为空时 用 - 代替 */
+.el-table .el-table__body td .cell:empty::after {
+  content: '-' ;
 }
\ No newline at end of file
diff --git a/src/views/company-manage/key-person/components/addAndEditForm.vue b/src/views/company-manage/key-person/components/addAndEditForm.vue
index 3ecc274..2c641bb 100644
--- a/src/views/company-manage/key-person/components/addAndEditForm.vue
+++ b/src/views/company-manage/key-person/components/addAndEditForm.vue
@@ -40,8 +40,8 @@
                                     :limit="1"
                                     :file-size="10"
                                     @deleteFile="deleteFile"
-                                    :file-type="['jpg', 'png', 'jpeg']"
                                     :upload-file-url="uploadFileUrl"
+                                    :file-type="['jpg', 'png', 'jpeg']"
                                     :file-list.sync="addAndEditForm.idCardFront"
                                 >
                                     <template #upload-img-box> 身份证正面 </template>
@@ -52,8 +52,8 @@
                                     :limit="1"
                                     :file-size="10"
                                     @deleteFile="deleteFile"
-                                    :file-type="['jpg', 'png', 'jpeg']"
                                     :upload-file-url="uploadFileUrl"
+                                    :file-type="['jpg', 'png', 'jpeg']"
                                     :file-list.sync="addAndEditForm.idCardBack"
                                 >
                                     <template #upload-img-box> 身份证反面 </template>
@@ -186,8 +186,8 @@
                             :file-size="10"
                             :multiple="true"
                             @deleteFile="deleteFile"
-                            :file-type="['jpg', 'png', 'jpeg']"
                             :upload-file-url="uploadFileUrl"
+                            :file-type="['jpg', 'png', 'jpeg']"
                             :file-list.sync="addAndEditForm.diplomaImg"
                         />
                     </el-form-item>
@@ -205,9 +205,9 @@
                             :limit="5"
                             :file-size="10"
                             :multiple="true"
-                            :file-type="['jpg', 'png', 'jpeg']"
                             @deleteFile="deleteFile"
                             :upload-file-url="uploadFileUrl"
+                            :file-type="['jpg', 'png', 'jpeg']"
                             :file-list.sync="addAndEditForm.otherImg"
                         />
                     </el-form-item>
diff --git a/src/views/company-manage/performance-manage/components/addAndEditForm.vue b/src/views/company-manage/performance-manage/components/addAndEditForm.vue
index 59030ba..072fd2a 100644
--- a/src/views/company-manage/performance-manage/components/addAndEditForm.vue
+++ b/src/views/company-manage/performance-manage/components/addAndEditForm.vue
@@ -130,11 +130,11 @@
                         <el-table-column align="center" label="担任职务" show-overflow-tooltip>
                             <template slot-scope="{ row }">
                                 <el-input
-                                    v-model="row.title"
-                                    placeholder="请输入职务"
                                     clearable
                                     maxlength="30"
                                     show-word-limit
+                                    v-model="row.title"
+                                    placeholder="请输入职务"
                                 />
                             </template>
                         </el-table-column>
@@ -159,11 +159,11 @@
                         <el-table-column align="center" label="工作内容">
                             <template slot-scope="{ row }">
                                 <el-input
-                                    v-model="row.workContent"
-                                    placeholder="请输入工作内容"
                                     clearable
                                     maxlength="50"
                                     show-word-limit
+                                    v-model="row.workContent"
+                                    placeholder="请输入工作内容"
                                 />
                             </template>
                         </el-table-column>
@@ -174,9 +174,9 @@
                                     :key="index"
                                     style="
                                         display: flex;
+                                        margin-bottom: 4px;
                                         align-items: center;
                                         justify-content: center;
-                                        margin-bottom: 4px;
                                     "
                                 >
                                     <!-- <span>材料{{ index + 1 }}</span> -->
@@ -235,9 +235,9 @@
                             :limit="8"
                             :file-size="10"
                             :multiple="true"
-                            :file-type="['jpg', 'png', 'jpeg']"
                             @deleteFile="deleteFile"
                             :upload-file-url="uploadFileUrl"
+                            :file-type="['jpg', 'png', 'jpeg']"
                             :file-list.sync="addAndEditForm.htKeyFileList"
                         />
                     </el-form-item>
@@ -265,10 +265,10 @@
                 :limit="4"
                 :file-size="10"
                 :multiple="true"
-                :file-type="['jpg', 'png', 'jpeg']"
                 @deleteFile="deleteFile"
                 :file-list.sync="proveFileList"
                 :upload-file-url="uploadFileUrl"
+                :file-type="['jpg', 'png', 'jpeg']"
             />
 
             <el-row class="upload-btn-box">
diff --git a/src/views/company-manage/performance-manage/index.vue b/src/views/company-manage/performance-manage/index.vue
index 9d1a23f..f6267fb 100644
--- a/src/views/company-manage/performance-manage/index.vue
+++ b/src/views/company-manage/performance-manage/index.vue
@@ -11,8 +11,8 @@
                 <el-col :span="6">
                     <el-form-item>
                         <el-date-picker
-                            v-model="timeValue"
                             type="daterange"
+                            v-model="timeValue"
                             range-separator="~"
                             style="width: 100%"
                             value-format="yyyy-MM-dd"
@@ -62,28 +62,28 @@
             <el-table-column label="操作" width="200" align="center">
                 <template #default="{ row }">
                     <el-button
-                        style="color: #67c23a"
-                        icon="el-icon-view"
                         type="text"
                         size="mini"
+                        icon="el-icon-view"
+                        style="color: #67c23a"
                         @click="onHandleAddOrEdit(row, 2)"
                     >
                         详情
                     </el-button>
                     <el-button
-                        style="color: #409eff"
-                        icon="el-icon-edit"
                         type="text"
                         size="mini"
+                        icon="el-icon-edit"
+                        style="color: #409eff"
                         @click="onHandleAddOrEdit(row, 3)"
                     >
                         编辑
                     </el-button>
                     <el-button
-                        style="color: #f56c6c"
-                        icon="el-icon-delete"
                         type="text"
                         size="mini"
+                        icon="el-icon-delete"
+                        style="color: #f56c6c"
                         @click="onHandleDelete(row)"
                     >
                         删除
diff --git a/src/views/data-create/nw-template/index.vue b/src/views/data-create/nw-template/index.vue
index 3578153..8cf55c6 100644
--- a/src/views/data-create/nw-template/index.vue
+++ b/src/views/data-create/nw-template/index.vue
@@ -47,37 +47,37 @@
             <el-table-column label="操作" width="220" align="center">
                 <template #default="{ row }">
                     <el-button
-                        style="color: #67c23a"
-                        icon="el-icon-view"
                         type="text"
                         size="mini"
+                        icon="el-icon-view"
+                        style="color: #67c23a"
                         @click="onHandleAddOrEdit(row, 2)"
                     >
                         详情
                     </el-button>
                     <el-button
-                        style="color: #d140ff"
-                        icon="el-icon-download"
                         type="text"
                         size="mini"
+                        icon="el-icon-download"
+                        style="color: #d140ff"
                         @click="onHandleDownload(row)"
                     >
                         下载
                     </el-button>
                     <el-button
-                        style="color: #409eff"
-                        icon="el-icon-edit"
                         type="text"
                         size="mini"
+                        icon="el-icon-edit"
+                        style="color: #409eff"
                         @click="onHandleAddOrEdit(row, 3)"
                     >
                         编辑
                     </el-button>
                     <el-button
-                        style="color: #f56c6c"
-                        icon="el-icon-delete"
                         type="text"
                         size="mini"
+                        icon="el-icon-delete"
+                        style="color: #f56c6c"
                         @click="onHandleDelete(row)"
                     >
                         删除