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

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -1,9 +1,16 @@
<template>
<div class="app-container">
<<<<<<< HEAD
<el-card style="background: rgb(233,240,250)">
<div>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px;">
=======
<el-card>
<div>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
@@ -12,10 +19,17 @@
</el-select>
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<<<<<<< HEAD
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 10px">
=======
<span style="margin-left: 10px">销售经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span style="margin-top: 20px">开始日期：</span>
<el-date-picker
v-model="startTime"
@@ -27,7 +41,11 @@
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
<<<<<<< HEAD
style="width: 200px;margin-bottom: 3px;"
=======
style="width: 200px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -42,6 +60,7 @@
:data="tableData1"
:row-key="getRowKeys"
:expand-row-keys="expands"
<<<<<<< HEAD
highlight-current-row
style="width: 100%;margin: 3px 0px"
height="500"
@@ -54,11 +73,27 @@
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border stripe style="width: 482px; text-align: center">
<el-table-column label="设备型号" align="center" width="140">
=======
style="width: 100%"
height="460"
border
size="mini"
@row-click="fetchExecutionProgressdata"
@expand-change="selectMachine">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 571px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="130">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="设备名称" align="center" width="160" show-overflow-tooltip>
=======
<el-table-column label="设备名称" align="center" width="160">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -68,6 +103,7 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" width="100" align="center">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -96,85 +132,166 @@
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="130">
=======
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click="editMachine(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="deleteMachine(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<template>
<el-popover
placement="right"
<<<<<<< HEAD
width="200"
trigger="hover">
<div v-show="!scope.row.招标企业" style="text-align: center">
<h4 style="margin: 5px 0">未缴纳投标保证金</h4>
=======
title="投标保证金情况"
width="300"
trigger="hover">
<div v-show="!scope.row.招标企业" style="text-align: center">
<h4>未缴纳投标保证金</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</div>
<div v-show="scope.row.招标企业">
<h4>招标企业： {{ scope.row.招标企业 }}</h4>
<h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
<h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
</div>
<<<<<<< HEAD
<el-tag slot="reference" size="small">{{ scope.row.合同编号 }}</el-tag>
=======
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-popover>
</template>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="190" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称" width="260">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目名称" width="140" show-overflow-tooltip>
=======
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="付款方式" width="70">
=======
<el-table-column align="center" label="付款方式" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同签订日期" width="100">
=======
<el-table-column align="center" label="合同签订日期" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="图纸会签节点" width="100">
=======
<el-table-column align="center" label="图纸会签节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.图纸会签节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="设备预验收节点" width="110">
=======
<el-table-column align="center" label="设备预验收节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.设备预验收节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="发货节点" width="85">
=======
<el-table-column align="center" label="发货节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.发货节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="安装调试节点" width="100">
=======
<el-table-column align="center" label="安装调试节点" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.安装调试节点 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="销售经理" width="85">
=======
<el-table-column align="center" label="销售经理" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系人" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" >
=======
<el-table-column align="center" label="合同信息备注" width="250">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-button
@@ -206,12 +323,38 @@
</el-table-column>
</el-table>
<div class="block" >
=======
<el-table-column label="操作" fixed="right" align="center" width="300">
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click.stop="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize"
:total="total"
<<<<<<< HEAD
style="margin-bottom: 3px;"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
@@ -219,7 +362,11 @@
</el-card>
<el-card v-show="ExecutionProgressShow">
<div>
<<<<<<< HEAD
<h4 style="display: inline-block;margin: 3px;">项目进度</h4>
=======
<h4 style="display: inline-block">项目进度</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div style="display: inline-block; float:right">
<span>已完成进度：</span>
<el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
@@ -246,7 +393,11 @@
</div>
</el-card>
<el-card v-show="uploader" style="min-height: 145px;">
<<<<<<< HEAD
<h4 style="margin: 3px;">纪要文件</h4>
=======
<h4>纪要文件</h4>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<div style="float: right;">
<el-upload
:action="action"
@@ -256,7 +407,11 @@
:file-list="fileList"
class="upload-demo"
multiple>
<<<<<<< HEAD
<el-button size="small" type="primary" plain icon="el-icon-upload2">点击上传</el-button>
=======
<el-button size="small" type="primary">点击上传</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-upload>
</div>
<div v-for="(file, key) in hadFile" :key="key">
@@ -277,7 +432,11 @@
</div>
</el-card>
<!--新增合同信息对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
=======
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -302,7 +461,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<<<<<<< HEAD
<el-form-item label="营销经理" prop="MarketingManagerValue">
=======
<el-form-item label="销售经理" prop="MarketingManagerValue">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-form-item>
</el-col>
@@ -391,7 +554,11 @@
</el-dialog>
<!--新增机床对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
=======
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -410,10 +577,17 @@
</el-dialog>
<!--营销经理选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>
=======
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" @click="searchName">查询</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
@@ -423,7 +597,11 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<<<<<<< HEAD
<el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
=======
<el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -443,7 +621,11 @@
</el-dialog>
<!--投标保证金选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
=======
<el-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>招标企业：</span>
<el-input v-model="enterprise" size="small" style="width:200px" clearable/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
@@ -454,7 +636,10 @@
style="width: 100%"
height="400"
border
<<<<<<< HEAD
stripe
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
size="mini"
@row-click="biddingNum">
<el-table-column align="center" label="招标企业" width="300">
@@ -509,7 +694,11 @@
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<<<<<<< HEAD
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
=======
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" size="mini" @row-click="handleCustomerChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="省份" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.省份 }}
@@ -536,7 +725,10 @@
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize1"
:total="total1"
<<<<<<< HEAD
style="margin-top: 10px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@@ -547,7 +739,11 @@
</el-dialog>
<!--改变节点时间对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
=======
<el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
<el-form-item label="进度完成日期" prop="进度完成日期">
<el-date-picker
@@ -922,7 +1118,11 @@ export default {
this.addForm('form')
this.dialogFormVisible1 = true
this.temp = 1
<<<<<<< HEAD
this.title = '新增合同'
=======
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.disabled = false
this.biddingNumber = ''
this.tableDataBidding = []
@@ -962,7 +1162,11 @@ export default {
},
handleEdit(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑合同'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.form.contractSigningDate = row.合同签订日期
this.form.contractNumber = row.合同编号
@@ -1120,13 +1324,21 @@ export default {
addMachine(row) {
this.projectNum = row.项目流水号
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '新增机床'
=======
this.title1 = '新增'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.addForm('form1')
},
editMachine(row) {
this.editForm(row, 'form1')
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '编辑机床'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.c = row.机床流水号
this.form1.设备型号 = row.机床图号
this.form1.设备名称 = row.机床名称
@@ -1278,9 +1490,15 @@ export default {
}
}
</script>
<<<<<<< HEAD
<style scoped>
.el-table--scrollable-y .el-table__body-wrapper {overflow: hidden !important}
.el-table--scrollable-x .el-table__body-wrapper {overflow: hidden !important}
=======
<style scoped>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
.el-date-editor{
width:200px;
}
@@ -1312,7 +1530,11 @@ export default {
}
.delete:hover{
background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
<<<<<<< HEAD
color: #ff0511;
=======
color: #fff;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
a{
text-decoration: none;
@@ -1338,6 +1560,7 @@ a{
border: 1px solid black!important;
}
</style>
<<<<<<< HEAD
<style lang="scss">
.subTableHeader {
th {
@@ -1354,3 +1577,5 @@ a{
}
}
</style>
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d