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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-03-16 17:58:33 +08:00
parent 325f8deb57 35cd5c3966
commit a588a6d9e6
13 changed files with 90 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
:expand-row-keys="expands"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
highlight-current-row
style="margin: 3px 0px;width: 1208px"
style="margin: 3px 0px;width: 1218px"
height="700"
border
stripe
@@ -124,7 +124,7 @@
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<el-table-column align="center" label="发货节点" width="80">
<el-table-column align="center" label="发货节点" width="90">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
@@ -680,14 +680,12 @@ export default {
this.fetchData()
this.fetchTableData1()
this.fetchCustomerData()
console.log(this.$toTop(), 222)
},
methods: {
// 2020 02 18 刘路加 增加
fun() {
this.form.contractAmount = Number(this.form.contractAmount).toFixed(2)
},
searchName() { // 模糊查询姓名
this.tableData3 = []
SelectMarketingManager().then(response => {
@@ -767,7 +765,12 @@ export default {
this.uploader = false
this.ExecutionProgress = null
this.listLoading = true
this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.machine_check, this.machine, this.customerName1_check, this.customerName1).then(response => {
console.log(response.data)
this.listLoading = false
this.total = parseInt(response.data.output[0].ItemCount)
this.tableData1 = response.data.result
})
},
exportExcel() {
if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 }

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

@@ -50,30 +50,20 @@
<el-row>
<el-col style="width: 680px">
<el-card>
<el-table
v-loading="listLoading"
:data="tableData1"
:row-key="getRowKeys"
:expand-row-keys="expands"
style="width: 100%"
height="700"
border
stripe
size="mini"
@row-click="selectMachine">
<el-table-column align="center" label="合同编号" prop="合同编号" width="130px">
<el-table v-loading="listLoading" :data="tableData1" :row-key="getRowKeys" :expand-row-keys="expands" style="width: 100%" height="700" border stripe size="mini" @row-click="selectMachine">
<el-table-column align="center" label="合同编号" prop="合同编号" width="120px">
<template slot-scope="scope">
<template>
{{ scope.row.合同编号 }}
</template>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="140px" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="130px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="100px">
<el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="120px">
<template slot-scope="scope">
{{ scope.row.合同签订日期.substring(0,10) }}
</template>
@@ -85,24 +75,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="130px">
<template slot-scope="scope">
<el-button
style="margin-left: 5px"
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-button
style="margin-left: 5px"
size="mini"
type="text"
icon="el-icon-edit"
@click.stop="handleEdit(scope.row)"/>
<el-button
style="margin-left: 5px;margin-right: 5px"
size="mini"
type="text"
icon="el-icon-delete"
@click.stop="handleDelete(scope.row)"/>
<el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-circle-plus-outline" @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-edit" @click.stop="handleEdit(scope.row)"/>
<el-button style="margin-left: 5px;margin-right: 5px" size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -139,18 +114,8 @@
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template slot-scope="scope">
<el-button
style="margin-left: 5px"
size="mini"
type="text"
icon="el-icon-edit"
@click="editMachine(scope.row);flag = 2"/>
<el-button
style="margin-left: 5px"
size="mini"
type="text"
icon="el-icon-delete"
@click="deleteMachine(scope.row)"/>
<el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-edit" @click="editMachine(scope.row);flag = 2"/>
<el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-delete" @click="deleteMachine(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -304,7 +269,7 @@ export default {
param[2] = ['日期_check', this.time_check]
param[3] = ['开始日期', this.startTime]
param[4] = ['结束日期', this.endTime]
var Data = this.CreateData('04', '报表_自家项目报表_查询', param)
var Data = this.CreateData('2001', '报表_自家项目报表_查询', param)
this.exportExcel_NPOI(Data)
},
init() {

1
src/views/MarketingCenter/MarginManagement/index.vue
View File

@@ -29,7 +29,6 @@ export default {
}
},
methods: {
handleClick(tab) {
this.handle = tab.name
}

32
src/views/MarketingCenter/ShippingInquiries/index.vue
View File

@@ -194,42 +194,10 @@ export default {
}))
},
exportExcel() {
this.tableDataSearchList = []
this.invoiceNumber !== null && this.invoiceNumber !== '' ? this.invoiceNumber_check = 1 : this.invoiceNumber_check = 0
this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
InvoiceListSearch_Excel(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check, this.check1, this.dateRange[0], this.dateRange[1]).then(val => {
console.log(val)
// for (let i = 0; i < val.data.length; i++) {
// // if (val.data[i].投标结果 !== '' && val.data[i].交付日期 !== null) {
// // val.data[i].交付日期 = val.data[i].交付日期.substring(0, val.data[i].交付日期.length - 8)
// // }
// if (val.data[i].投标结果 === 0) {
// val.data[i].投标结果 = ''
// } else if (val.data[i].投标结果 === 1) {
// val.data[i].投标结果 = '已中标'
// } else if (val.data[i].投标结果 === 2) {
// val.data[i].投标结果 = '未中标'
// }
// if (val.data[i].公布日期 !== '' && val.data[i].公布日期 !== null) {
// val.data[i].公布日期 = val.data[i].公布日期.substring(0, val.data[i].公布日期.length - 8)
// }
// if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
// val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
// }
// // if (val.data[i].投标日期 !== '' && val.data[i].投标日期 !== null) {
// // val.data[i].投标日期 = val.data[i].投标日期.substring(0, val.data[i].投标日期.length - 8)
// // }
// if (parseInt(val.data[i].是否收回) !== 2) {
// val.data[i].应收回金额 = '未收回'
// } else {
// val.data[i].应收回金额 = (val.data[i].应收回金额).toFixed(2)
// }
// val.data[i].保证金金额 = (val.data[i].保证金金额).toFixed(2)
// val.data[i].中标服务费 = (val.data[i].中标服务费).toFixed(2)
// val.data[i].未收金额 = (val.data[i].未收金额).toFixed(2)
// val.data[i].转履约保证金金额 = (val.data[i].转履约保证金金额).toFixed(2)
// }
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['状态', '发货单号', '收货单位', '收货人', '联系电话', '收货地址', '发货日期', '车辆牌号', '司机姓名', '司机电话', '货品类别', '货品编号', '货品名称', '货品规格', '货品型号', '数量', '设计者']