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

更新

Browse Source
This commit is contained in:
liushuai
2020-03-10 18:07:49 +08:00
parent 443f8e1ee2
commit 1176ebff24
19 changed files with 1208 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -58,11 +58,11 @@
border
stripe
size="mini">
<el-table-column align="center" label="投标结果" prop="投标结果" width="190">
<el-table-column align="center" label="投标结果" prop="投标结果" width="160">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
<el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
<el-radio :disabled="scope.row.是否禁用未中标" label="2">未中标</el-radio>
<el-radio :disabled="scope.row.是否禁用已中标" label="1">中标</el-radio>
<el-radio :disabled="scope.row.是否禁用未中标" label="2">未中</el-radio>
</el-radio-group>
</template>
</el-table-column>
@@ -106,14 +106,14 @@
{{ Number(scope.row.转履约保证金金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="应收回(万元)" width="80">
<template slot-scope="scope">
{{ Number(scope.row.应收回金额).toFixed(2) }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="应收回(万元)" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ Number(scope.row.应收回金额).toFixed(2) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="已收回(万元)" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ Number(scope.row.应收回金额).toFixed(2) }}</span>
<span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</span>
<span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
</template>
</el-table-column>
@@ -167,7 +167,7 @@
<el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top" style="margin-left: 0px">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用||Number(scope.row.未收金额) ===0"
:disabled="scope.row.是否禁用"
size="mini"
type="text"
icon="el-icon-money"
@@ -390,10 +390,11 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
prop="投标结果公布日期"
placeholder="请选择结果公布日期"/>
</el-form-item>
<el-form-item label="中标服务费(万元)" prop="中标服务费">
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" style="width: 200px" size="small"/>
<el-form-item v-if="!tenderResultDisabled" label="中标服务费(万元)" prop="中标服务费">
<el-input-number v-model="Timeform.中标服务费" :precision="2" :min="0.00" style="width: 200px" size="small"/>
<!--:max="tenderResultMax"-->
</el-form-item>
</el-form>
@@ -419,21 +420,21 @@
</el-col>
</el-row>
<el-row>
<el-form-item label="转履约金额(万元)" prop="保证金金额">
<el-form-item label="保证金金额(万元)" prop="保证金金额">
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" :max="PerformanceBondform.保证金金额max" style="width: 200px" size="small"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="保证金类型" prop="保证金类型">
<el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
<el-option
v-for="item in TypeOfGoldDeposit1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-row>
<!-- <el-row>-->
<!-- <el-form-item label="保证金类型" prop="保证金类型">-->
<!-- <el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">-->
<!-- <el-option-->
<!-- v-for="item in TypeOfGoldDeposit1"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-row>-->
<el-row>
<el-form-item label="收回条件" prop="收回条件">
<el-select v-model="PerformanceBondform.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
@@ -565,7 +566,7 @@ export default {
回收金额: 0
},
Timeform: {
投标结果公布日期: '',
投标结果公布日期: getNowShotTime(),
中标服务费: ''
},
PerformanceBondform: {
@@ -609,7 +610,7 @@ export default {
保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }, { required: true, trigger: 'change', validator: validateValue }],
保证金类型: [{ required: true, message: '请输入保证金类型', trigger: 'change' }],
投标人: [{ required: true, message: '请输入投标人', trigger: 'change' }],
投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
// 投标日期: [{ required: true, message: '请选择收回日期', trigger: 'change' }],
计划收回日期: [{ required: true, message: '请选择计划收回日期', trigger: 'change' }],
提前X天提醒我: [{ required: true, message: '提前X天提醒我', trigger: 'blur' }]
}
@@ -677,8 +678,8 @@ export default {
}
if (val.length !== 0) {
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保证金备注']
const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '备注']
const tHeader = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额(万元)', '缴纳时间', '投标人', '中标服务费(万元)', '转履约保证金(万元)', '应收(万元)', '已收(万元)', '未收(万元)', '保金类型', '联系人', '联系电话', '保证金备注']
const filterVal = ['投标结果', '公布日期', '招标企业', '项目名称', '保证金金额', '投标日期', '投标人', '中标服务费', '转履约保证金金额', '应收回金额', '产品品种代码', '未收金额', '保证金类型', '联系人', '联系电话', '备注']
const list = val.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
@@ -917,6 +918,7 @@ export default {
if (row.投标结果 === '1') {
this.radio = '1'
this.dialogTimeVisible = true
// this.Timeform.投标结果公布日期 = getNowShotTime()
this.tenderResultDisabled = false
} else if (row.投标结果 === '2') {
this.radio = '2'
@@ -928,14 +930,18 @@ export default {
this.dialogTimeVisible = false
this.fetchTableData1()
},
submitTime() {
winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => {
if (response.data[0].result === '1') {
this.fetchTableData1()
this.dialogTimeVisible = false
this.$message.success('操作成功')
} else {
this.$message.error('操作失败')
submitTime(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
winningBid(this.code, this.radio, this.Timeform.投标结果公布日期, this.Timeform.中标服务费).then(response => {
if (response.data[0].result === '1') {
this.fetchTableData1()
this.dialogTimeVisible = false
this.$message.success('操作成功')
} else {
this.$message.error('操作失败')
}
})
}
})
},

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

@@ -10,18 +10,30 @@
:value="item.value"/>
</el-select>
<el-input v-model="customerName1" clearable size="small" style="width:200px;margin: 0px 10px" placeholder="合同编号或客户名称" @keyup.enter.native="PageSize = 30;PageCurrent = 1;fetchTableData1()"/>
<el-date-picker
v-model="dateRange"
:picker-options="pickerOptions"
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-col :span="17.8">
<el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px;width: 985px" height="580" border size="mini" @row-click="selectMachine">
<el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
<el-col :span="16.5">
<el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px;width: 935px" height="580" border size="mini" @row-click="selectMachine">
<el-table-column align="center" label="项目名称" prop="项目名称" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="150" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -80,23 +92,33 @@
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="6.3">
<el-col :span="6.5">
<el-table :data="tableData2" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" class="subTableHeader" border style="text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="100" show-overflow-tooltip>
<el-table-column label="机床图号" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" min-width="180" show-overflow-tooltip>
<el-table-column label="机床名称" align="center" width="140" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="设备状态" align="center" width="80">
<el-table-column label="数量" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="进程" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.机床状态 }}
</template>
</el-table-column>
<el-table-column label="发货时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.发出时间.split(' ')[2] + '/' + scope.row.发出时间.split(' ')[0] + '/' + scope.row.发出时间.split(' ')[1] }}
</template>
</el-table-column>
</el-table>
</el-col>
</el-card>
@@ -613,6 +635,34 @@ export default {
},
data() {
return {
dateRange: '',
pickerOptions: {
shortcuts: [{
text: '上季度',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3)
picker.$emit('pick', [start, end])
}
}, {
text: '过去半年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2)
picker.$emit('pick', [start, end])
}
}, {
text: '过去一年',
onClick(picker) {
const end = new Date()
const start = new Date()
start.setTime(end.getTime() - 3600 * 1000 * 24 * 365)
picker.$emit('pick', [start, end])
}
}]
},
customerName1: '',
customerName1_check: '',
tableDataLoadingDeliveryManagement: false,
@@ -696,6 +746,9 @@ export default {
this.peoplename = row.姓名
},
fetchTableData1() {
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
this.startTime = this.dateRange[0] ? this.dateRange[0] : null
this.endTime = this.dateRange[1] ? this.dateRange[1] : null
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.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 }

2
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -382,7 +382,7 @@ export default {
return prev
}
}, 0)
sums[index] = sums[index].toFixed(2) + ' 元'
sums[index] = sums[index].toFixed(2) + ' 万元'
} else {
sums[index] = '0'
}

10
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -286,11 +286,11 @@
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-form-item label="客户名称" prop="客户名称">
<el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
<el-input v-model="form.客户名称" class="num" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
</el-form-item>
<el-form-item label="开票金额(万元)" prop="开票金额">
<el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
<el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px" @blur="checkNumber()" />
</el-form-item>
<el-form-item label="开票时间" prop="开票时间">
<el-date-picker
@@ -492,6 +492,10 @@ export default {
this.fetchTableData1()
},
methods: {
checkNumber() {
// content.withdrawAmount = (withdrawAmount.match(/^\d*(\.?\d{0,2})/g)[0]) || null
this.form.开票金额 = Number(this.form.开票金额).toFixed(2)
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
@@ -625,7 +629,7 @@ export default {
return prev
}
}, 0)
sums[index] = sums[index].toFixed(2) + ' 元'
sums[index] = sums[index].toFixed(2) + ' 万元'
} else {
sums[index] = '0'
}