This commit is contained in:
chenjianan
2019-04-10 14:52:19 +08:00
parent 0d0781ec91
commit a22d9f069b
3 changed files with 89 additions and 35 deletions

View File

@@ -1,8 +1,8 @@
<template>
<div>
<div class="app-container bold-font">
<el-card>
<el-row>
<span>项目名称:</span>
<h3 style="display: inline-block;margin: 0">项目名称:</h3>
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in project"
@@ -10,7 +10,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床名称:</span>
<h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3>
<el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
<el-option
v-for="item in toolNum"
@@ -18,14 +18,14 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>客户名称:</span>
<h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
</el-row>
<el-row>
<span>签订日期:</span>
<h3 style="display: inline-block;margin: 0">签订日期:</h3>
<el-date-picker v-model="time_SignStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/> ~
<el-date-picker v-model="time_SignFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
<span>交货期:</span>
<h3 style="display: inline-block;margin: 0 0 0 20px">交货期:</h3>
<el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/> ~
<el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
@@ -33,8 +33,9 @@
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="640" highlight-current-row size="mini" style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="项目编号" align="center" width="140px">
<h3 style="display: inline-block;margin: 0">总计划:</h3>
<el-table v-loading="loading" :data="tableData" height="820" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="项目编号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
@@ -44,37 +45,37 @@
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" width="130px">
<el-table-column label="项目名称" align="center" width="120px" fixed="left">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="110px">
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="130px">
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="机床数量" align="center" width="70px">
<el-table-column label="机床数量" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="签订日期" align="center" width="100px">
<el-table-column label="签订日期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column label="交货期" align="center" width="100px">
<el-table-column label="交货期" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.发货节点 }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="130px">
<el-table-column label="客户名称" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -95,7 +96,7 @@
<el-date-picker v-model="scope.row.机床设计完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 }}</el-button>
</template>
</template>
</el-table-column>
@@ -105,7 +106,7 @@
<el-date-picker v-model="scope.row.采购完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 }}</el-button>
</template>
</template>
</el-table-column>
@@ -115,7 +116,7 @@
<el-date-picker v-model="scope.row.备料完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 }}</el-button>
</template>
</template>
</el-table-column>
@@ -125,7 +126,7 @@
<el-date-picker v-model="scope.row.机床生产完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 }}</el-button>
</template>
</template>
</el-table-column>
@@ -135,7 +136,7 @@
<el-date-picker v-model="scope.row.机床装配完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
</template>
<template v-else>
<el-button type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 }}</el-button>
<el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 }}</el-button>
</template>
</template>
</el-table-column>
@@ -149,7 +150,7 @@
<!--</template>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="更新" align="center" width="100px">
<el-table-column label="更新" align="center" width="90px">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.更新" size="mini"/>
@@ -167,7 +168,7 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 15px">
<div class="block" style="margin-top: 15px;">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
@@ -179,10 +180,11 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<!--<span>{{ title }}</span>-->
<h3 style="display: inline-block;margin: 0">子计划:</h3>
<el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 10px" @click="addTable()">增加</el-button>
<el-table v-loading="loading2" :data="tableData2" size="mini" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
<el-table-column min-width="100px" label="组号" align="center">
<template slot-scope="scope">
<template v-if="scope.row.edit">
@@ -627,9 +629,38 @@ export default {
<style scoped>
.el-card {
margin-bottom: 15px;
border-color: #2e296a;
color: white;
margin-bottom: 5px;
background-color: #2e296a;
}
span{
margin: 10px 0 10px 10px;
}
.el-pagination{
background-color: white;
}
</style>
<style>
.bold-font .el-table{
font: bold 18px arial!important;
margin: 0 0 10px 0;
color: white;
}
.bold-font .el-table td{
background-color: #2e296a!important;
}
.bold-font .el-table th{
color: white;
background-color: #2e296a!important;
}
.bold-font .el-table div{
color: white;
background-color: #2e296a!important;
}
.bold-font{
color: ghostwhite;
font: bold 22px arial!important;
padding: 5px;
}
</style>

View File

@@ -539,15 +539,21 @@ export default {
</script>
<style scoped>
.el-card{
margin-bottom: 10px;
.el-pagination{
background-color: white;
}
.el-card {
border-color: #2e296a;
color: white;
margin-bottom: 5px;
background-color: #2e296a;
}
.word{
border: 1px solid #ebeef5;
margin-top: 0;
line-height: 60px;
/*height: 50px;*/
background-color: white;
background-color: #2e296a;
}
span{
margin: 10px 0 10px 10px;
@@ -559,12 +565,29 @@ export default {
color: red;
}
.black{
color: black;
color: white;
}
</style>
<style>
.bold-font .el-table{
font: bold 18px arial!important;
margin: 0 0 10px 0;
color: white;
}
.bold-font .el-table td{
background-color: #2e296a!important;
}
.bold-font .el-table th{
color: white;
background-color: #2e296a!important;
}
.bold-font .el-table div{
color: white;
background-color: #2e296a!important;
}
.bold-font{
color: ghostwhite;
font: bold 22px arial!important;
padding: 5px;
}
</style>

View File

@@ -28,9 +28,9 @@
<span style="float: right">销售经理</span>
<el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.省份 }}-->
<!--</template>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.省份 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="姓名" align="center">
<template slot-scope="scope">
@@ -500,9 +500,9 @@ export default {
this.deleteRow(deleteMarketingManager, row.营销经理地区流水号, a)
},
addMarketingManager() {
this.dialogFormVisible1 = true
this.title1 = '增加'
this.addForm('form1')
this.dialogFormVisible1 = true
this.title1 = '增加'
this.addForm('form1')
},
callOff1() {
this.dialogFormVisible1 = false