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

营销中心

Browse Source
This commit is contained in:
bryan sun
2019-11-11 17:46:21 +08:00
parent 9e38915e92
commit f20c1a3f3a
5 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/MarketingCenter/ComprehensiveInquiryMS.js
View File

@@ -31,14 +31,14 @@ export function SelectMarketingManager(code) {
} }
}) })
} }
export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '合同信息管理_合同信息_查询', name: '合同信息管理_合同信息_查询',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

4
src/api/MarketingCenter/ContractInformationManagement.js
View File

@@ -20,14 +20,14 @@ export function initMarketingManager() {
} }
}) })
} }
export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '合同信息管理_合同信息_查询', name: '合同信息管理_合同信息_查询',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string', param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&机床型号_check=' + num9 + '=int&机床型号=' + num10 + '=string&客户名称_check=' + num11 + '=int&客户名称=' + num12 + '=string',
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })

7
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
View File

@@ -1653,9 +1653,16 @@ export default {
} }
} }
.gongyizhiding { .gongyizhiding {
.el-tree-node{
overflow: hidden;
font-weight: bolder;
color: black;
}
.el-tree-node>.el-tree-node__children { .el-tree-node>.el-tree-node__children {
overflow: hidden; overflow: hidden;
background-color: #d8e5f6; background-color: #d8e5f6;
font-weight: bolder;
color: black;
} }
} }
</style> </style>

40
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -9,22 +9,23 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/> <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
<el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/> <!-- <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>-->
<el-date-picker <!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>-->
v-model="startTime" <!-- <el-date-picker-->
style="margin-right:5px;width:150px" <!-- v-model="startTime"-->
value-format="yyyy-MM-dd" <!-- style="margin-right:5px;width:150px"-->
size="small" <!-- value-format="yyyy-MM-dd"-->
type="date" <!-- size="small"-->
placeholder="请选择开始日期"/> <!-- type="date"-->
<el-date-picker <!-- placeholder="请选择开始日期"/>-->
v-model="endTime" <!-- <el-date-picker-->
style="width: 150px;" <!-- v-model="endTime"-->
value-format="yyyy-MM-dd" <!-- style="width: 150px;"-->
size="small" <!-- value-format="yyyy-MM-dd"-->
type="date" <!-- size="small"-->
placeholder="请选择结束日期"/> <!-- type="date"-->
<!-- placeholder="请选择结束日期"/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
@@ -121,7 +122,7 @@
{{ scope.row.电话 }} {{ scope.row.电话 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注" width="auto"> <el-table-column align="center" label="合同信息备注" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同信息备注 }} {{ scope.row.合同信息备注 }}
</template> </template>
@@ -645,6 +646,8 @@ export default {
}, },
data() { data() {
return { return {
customerName1: '',
customerName1_check: '',
tableDataLoadingDeliveryManagement: false, tableDataLoadingDeliveryManagement: false,
tableDataDeliveryManagement: [], tableDataDeliveryManagement: [],
dialogVisible: false, dialogVisible: false,
@@ -726,13 +729,14 @@ export default {
this.peoplename = row.姓名 this.peoplename = row.姓名
}, },
fetchTableData1() { fetchTableData1() {
if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 } if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 } if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 } if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 } if (this.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
this.listLoading = true this.listLoading = true
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading']) this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
this.tableDataInvoiceRecord = [] this.tableDataInvoiceRecord = []
this.tableDataContractCapitalManagement = [] this.tableDataContractCapitalManagement = []
this.tableDataSafetyMargin = [] this.tableDataSafetyMargin = []

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

@@ -2,29 +2,30 @@
<div class="app-container"> <div class="app-container">
<el-card style="background: rgb(233,240,250)"> <el-card style="background: rgb(233,240,250)">
<div> <div>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;"> <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px 10px;">
<el-option <el-option
v-for="item in entryName" v-for="item in entryName"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/> <!-- <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>-->
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/> <el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
<el-date-picker <!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>-->
v-model="startTime" <!-- <el-date-picker-->
style="width: 150px;" <!-- v-model="startTime"-->
value-format="yyyy-MM-dd" <!-- style="width: 150px;"-->
size="small" <!-- value-format="yyyy-MM-dd"-->
type="date" <!-- size="small"-->
placeholder="请选择开始日期"/> <!-- type="date"-->
<el-date-picker <!-- placeholder="请选择开始日期"/>-->
v-model="endTime" <!-- <el-date-picker-->
style="width: 150px;margin-bottom: 3px;" <!-- v-model="endTime"-->
value-format="yyyy-MM-dd" <!-- style="width: 150px;margin-bottom: 3px;"-->
size="small" <!-- value-format="yyyy-MM-dd"-->
type="date" <!-- size="small"-->
placeholder="请选择结束日期"/> <!-- type="date"-->
<!-- placeholder="请选择结束日期"/>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button> <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
</div> </div>
@@ -117,7 +118,7 @@
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="付款方式" width="70"> <el-table-column align="center" label="付款方式" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.付款方式 }} {{ scope.row.付款方式 }}
</template> </template>
@@ -162,7 +163,7 @@
{{ scope.row.电话 }} {{ scope.row.电话 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注" > <el-table-column align="center" label="合同信息备注" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同信息备注 }} {{ scope.row.合同信息备注 }}
</template> </template>
@@ -569,6 +570,8 @@ export default {
}, },
data() { data() {
return { return {
customerName1: '',
customerName1_check: '',
machineDATA: '', machineDATA: '',
name: '', name: '',
a: 1, a: 1,
@@ -748,6 +751,7 @@ export default {
this.peoplename = '' this.peoplename = ''
}, },
fetchTableData1() { fetchTableData1() {
if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }
if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 } if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 } if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }
if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
@@ -757,7 +761,7 @@ export default {
this.uploader = false this.uploader = false
this.ExecutionProgress = null this.ExecutionProgress = null
this.listLoading = true this.listLoading = true
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading']) this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
}, },
fetchExecutionProgressdata(row) { fetchExecutionProgressdata(row) {
this.projectNum = row.项目流水号 this.projectNum = row.项目流水号