meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
jiangfuzhuang
2020-02-05 13:41:24 +08:00
parent fb3b32ff7d
commit 379e7f13a0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -43,11 +43,11 @@
<el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top"> <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-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> </el-tooltip>
<<<<<<< HEAD <!--<<<<<<< HEAD-->
<!-- <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>--> <!-- &lt;!&ndash; <el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;-->
======= <!--=======-->
<!--<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>--> <!-- &lt;!&ndash;<el-button type="info" size="small" style="margin-left: 10px">导出Excel</el-button>&ndash;&gt;-->
>>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7 <!--&gt;>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7-->
</div> </div>
</el-card> </el-card>
<el-row> <el-row>
@@ -78,7 +78,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100"> <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同签订日期 }} {{ scope.row.合同签订日期.substring(0,10) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注" min-width="150"> <el-table-column align="center" label="合同信息备注" min-width="150">