From 379e7f13a015df39f57e95d8c827e2e560026c6c Mon Sep 17 00:00:00 2001
From: jiangfuzhuang <jiangfuzhuang@meswork.com>
Date: Wed, 5 Feb 2020 13:41:24 +0800
Subject: [PATCH] 11

---
 src/views/MarketingCenter/CreateProject/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 167de33f..7a69c959 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -43,11 +43,11 @@
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
         </el-tooltip>
-<<<<<<< HEAD
-        <!--        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
-=======
-        <!--<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>-->
->>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7
+<!--<<<<<<< HEAD-->
+<!--        &lt;!&ndash;        <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;-->
+<!--=======-->
+<!--        &lt;!&ndash;<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;-->
+<!--&gt;>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7-->
       </div>
     </el-card>
     <el-row>
@@ -78,7 +78,7 @@
             </el-table-column>
             <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
               <template slot-scope="scope">
-                {{ scope.row.合同签订日期 }}
+                {{ scope.row.合同签订日期.substring(0,10) }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="合同信息备注" min-width="150">