From 3a75e562804e350f709e9c6cf8fb760888495f97 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Tue, 10 Nov 2020 20:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/custom/SysContractController.java |  2 +-
 ruoyi-ui/src/views/custom/contract/index.vue         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java
index 1c5422107..6afdff608 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java
@@ -38,7 +38,7 @@ public class SysContractController extends BaseController {
         startPage();
         List<SysContract> list = sysContractService.selectSysContractList(sysContract);
         for (SysContract contract : list) {
-            if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) {
+            if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().trim().equals(contract.getSignName())) {
                 contract.setName(contract.getName() + "（" + contract.getSignName() + "）");
             }
         }
diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue
index 3ea20267b..d9ec18aaa 100644
--- a/ruoyi-ui/src/views/custom/contract/index.vue
+++ b/ruoyi-ui/src/views/custom/contract/index.vue
@@ -97,7 +97,7 @@
 
     <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
       <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="合同编号" align="center" prop="id" fixed="left"/>
+      <el-table-column label="合同编号" align="center" prop="id" fixed="left" width="150"/>
       <el-table-column label="合同状态" align="center" prop="status" width="80" fixed="left">
         <template slot-scope="scope">
           <el-tag
@@ -107,7 +107,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="客户姓名" align="center" prop="name" fixed="left"/>
+      <el-table-column label="客户姓名" align="center" prop="name" fixed="left" width="200"/>
       <el-table-column label="证件号" align="center" prop="cusId" width="190"/>
       <el-table-column label="电话" align="center" prop="phone" width="120"/>
       <el-table-column label="服务时间" align="center" prop="serveTime" :formatter="serveTimeFormat" width="100"/>
@@ -116,17 +116,17 @@
           {{scope.row.servePromise ? `${scope.row.servePromise}斤`: ''}}
         </template>
       </el-table-column>
-      <el-table-column label="金额" align="center" prop="amount"/>
+      <el-table-column label="金额" align="center" prop="amount" width="100"/>
       <el-table-column label="签订时间" align="center" prop="updateTime" width="180"/>
-      <el-table-column label="合同地址" align="center" prop="path">
+      <el-table-column label="合同地址" align="center" prop="path" width="80">
         <template slot-scope="scope">
           <el-button type="text" icon="el-icon-copy-document" @click="handleCopy(scope.row.path)" class="copyBtn"
                      :data-clipboard-text="copyValue">复制
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="备注" align="center" prop="remark" width="120"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.status==='yes'"