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

刘璐珈噶东

Browse Source
This commit is contained in:
Vergil
2020-02-24 09:32:44 +08:00
parent b3513a9a3d
commit 6c08cd2ea8
19 changed files with 1217 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ export function initMarketingManager() {
}
})
}
export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
export function searchTable1(pageCurrent, pageSize, num1, num2, num3, check1, starttime, endtime, ordername, order) {
return request({
url: '',
method: 'post',
@@ -35,7 +35,7 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
ModularID: router.currentRoute.path,
type: '1',
name: '合同资金管理_资金信息_查询1',
param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string',
param: '客户名称=' + num3 + '=string' + '&时间_check=' + check1 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
Pagination: pageCurrent + '&' + pageSize
}
})

33
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -12,17 +12,17 @@
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
<el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
<el-button type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left:0px" @click="edit2()">外购备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
<el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">分配自家备料</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>
<el-button type="distribution" size="small" icon="el-icon-setting" style="margin-left:10px" @click="edit('BL')">自家备料</el-button>
</el-tooltip>
<!--<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">-->
<!--<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>-->
<!--</el-tooltip>-->
<!--<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">-->
<!--<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>-->
<!--</el-tooltip>-->
</el-row>
</el-card>
</div>
@@ -44,14 +44,16 @@
@selection-change="handleSelectionChange">
<!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
<el-table-column
:selectable="checkboxT"
type="selection"
width="50"
align="center"/>
<el-table-column label="进程" prop="备料分配" align="center" width="70">
<el-table-column label="进程" prop="备料分配" align="center" width="70" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
<span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
<span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='1'" type="warning" size="mini">自家&外购</span>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="140px" sortable="custom" show-overflow-tooltip>
@@ -75,12 +77,12 @@
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="重量" align="center" width="60" >
<el-table-column label="重量(KG)" align="center" width="80" >
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="工艺要求" align="center" width="180" show-overflow-tooltip>
<el-table-column label="工艺要求" align="center" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
@@ -170,6 +172,15 @@ export default {
this.searchTable()
},
methods: {
// 复选框
checkboxT(row, rowIndex) {
if (row.备料打印 === '0' && row.是否外购备料 === '0') {
// if(row.lie =='1'){
return true// 禁用
} else {
return false// 不禁用
}
},
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '零件名称') {

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

@@ -3,6 +3,19 @@
<!--顶栏结构-->
<el-card>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
<span style="font-size: 13px;margin-left: 10px">签订日期</span>
<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-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">-->
<!-- <el-option-->
<!-- v-for="item in TypeOfGoldDeposit"-->
@@ -26,7 +39,7 @@
<!-- type="date"-->
<!-- 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-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">保证金</el-button>
</el-card>
<!--投标保证金表格-->
@@ -40,7 +53,7 @@
border
stripe
size="mini">
<el-table-column align="center" label="投标结果" prop="投标结果" width="200">
<el-table-column align="center" label="投标结果" prop="投标结果" width="190">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
<el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -48,17 +61,17 @@
</el-radio-group>
</template>
</el-table-column>
<el-table-column align="center" label="公布日期" width="90">
<el-table-column align="center" label="公布日期" width="86">
<template slot-scope="scope">
{{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
</template>
</el-table-column>
<el-table-column align="center" label="招标企业" prop="招标企业" width="180">
<el-table-column align="center" label="招标企业" prop="招标企业" width="140" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.招标企业 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="100">
<el-table-column align="center" label="联系人" width="80">R
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
@@ -68,58 +81,63 @@
{{ scope.row.联系电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="保证金金额" width="100">
<el-table-column align="center" label="保证金金额(万元)" width="100">
<template slot-scope="scope">
<span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="中标服务费" width="100">
<el-table-column align="center" label="中标服务费(万元)" width="100">
<template slot-scope="scope">
{{ Number(scope.row.中标服务费).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="转履约保证金金额" width="140">
<el-table-column align="center" label="转履约保证金(万元)" width="120">
<template slot-scope="scope">
{{ Number(scope.row.转履约保证金金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="应收回金额" width="100">
<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="100">
<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">{{ scope.row.应收回金额 }}</span>
<span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
</template>
</el-table-column>
<el-table-column align="center" label="投标人" prop="投标人" width="100">
<el-table-column align="center" label="未收金额(万元)" width="90">
<template slot-scope="scope">
{{ Number(scope.row.未收金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="投标人" prop="投标人" width="80">
<template slot-scope="scope">
{{ scope.row.投标人 }}
</template>
</el-table-column>
<el-table-column align="center" label="保金类型" width="150">
<el-table-column align="center" label="保金类型" width="80">
<template slot-scope="scope">
{{ scope.row.保证金类型 }}
</template>
</el-table-column>
<el-table-column align="center" label="投标日期" width="150">
<el-table-column align="center" label="投标日期" width="86">
<template slot-scope="scope">
{{ scope.row.投标日期.substring(0, scope.row.投标日期.length - 8) }}
</template>
</el-table-column>
<el-table-column align="center" label="计划收回日期" width="150">
<el-table-column align="center" label="计划收回日期" width="86">
<template slot-scope="scope">
{{ !scope.row.预计收回日期 ? '结果未公布' : scope.row.预计收回日期.substring(0, scope.row.预计收回日期.length - 8) }}
</template>
</el-table-column>
<el-table-column align="center" label="实际收回日期" width="150">
<el-table-column align="center" label="实际收回日期" width="86">
<template slot-scope="scope">
{{ !scope.row.实际收回日期 ? '未收回' : scope.row.实际收回日期.substring(0, scope.row.实际收回日期.length - 8) }}
</template>
</el-table-column>
<el-table-column align="center" label="状态" width="120">
<el-table-column align="center" label="状态" width="80">
<template slot-scope="scope">
<el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="mini" style="width: 66px">未公布</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="mini" style="width: 66px">已收回</el-tag>
@@ -128,20 +146,21 @@
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<el-table-column align="center" label="备注" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="320">
<el-table-column label="操作" fixed="right" align="center" width="220">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top">
<el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top" style="margin-left: 0px">
<div style="display: inline-block">
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="text"
icon="el-icon-money"
style="margin-left: 0px"
@click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
</div>
</el-tooltip>
@@ -151,7 +170,7 @@
:disabled="scope.row.是否禁用履约"
size="mini"
type="text"
style="margin-left: 20px"
style="margin-left: 8px"
icon="el-icon-stopwatch"
@click.stop="ComplianceGold(scope.row)">转入履约金</el-button>
</div>
@@ -162,9 +181,9 @@
:disabled="scope.row.是否禁用编辑"
size="mini"
type="text"
style="margin-left: 20px"
style="margin-left: 8px"
icon="el-icon-edit-outline"
@click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
@click.stop="editBidBond(scope.row);flag1 = 3"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
@@ -173,9 +192,9 @@
:disabled="scope.row.是否禁用删除"
size="mini"
type="text"
style="margin-left: 20px"
style="margin-left: 8px"
icon="el-icon-delete"
@click.stop="delBidBond(scope.row)">删除</el-button>
@click.stop="delBidBond(scope.row)"/>
</div>
</el-tooltip>
</template>
@@ -193,7 +212,7 @@
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="销售经理" center width="400px">
<div style="height: 420px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree
@@ -206,41 +225,43 @@
@node-click="handleNodeClick"
/>
</div>
<el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange" >
<el-table-column label="考勤编号" align="center" >
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 100px;float: left;margin-left: 30px" @row-click="handleChange" >
<!--<el-table-column label="考勤编号" align="center" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.考勤编号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="姓名" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="性别" align="center">
<template slot-scope="scope">
{{ scope.row.性别 }}
</template>
</el-table-column>
<el-table-column label="工作岗位" align="center">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
<!--<el-table-column label="性别" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.性别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="工作岗位" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.岗位名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
</div>
<el-button style="margin-left: 260px" @click="offName">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
<el-button size="small" style="margin-left: 90px" icon="el-icon-circle-close" @click="offName">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName">确认</el-button>
<!--<el-button style="margin-left: 260px" @click="offName">取消</el-button>-->
<!--<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>-->
</el-dialog>
<!--收回投标保证金-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="40%">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="320px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="实际收回日期" prop="收回日期">
<el-date-picker
v-model="form1.收回日期"
:picker-options="pickerOptions"
style="width: 200px;"
style="width: 160px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -248,14 +269,16 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form1')">取消</el-button>
<el-button type="primary" @click="submit('form1')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form1')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form1')">确 定</el-button>
<!--<el-button @click="callOff('form1')">取消</el-button>-->
<!--<el-button type="primary" @click="submit('form1')">确 定</el-button>-->
</div>
</el-dialog>
<!--投标保证金对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="750px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="招标企业" prop="招标企业">
@@ -275,8 +298,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
<el-form-item label="保证金金额(万元)" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
</el-row>
@@ -298,35 +321,35 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="投标日期" prop="投标日期">
<el-date-picker
v-model="form2.投标日期"
style="width: 200px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="投标日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公布后X天收回" prop="提前X天提醒我">
<el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
<!--<el-row>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="计划收回日期" prop="计划收回日期">-->
<!--<el-form-item label="投标日期" prop="投标日期">-->
<!--<el-date-picker-->
<!--v-model="form2.计划收回日期"-->
<!--v-model="form2.投标日期"-->
<!--style="width: 200px;"-->
<!--value-format="yyyy-MM-dd"-->
<!--size="small"-->
<!--type="date"-->
<!--placeholder="收回日期"/>-->
<!--placeholder="投标日期"/>-->
<!--</el-form-item>-->
<!--</el-col>-->
</el-row>
<!--<el-col :span="12">-->
<!--<el-form-item label="公布后X天收回" prop="提前X天提醒我">-->
<!--<el-input-number v-model="form2.提前X天提醒我" :step="1" style="width: 200px" size="small"/>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--&lt;!&ndash;<el-col :span="12">&ndash;&gt;-->
<!--&lt;!&ndash;<el-form-item label="计划收回日期" prop="计划收回日期">&ndash;&gt;-->
<!--&lt;!&ndash;<el-date-picker&ndash;&gt;-->
<!--&lt;!&ndash;v-model="form2.计划收回日期"&ndash;&gt;-->
<!--&lt;!&ndash;style="width: 200px;"&ndash;&gt;-->
<!--&lt;!&ndash;value-format="yyyy-MM-dd"&ndash;&gt;-->
<!--&lt;!&ndash;size="small"&ndash;&gt;-->
<!--&lt;!&ndash;type="date"&ndash;&gt;-->
<!--&lt;!&ndash;placeholder="收回日期"/>&ndash;&gt;-->
<!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
<!--&lt;!&ndash;</el-col>&ndash;&gt;-->
<!--</el-row>-->
<el-row>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
@@ -336,14 +359,14 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form2')">取消</el-button>
<el-button type="primary" @click="submit('form2')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form2')">确 定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="23%">
<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-form ref="Timeform" :model="Timeform" :rules="TimeRules" label-width="150px">
<el-form-item label="投标结果公布日期" prop="投标结果公布日期">
<el-form-item label="公布日期" prop="投标结果公布日期">
<el-date-picker
v-model="Timeform.投标结果公布日期"
style="width: 200px;"
@@ -352,22 +375,22 @@
type="date"
placeholder="请选择结果公布日期"/>
</el-form-item>
<el-form-item label="中标服务费" prop="中标服务费">
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :step="1" :max="tenderResultMax" style="width: 200px" size="small"/>
<el-form-item label="中标服务费(万元)" prop="中标服务费">
<el-input-number :disabled="tenderResultDisabled" v-model="Timeform.中标服务费" :precision="2" :min="0.00" :max="tenderResultMax" style="width: 200px" size="small"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOffTime('Timeform')">取消</el-button>
<el-button type="primary" @click="submitTime('Timeform')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOffTime('Timeform')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('Timeform')">确 定</el-button>
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="80%">
<el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-dialog v-el-drag-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="400px">
<el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="项目名称">
<el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 560px" size="small">
<el-select v-model="PerformanceBondform.项目名称" filterable clearable placeholder="请选择项目名称" style="width: 200px" size="small">
<el-option
v-for="item in entryName"
:key="item.value"
@@ -378,12 +401,11 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" style="width: 200px" size="small"/>
<el-form-item label="保证金金额(万元)" prop="保证金金额">
<el-input-number v-model="PerformanceBondform.保证金金额" :precision="2" :step="1" :min="0" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-form-item label="保证金类型" prop="保证金类型">
<el-select v-model="PerformanceBondform.保证金类型" filterable placeholder="请选择保证金类型" style="width: 200px" size="small">
<el-option
@@ -393,10 +415,8 @@
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="收回条件" prop="收回条件">
<el-select v-model="PerformanceBondform.收回条件" filterable placeholder="请选择收回条件" style="width: 200px" size="small">
<el-option
@@ -406,17 +426,16 @@
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-form-item label="截止时间(天)" prop="截止时间">
<el-input-number v-model="PerformanceBondform.截止时间" placeholder="请输入截止时间" style="width: 200px" size="small"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
<el-button type="primary" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondform('PerformanceBondform')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondform('PerformanceBondform')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -430,8 +449,56 @@ export default {
elInput
},
data() {
const validateValue = (rule, value, callback) => {
console.log(value, 2222)
if (value === 0.00) {
callback(new Error('金额不能为0'))
} else if (value) {
// const reg = /^\-\d\.?\d*$/
// const boolean = reg.test(value)
const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
console.log(boolean)
if (!boolean) {
callback(new Error('请输入正数'))
this.form.contractAmount = ''
} else {
console.log(2222)
callback()
}
} else {
callback()
}
}
return {
pickerOptions: {},
dateRange: '',
check1: '',
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])
}
}]
},
timetime: '',
treeData: [7],
entryName: [],
@@ -462,7 +529,7 @@ export default {
time: [], // 时间区间
radio: '',
tableData1: [],
tenderResultMax: null,
tenderResultMax: 0,
PageSize: 30,
PageCurrent: 1,
total: null,
@@ -471,6 +538,7 @@ export default {
ListPeople: [],
peopleid: '',
peoplename: '',
test: 9.00,
dialogFormVisible1: false,
dialogTimeVisible: false,
form1: {
@@ -507,7 +575,7 @@ export default {
保证金类型: [{ 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' }, { required: true, trigger: 'change', validator: validateValue }]
},
TimeRules: { // 表单验证规则
投标结果公布日期: [{ required: true, message: '请选择投标结果公布日期', trigger: 'change' }],
@@ -517,10 +585,10 @@ export default {
招标企业: [{ required: true, message: '请输入招标企业', trigger: 'blur' }],
联系人: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
联系电话: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
保证金金额: [{ required: true, message: '请输入保证金金额', trigger: 'blur' }],
保证金金额: [{ 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' }]
}
@@ -565,18 +633,20 @@ export default {
} else {
this.TenderingEnterprise_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
}
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
// 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
// }
this.tableData1Loading = true
selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.PageCurrent, this.PageSize).then(response => {
selectBidBond(this.TypeOfGoldDepositValue_check, this.TypeOfGoldDepositValue, this.Bidder_check, this.peopleid, this.TenderingEnterprise_check, this.TenderingEnterprise, this.check1, this.dateRange[0], this.check1, this.dateRange[1], this.PageCurrent, this.PageSize).then(response => {
this.tableData1Loading = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
@@ -731,7 +801,8 @@ export default {
},
changeTenderResult(row) {
this.code = row.招标保证金流水号
this.tenderResultMax = row.应收回金额
// this.tenderResultMax = Number(row.应收回金额)).toFixed(2)
this.tenderResultMax = parseFloat(row.应收回金额)
if (row.投标结果 === '1') {
this.radio = '1'
this.dialogTimeVisible = true
@@ -780,6 +851,24 @@ export default {
</script>
<style scoped>
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 10px 20px 10px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>

189
src/views/MarketingCenter/CRM/index.vue
View File

@@ -24,58 +24,58 @@
<el-button type="primary" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" plain @click="selectCustomerOfName">查询</el-button>
</el-card>
<el-card>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
<el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
<!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>-->
<el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">客户</el-button>
<!--<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>-->
<!--&lt;!&ndash;<el-table-column label="责权省份" align="center" min-width="80">&ndash;&gt;-->
<!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
<!--&lt;!&ndash;{{ scope.row.省份 }}&ndash;&gt;-->
<!--&lt;!&ndash;</template>&ndash;&gt;-->
<!--&lt;!&ndash;</el-table-column>&ndash;&gt;-->
<!--<el-table-column label="姓名" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.省份 }}-->
<!--{{ scope.row.姓名 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="性别" align="center">
<template slot-scope="scope">
{{ scope.row.性别 }}
</template>
</el-table-column>
<el-table-column label="联系电话" align="center">
<template slot-scope="scope">
{{ scope.row.联系电话 }}
</template>
</el-table-column>
<el-table-column label="生日" align="center">
<template slot-scope="scope">
{{ scope.row.出生日期 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
class="el-icon-edit-outline"
@click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 20px"
class="el-icon-delete"
@click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<!--<el-table-column label="性别" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.性别 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="联系电话" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.联系电话 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="生日" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.出生日期 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="操作" align="center" width="150px" fixed="right">-->
<!--<template slot-scope="scope">-->
<!--<el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">-->
<!--<div style="display: inline-block">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--class="el-icon-edit-outline"-->
<!--@click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--<el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">-->
<!--<div style="display: inline-block">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--style="margin-left: 20px"-->
<!--class="el-icon-delete"-->
<!--@click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>-->
<!--</div>-->
<!--</el-tooltip>-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
</el-card>
<el-row>
<el-col :span="4">
@@ -122,7 +122,7 @@
{{ scope.row.电话 }}
</template>
</el-table-column>
<el-table-column label="开票电话" align="center" min-width="100">
<el-table-column label="传真电话" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.传真 }}
</template>
@@ -137,21 +137,21 @@
{{ scope.row.电子邮箱 }}
</template>
</el-table-column>
<el-table-column label="税号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.税号 }}
</template>
</el-table-column>
<el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.开户行 }}
</template>
</el-table-column>
<el-table-column label="银行账号" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<!--<el-table-column label="税号" align="center" min-width="120">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.税号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.开户行 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="银行账号" align="center" min-width="140">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.银行账号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column label="信誉等级" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.价值评估 }}
@@ -290,8 +290,8 @@
</el-form>
</el-col>
<el-col :span="12">
<el-form-item label="开票电话:" prop="传真">
<el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入开票电话"/>
<el-form-item label="传真:" prop="传真">
<el-input v-model="form2.传真" clearable size="small" style="width:200px" placeholder="请输入传真电话"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -304,16 +304,16 @@
<el-input v-model="form2.电子邮箱" clearable size="small" style="width:200px" placeholder="请输入电子邮箱"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="税号:" prop="税号">
<el-input v-model="form2.税号" clearable size="small" style="width:200px" placeholder="请输入税号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="银行账号:" prop="银行账号">
<el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>
</el-form-item>
</el-col>
<!--<el-col :span="12">-->
<!--<el-form-item label="税号:" prop="税号">-->
<!--<el-input v-model="form2.税号" clearable size="small" style="width:200px" placeholder="请输入税号"/>-->
<!--</el-form-item>-->
<!--</el-col>-->
<!--<el-col :span="12">-->
<!--<el-form-item label="银行账号:" prop="银行账号">-->
<!--<el-input v-model="form2.银行账号" clearable size="small" style="width:200px" placeholder="请输入银行账号"/>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="信用等级:" prop="信用等级">
<el-select v-model="form2.信用等级" placeholder="请选择信誉等级" size="small">
@@ -325,11 +325,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户行:" prop="开户行">
<el-input v-model="form2.开户行" clearable size="small" style="width:200px" placeholder="请输入开户行"/>
</el-form-item>
</el-col>
<!--<el-col :span="12">-->
<!--<el-form-item label="开户行:" prop="开户行">-->
<!--<el-input v-model="form2.开户行" clearable size="small" style="width:200px" placeholder="请输入开户行"/>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="备注:" prop="备注">
<el-input v-model="form2.备注" clearable size="small" style="width:200px" placeholder="请输入备注"/>
@@ -338,8 +338,10 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2()">取消</el-button>
<el-button type="primary" @click="submit2('form2')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOff2('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit2('form2')">确 定</el-button>
<!--<el-button @click="callOff2()">取消</el-button>-->
<!--<el-button type="primary" @click="submit2('form2')">确 定</el-button>-->
</div>
</el-dialog>
</div>
@@ -671,6 +673,25 @@ export default {
.el-input__inner{
border: 1px solid black!important;
}
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>
<style lang="scss">
.NewlyAdded

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

@@ -13,58 +13,57 @@
<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="15">
<el-table v-loading="listLoading" :data="tableData1" highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
<el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
<el-col :span="17.6">
<el-table v-loading="listLoading" :data="tableData1" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" stripe highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
<el-table-column align="center" label="项目名称" prop="项目名称" width="130" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="80">
<el-table-column align="center" label="付款方式" width="77">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同总额(万元)" width="110">
<el-table-column align="center" label="合同总额(万元)" width="124">
<template slot-scope="scope">
{{ scope.row.合同总金额 }}
{{ 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="110">
<!--<el-table-column align="center" label="已付(万元)" width="95">-->
<!--<template slot-scope="scope">-->
<!--{{ Number(scope.row.已支付).toFixed(2) }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="签订日期" width="84">
<template slot-scope="scope">
{{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="发货节点" width="110">
<el-table-column align="center" label="发货节点" width="84">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" prop="营销经理" width="100">
<el-table-column align="center" label="销售经理" prop="营销经理" width="78">
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<el-table-column align="center" label="合同编号" prop="合同编号" width="117">
<template slot-scope="scope">
<template>
<span slot="reference" type="mini">{{ scope.row.合同编号 }}</span>
</template>
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" width="120">
<el-table-column align="center" label="信息备注" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
@@ -81,19 +80,19 @@
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="9">
<el-table :data="tableData2" class="subTableHeader" border style="text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="230" show-overflow-tooltip>
<el-col :span="6.3">
<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="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" min-width="150" show-overflow-tooltip>
<el-table-column label="设备名称" align="center" min-width="90" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="设备状态" align="center" width="100">
<el-table-column label="设备状态" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.机床状态 }}
</template>
@@ -914,10 +913,24 @@ export default {
}
</style>
<style lang="scss">
/*.subTableHeader {*/
/*th {*/
/*background: #8ff4ea !important;*/
/*color: black;*/
/*}*/
/*tr.el-table__row td {*/
/*background-color: #d8e5f6 !important;*/
/*}*/
/*tr.el-table__row.el-table__row--striped td {*/
/*background: #e9f0f9 !important;*/
/*}*/
/*}*/
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
background: #7eaced !important;
color: #FFFFFF;
}
tr.el-table__row td {

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

@@ -1,92 +1,118 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px;width: 140px " size="small" clearable>
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 220px " size="small" clearable>
<!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px 10px;width: 180px " size="small" clearable>-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="customerName" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
<el-select v-show="false" v-model="customerName" filterable placeholder="请输入客户名称" style="margin: 3px;width: 220px " size="small" clearable>
<el-option
v-for="item in customerNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="font-size: 13px;margin-left: 10px">签订日期</span>
<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;tableData2=[];getTableData()">查询</el-button>
<!--<el-badge :value="value" :max="99" class="item">-->
<!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
<!--</el-badge>-->
</el-card>
<el-card>
<el-col :span="14">
<el-col :span="17">
<el-table
v-loading="listLoading"
:row-key="getRowKeys"
:expand-row-keys="expands"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
:data="tableData1"
style="width: 100%;"
style="width: 970px;"
height="600px"
highlight-current-row
border
stripe
size="mini"
@expand-change="selectMachine"
@sort-change="sortChange"
@row-click="getTableData2">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
<el-table-column label="发货单号" align="center" >
<template slot-scope="scope">
{{ scope.row.发货单号 }}
</template>
</el-table-column>
<el-table-column label="发货日期" align="center">
<template slot-scope="scope">
{{ scope.row.发货日期 }}
</template>
</el-table-column>
<el-table-column label="运输状态" align="center">
<template slot-scope="scope">
{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<!--@expand-change="selectMachine"-->
<!--<el-table-column type="expand" label="详情" width="50">-->
<!--<template slot-scope="scope">-->
<!--<el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">-->
<!--<el-table-column label="发货单号" align="center" >-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.发货单号 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="发货日期" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.发货日期 }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--<el-table-column label="运输状态" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}-->
<!--</template>-->
<!--</el-table-column>-->
<!--</el-table>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="合同编号" prop="合同编号" sortable="custom" width="118">
<template slot-scope="scope">
{{ scope.row.合同编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="118" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" min-width="160" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="80">
<el-table-column align="center" label="付款方式" width="78">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="right" label="合同总额（万元）" width="130">
<el-table-column align="right" label="合同金额(万元)" prop="合同总金额" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ Number(scope.row.合同总金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" prop="姓名" width="100">
<el-table-column align="right" label="已收(万元)" prop="已支付" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ Number(scope.row.已收金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="right" label="未收(万元)" prop="未支付金额" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ Number(scope.row.未收金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" prop="姓名" width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70" fixed="right">
<el-table-column label="操作" align="center" width="66">
<template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-circle-plus-outline" @click.stop="addMoney(scope.row)">收款</el-button>
</template>
@@ -137,11 +163,13 @@
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="10">
<el-col :span="7">
<el-table
:data="tableData2"
style="width: 500px;max-height: 440px;text-align: center"
:summary-method="getSummaries1"
style="width: 395px;max-height: 440px;text-align: center"
highlight-current-row
show-summary
border
size="mini">
<el-table-column
@@ -149,25 +177,25 @@
label="序号"
type="index"
width="70"/>
<el-table-column align="right" label="收款金额" width="125">
<el-table-column align="right" label="收款金额(万元)" width="120" prop="收款金额">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input-number v-model="scope.row.收款金额" :min="0" :step="1" style="width:100px" clearable size="mini"/>
<el-input v-model="scope.row.收款金额" :min="0" style="width:100px" clearable size="mini"/>
</template>
<span v-else>{{ Number(scope.row.收款金额).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="收款时间" align="center" width="150px">
<el-table-column label="收款时间" align="center" width="85" prop="收款时间">
<template slot-scope="scope">
{{ scope.row.收款时间 ? scope.row.收款时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="150">
<el-table-column align="center" label="操作" width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="updateMoney(scope.row)">确定</el-button>
<el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="updateMoney(scope.row, scope.$index)">确定</el-button>
<el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit(scope.$index, scope.row)">取消</el-button>
<el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
<el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleteMoney(scope.row)">删除</el-button>
<el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
<el-button v-if="!scope.row.edit" type="text" size="mini" icon="el-icon-delete" @click="deleteMoney(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -186,9 +214,37 @@ export default {
},
data() {
return {
dateRange: '',
check1: '',
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])
}
}]
},
customerNames: [],
customerName: '',
pickerOptions: {},
timetime: '',
name: '',
moneyValue: '',
@@ -247,6 +303,82 @@ export default {
this.getCustomerName()
},
methods: {
// 2020 02 20 刘路加新增怕徐
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
if (column.prop === '合同编号') {
this.ordername = 1
} else if (column.prop === '合同总金额') {
this.ordername = 2
} else if (column.prop === '已支付') {
this.ordername = 3
} else if (column.prop === '未支付金额') {
this.ordername = 4
} else {
this.ordername = ''
}
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.getTableData()
},
// 2020 02 18 刘路加新增合计
getSummaries1: function(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
} else if (index === 1) {
const values = data.map(item => Number(parseFloat(item['收款金额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] = sums[index].toFixed(2) + ' 元'
} else {
sums[index] = '0'
}
}
})
return sums
},
// getSummaries1(param) { // 合计
// console.log(param)
// const { columns, data } = param
// const sums = []
// columns.forEach((column, index) => {
// if (index === 0) {
// sums[index] = '合计'
// } else if (index === 1) {
// const values = data.map(item => {
// console.log(item, 2222)
// Number(parseFloat(item['收款金额']))
// })
// if (!values.every(value => isNaN(value))) {
// sums[index] = values.reduce((prev, curr) => {
// const value = Number(curr)
// if (!isNaN(value)) {
// return prev + curr
// } else {
// return prev
// }
// }, 0)
// sums[index] = sums[index].toFixed(2) + ' 元'
// } else {
// sums[index] = 'N/A'
// }
// }
// })
// },
searchName() { // 模糊查询姓名
SelectMarketingManager(this.name).then(response => {
this.dataPeople = response.data
@@ -279,14 +411,18 @@ export default {
this.value = response.data.length
})
},
updateMoney(row) {
updateMoney(row, index) {
row.edit = false
updateMoney(row.资金明细ID, row.收款金额).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
this.tableData2[index].收款金额 = 0
}
}).then(() => {
console.log(111111111)
this.getTableData()
})
},
addMoney(row) {
@@ -331,6 +467,7 @@ export default {
})
}
})
this.getTableData()
} else {
this.$message.error('删除失败')
}
@@ -378,7 +515,8 @@ export default {
},
getTableData() {
this.listLoading = true
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName).then(response => {
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
searchTable1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.customerName, this.check1, this.dateRange[0], this.dateRange[1], this.ordername, this.order).then(response => {
this.listLoading = false
const data = response.data.rows
for (let i = 0; i < data.length; i++) {
@@ -396,6 +534,7 @@ export default {
this.tableData2 = []
this.moneyID = row.资金id
searchTable2(this.moneyID).then(response => {
console.log(response.data)
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
收款金额: response.data[i].金额,

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

@@ -2,16 +2,32 @@
<div class="app-container">
<el-card>
<div>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
<!--<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px 0 0px;">-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="customerName1" clearable size="small" style="width:220px;" placeholder="请输入客户名称或项目名称"/>
<span style="font-size: 13px;margin-left: 10px">签订日期</span>
<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-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >合同</el-button>
<el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出营销合同" placement="top">
<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 410px" @click="exportExcel">导出</el-button>
</el-tooltip>
</div>
</el-card>
<el-card>
@@ -20,19 +36,20 @@
:data="tableData1"
:row-key="getRowKeys"
:expand-row-keys="expands"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
highlight-current-row
style="width: 100%;margin: 3px 0px"
style="margin: 3px 0px;width: 1208px"
height="700"
border
stripe
size="mini"
@row-click="fetchExecutionProgressdata"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情" width="60">
<el-table-column type="expand" label="详情" width="50">
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border style="width: 482px; text-align: center">
<el-table-column label="机床名称" align="center" width="140">
<template slot-scope="机床图号">
<el-table-column label="机床型号" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
@@ -72,22 +89,22 @@
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<el-table-column align="center" label="合同编号" prop="合同编号" width="118">
<template slot-scope="scope">
{{ scope.row.合同编号 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" prop="客户名称" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" prop="项目名称" width="140" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="139" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="right" label="合同总额(万元)" prop="合同总额" width="140" show-overflow-tooltip>
<el-table-column align="right" label="合同金额(万元)" prop="合同总额" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ Number(scope.row.合同总金额).toFixed(2) }}
</template>
@@ -97,17 +114,17 @@
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="签订日期" width="100">
<el-table-column align="center" label="签订日期" width="90">
<template slot-scope="scope">
{{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
</template>
</el-table-column>
<el-table-column align="center" label="销售经理" width="85">
<el-table-column align="center" label="营销经理" width="80">
<template slot-scope="scope">
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<el-table-column align="center" label="发货节点" width="85">
<el-table-column align="center" label="发货节点" width="80">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
@@ -117,7 +134,7 @@
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="200">
<el-table-column label="操作" align="center" width="130">
<template slot-scope="scope">
<el-button
size="mini"
@@ -130,7 +147,7 @@
size="mini"
type="text"
icon="el-icon-edit-outline"
style="margin-left: 20px"
style="margin-left: 10px"
@click.stop="handleEdit(scope.row)"/>
</div>
</el-tooltip>
@@ -140,7 +157,7 @@
size="mini"
type="text"
icon="el-icon-delete"
style="margin-left: 20px"
style="margin-left: 10px"
@click.stop="handleDelete(scope.row)"/>
</div>
</el-tooltip>
@@ -191,27 +208,27 @@
</div>
</el-card>
<!--新增合同信息对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px; " width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="EntryName">
<el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:200px"/>
<el-col :span="12" style="height: 2px">
<el-form-item label="项目名称" prop="EntryName" style="">
<el-input v-model="form.EntryName" size="small" placeholder="请输入项目名称" style="width:180px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投标保证金" prop="">
<el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
<el-input v-model="form.bidding" readonly clearable size="small" style="width:180px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合同总额" prop="contractAmount">
<el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
<el-input v-model="form.contractAmount" clearable size="small" style="width:180px" placeholder="请输入合同金额" @change="fun()"/>
</el-form-item>
</el-col>
<el-col v-show="false" :span="12" >
<el-form-item label="已完成进度" prop="executionProgressID">
<el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 200px">
<el-select v-model="form.executionProgressID" :disabled="infoDisable" placeholder="请输入目前执行进度" size="small" style="width: 180px">
<el-option
v-for="item in executionProgress"
:key="item.value"
@@ -222,7 +239,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="营销经理" prop="MarketingManagerValue">
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
<el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:180px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -232,7 +249,8 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择图纸会签节点"/>
style="width: 180px"
placeholder="合同签订日期"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -242,6 +260,7 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width: 180px"
placeholder="请选择图纸会签节点"/>
</el-form-item>
</el-col>
@@ -252,6 +271,7 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width: 180px"
placeholder="请选择设备预验收节点"/>
</el-form-item>
</el-col>
@@ -262,6 +282,7 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width: 180px;"
placeholder="请选择发货节点"/>
</el-form-item>
</el-col>
@@ -272,17 +293,18 @@
value-format="yyyy-MM-dd"
size="small"
type="date"
style="width: 180px"
placeholder="请选择安装调试节点"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
<el-input v-model="form.customerName" readonly size="small" placeholder="请双击选择客户" style="width:180px" clearable @dblclick.native="CustomerChange()" @clear="clear1()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="付款方式" prop="付款方式">
<el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 200px">
<el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 180px">
<el-option
v-for="item in money"
:key="item.value"
@@ -295,7 +317,7 @@
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
style="width: 200px"
style="width: 180px"
type="textarea"
autosize
placeholder="请输入项目介绍"/>
@@ -304,22 +326,21 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOff('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
</div>
</el-dialog>
<!--新增机床对话框-->
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<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"/>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="300px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
<el-form-item label="机床型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:130px"/>
</el-form-item>
<el-form-item label="设备名称" prop="设备名称">
<el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:200px"/>
<el-form-item label="机床名称" prop="设备名称">
<el-input v-model="form1.设备名称" size="small" placeholder="请输入设备名称" style="width:130px"/>
</el-form-item>
<el-form-item label="机床数量" prop="机床数量">
<el-input-number :min="1" v-model="form1.机床数量" controls-position="right" style="width:200px" size="small"/>
<el-input-number :min="1" v-model="form1.机床数量" controls-position="right" style="width:130px" size="small"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -329,16 +350,16 @@
</el-dialog>
<!--营销经理选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<div style="margin-top: 15px;">
<el-table :data="tableData4" border style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="300px">
<div style="margin-top: 0px;width: 250px">
<el-table :data="tableData4" border style="width: 120px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-table-column label="部门" align="center" >
<template slot-scope="scope">
{{ scope.row.部门名称 }}
</template>
</el-table-column>
</el-table>
<el-table :data="tableData3" border stripe style="width: 200px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
<el-table :data="tableData3" border stripe style="width: 120px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -346,17 +367,18 @@
</el-table-column>
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="offName">取消</el-button>
<el-button type="primary" @click="getName">确认</el-button>
<div slot="footer" class="dialog-footer" style="margin-top: 20px">
<el-button size="small" icon="el-icon-circle-close" @click="offName()">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getName()">确认</el-button>
<!--<el-button @click="offName">取消</el-button>-->
<!--<el-button type="primary" @click="getName">确认</el-button>-->
</div>
</el-dialog>
<!--投标保证金选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
<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>
<el-input v-model="enterprise" size="small" style="width:200px" placeholder="招标企业" clearable/>
<el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
<div style="margin-top: 15px">
<el-table
:data="tableDataBidding"
@@ -364,40 +386,40 @@
style="width: 100%"
height="400"
border
stripe
size="mini"
stripei
size="m9ini"
@row-click="biddingNum">
<el-table-column align="center" label="招标企业" width="300">
<el-table-column align="center" label="招标企业" width="220">
<template slot-scope="scope">
{{ scope.row.招标企业 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系人" width="100">
<el-table-column align="center" label="联系人" width="64" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column align="center" label="联系电话" width="120">
<el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.联系电话 }}
</template>
</el-table-column>
<el-table-column align="center" label="保证金金额" width="100">
<el-table-column align="center" label="保证金金额(万元)" width="95">
<template slot-scope="scope">
{{ scope.row.保证金金额 }}
{{ Number(scope.row.保证金金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="投标人" width="100">
<el-table-column align="center" label="投标人" width="64" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.投标人 }}
</template>
</el-table-column>
<el-table-column align="center" label="保金类型" width="150">
<el-table-column align="center" label="保金类型" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.保证金类型 }}
</template>
</el-table-column>
<el-table-column align="center" label="投标日期" width="150">
<el-table-column align="center" label="投标日期" width="85">
<template slot-scope="scope">
{{ scope.row.投标日期 }}
</template>
@@ -410,15 +432,15 @@
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="offBidding">取消</el-button>
<el-button type="primary" @click="getBidding">确认</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="offBidding()">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getBidding">确认</el-button>
</div>
</el-dialog>
<!--客户选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="400px">
<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>
<el-button type="search" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
<el-table-column label="客户名称" align="center" >
<template slot-scope="scope">
@@ -427,8 +449,8 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="offCustomerChange">取消</el-button>
<el-button type="primary" @click="getCustomerCode">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="offCustomerChange('form')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="getCustomerCode('form')">确 定</el-button>
</div>
</el-dialog>
@@ -446,8 +468,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOffTime('form2')">取消</el-button>
<el-button type="primary" @click="submitTime('form2')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOffTime('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitTime('form2')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -462,7 +484,55 @@ export default {
elInput
},
data() {
const validateValue = (rule, value, callback) => {
if (value === 0) {
callback(new Error('金额不能为0'))
} else if (value) {
// const reg = /^\-\d\.?\d*$/
// const boolean = reg.test(value)
const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
console.log(boolean)
if (!boolean) {
callback(new Error('请输入正数'))
this.form.contractAmount = ''
} else {
console.log(2222)
callback()
}
} else {
callback()
}
}
return {
dateRange: '',
check1: '',
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])
}
}]
},
isTrue: true,
customerName1: '',
customerName1_check: '',
@@ -575,11 +645,14 @@ export default {
temp: '', // 增加或修改的标志位
rules: { // 表单验证规则
EntryName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
customerName: [{ required: true, message: '请选择客户名称', trigger: 'change' }],
MarketingManagerValue: [{ required: true, message: '请选择营销经理', trigger: 'change' }],
executionProgressID: [{ required: true, message: '请选择已完成进度', trigger: 'change' }],
contractSigningDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
付款方式: [{ required: true, message: '请选择付款方式', trigger: 'change' }],
contractAmount: [{ required: true, message: '请输入合同总额', trigger: 'blur' }]
contractAmount: [
{ required: true, message: '请输入合同总额', trigger: 'change' },
{ required: true, trigger: 'blur', validator: validateValue }]
},
rules1: { // 表单验证规则
设备型号: [{ required: true, message: '请输入设备型号', trigger: 'blur' }],
@@ -596,6 +669,11 @@ export default {
this.fetchCustomerData()
},
methods: {
// 2020 02 18 刘路加 增加
fun() {
this.form.contractAmount = Number(this.form.contractAmount).toFixed(2)
},
searchName() { // 模糊查询姓名
this.tableData3 = []
SelectMarketingManager().then(response => {
@@ -667,6 +745,7 @@ export default {
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 }
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
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.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
@@ -674,7 +753,33 @@ 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.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading'])
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'])
},
exportExcel() {
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 }
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
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.machine === '' || this.machine === null) { this.machine_check = 0 } else { this.machine_check = 1 }
this.ExecutionProgressShow = false
this.uploader = false
this.ExecutionProgress = null
this.listLoading = true
var param = []
param[0] = ['项目流水号_check', this.entryNameValue_check]
param[1] = ['合同ID', this.entryNameValue]
param[2] = ['客户名称_check', this.customerName1_check]
param[3] = ['客户名称', this.customerName1]
param[4] = ['开始日期_check', this.check1]
param[5] = ['开始日期', this.dateRange[0]]
param[6] = ['结束日期_check', this.check1]
param[7] = ['结束日期', this.dateRange[1]]
param[8] = ['营销经理流水号_check', 0]
param[9] = ['机床型号_check', 0]
var Data = this.CreateData('2001', '报表_营销合同查询', param)
this.exportExcel_NPOI(Data)
},
fetchExecutionProgressdata(row) {
this.projectNum = row.项目流水号
@@ -733,6 +838,7 @@ export default {
})
},
selectMachine(row) {
console.log(row.项目流水号)
if (this.a === 1) {
this.expands.push(row.项目流水号)
this.b = row.项目流水号
@@ -803,6 +909,7 @@ export default {
})
})
selectMachine(row.项目流水号).then(response => {
console.log(response)
this.tableData2 = response.data
})
},
@@ -859,6 +966,7 @@ export default {
// 提交添加或者修改
submit(formName) {
this.$refs[formName].validate((valid) => {
console.log(valid, 111111)
if (valid) {
if (this.temp === 1) {
this.addTableData1()
@@ -1105,7 +1213,7 @@ export default {
},
biddingNum(row) {
this.biddingNumber = parseInt(row.招标保证金流水号)
this.enterpriseInput = row.招标企业
this.enterpriseInput = Number(row.保证金金额).toFixed(2)
},
clearBidding() {
this.biddingNumber = ''
@@ -1244,11 +1352,36 @@ a{
display: inline-block;
color: #999;
}
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
/*>>>.el-dialog, .el-pager li {*/
/*background: red;*/
/*opacity: 0.9;*/
/*-webkit-box-sizing: border-box;*/
/*}*/
/*.el-table td, .el-table th.is-leaf,*/
/*.el-radio__inner,*/
/*.el-input__inner{*/
/*border: 1px solid black!important;*/
/*}*/
</style>
<style lang="scss">

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

@@ -3,73 +3,88 @@
<!--查询条件-->
<el-card>
<el-row>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请输入客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
<!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="customerName" clearable size="small" style="margin-right: 5px;width: 220px" placeholder="输入合同项目名称或客户名称" @dblclick.native="openName" @clear="clearPeople()"/>
<span style="font-size: 13px;margin-left: 10px">签订日期</span>
<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-button
type="distribution"
size="small"
icon="el-icon-circle-plus-outline"
@click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
@click.stop="openAddInvoiceRecordingDialog(); flag = 1">开票</el-button>
</el-row>
</el-card>
<!--项目表格-->
<el-card>
<el-col :span="15">
<el-table
v-loading="listLoading1"
:data="tableData1"
highlight-current-row
style="width: 1360px;margin-top: 3px"
height="550"
style="width: 900px;margin-top: 3px"
height="610"
border
stripe
size="mini"
@row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" prop="合同编号" width="140">
<el-table-column align="center" label="合同编号" prop="合同编号" width="120">
<template slot-scope="scope">
<!-- <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>-->
{{ 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="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="付款方式" width="100">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
<el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同总金额（含税）" width="130">
<el-table-column align="center" label="付款方式" width="80">
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同金额(万元)" width="120">
<template slot-scope="scope">
<span v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
<span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </span>
</template>
</el-table-column>
<el-table-column align="center" label="已到账金额" width="120">
<el-table-column align="center" label="开票总额(万元)" width="120">
<template slot-scope="scope">
<span v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
<span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </span>
<span v-if="scope.row.开票总金额===''||scope.row.开票总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
<span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.开票总金额).toFixed(2) }} </span>
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<el-table-column align="center" label="到账金额(万元)" width="120">
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
<span v-if="scope.row.已收金额===''||scope.row.已收金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
<span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已收金额).toFixed(2) }} </span>
</template>
</el-table-column>
<el-table-column align="center" label="合同签订日期" width="100">
<el-table-column align="center" label="签订日期" width="100">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
@@ -79,15 +94,20 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="开票详情" fixed="right" align="center" width="130px">
<el-table-column align="center" label="合同信息备注" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="opendialogFormVisibleRecordDialog(scope.row)">开票详情</el-button>
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<!--<el-table-column label="开票详情" fixed="right" align="center" width="90px">-->
<!--<template slot-scope="scope">-->
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-search"-->
<!--@click.stop="opendialogFormVisibleRecordDialog(scope.row)">详情</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block">
<el-pagination
@@ -100,9 +120,73 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="9">
<el-table
v-loading="listLoading2"
:data="tableData2"
:summary-method="getSummaries"
show-summary
style="width: 600px;margin-top: 3px;margin-left: 6px"
height="300"
highlight-current-row
border
stripe
size="mini">
<el-table-column
align="center"
label="序号"
type="index"
width="50"/>
<!--<el-table-column align="center" label="发票抬头" width="180" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.客户名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="开票金额(万元)" width="130" prop="开票金额">
<template slot-scope="scope">
{{ Number(scope.row.开票金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" width="90">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 0px"
icon="el-icon-edit-outline"
@click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 8px"
icon="el-icon-delete"
@click.stop="delInvoiceRecordingDialog(scope.row)"/>
</div>
</el-tooltip>
</template>
</el-table-column>
</el-table>
</el-col>
</el-card>
<!-- 开票详情-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleRecord" title="开票详情" center width="600px">
<el-table
v-loading="listLoading2"
:data="tableData2"
@@ -119,17 +203,17 @@
label="序号"
type="index"
width="50"/>
<el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额（含税）" width="120">
<!--<el-table-column align="center" label="发票抬头" width="180" show-overflow-tooltip>-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.客户名称 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="开票金额(万元)" width="130">
<template slot-scope="scope">
{{ Number(scope.row.开票金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" width="100">
<el-table-column align="center" label="开票时间" width="90">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
@@ -139,13 +223,14 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="130">
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
size="mini"
type="text"
style="margin-left: 0px"
icon="el-icon-edit-outline"
@click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2"/>
</div>
@@ -155,7 +240,7 @@
<el-button
size="mini"
type="text"
style="margin-left: 20px"
style="margin-left: 8px"
icon="el-icon-delete"
@click.stop="delInvoiceRecordingDialog(scope.row)"/>
</div>
@@ -189,20 +274,16 @@
</div>
</el-dialog>
<!--增加开票记录-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="750px">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="客户名称" prop="客户名称">
<el-input v-model="form.客户名称" readonly size="small" placeholder="请双击选择客户" style="width:200px" clearable @dblclick.native="CustomerChange()" @clear="clearCustomer()"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开票金额" prop="开票金额">
<el-form-item label="开票金额(万元)" prop="开票金额">
<el-input v-model="form.开票金额" clearable size="small" placeholder="请输入开票金额" style="width:200px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开票时间" prop="开票时间">
<el-date-picker
v-model="form.开票时间"
@@ -213,17 +294,16 @@
type="date"
placeholder="请选择开票时间"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
<el-input v-model="form.备注" clearable size="small" placeholder="请输入备注" style="width:200px"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" @click="submit('form')">确 定</el-button>
<!--<el-button @click="dialogFormVisible1 = false">取消</el-button>-->
<!--<el-button type="primary" @click="submit('form')">确 定</el-button>-->
<el-button size="small" icon="el-icon-circle-close" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submit('form')">确 定</el-button>
</div>
</el-dialog>
<!--客户选择-->
@@ -277,9 +357,56 @@ export default {
elInput
},
data() {
const validateValue = (rule, value, callback) => {
if (value === 0) {
callback(new Error('金额不能为0'))
} else if (value) {
// const reg = /^\-\d\.?\d*$/
// const boolean = reg.test(value)
const boolean = new RegExp(/^(\+)?\d+(\.\d+)?$/).test(value)
console.log(boolean)
if (!boolean) {
callback(new Error('请输入正数'))
this.form.contractAmount = ''
} else {
console.log(2222)
callback()
}
} else {
callback()
}
}
return {
dateRange: '',
check1: '',
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])
}
}]
},
row1: [],
pickerOptions: {},
timetime: '',
name: '',
projectid: '', // 项目流水号
@@ -335,7 +462,7 @@ export default {
},
rules: {
客户名称: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }, { required: true, trigger: 'blur', validator: validateValue }],
开票时间: [{ required: true, message: '请双击选择客户名称', trigger: 'change' }]
}
}
@@ -379,10 +506,11 @@ export default {
if (this.customerName === '' || this.customerName === null) { this.customerName_check = 0 } else { this.customerName_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.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 }
this.dateRange ? (this.startTime_check = 1, this.endTime_check = 0) : (this.startTime_check = 0, this.endTime_check = 0, this.dateRange = '')
// 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 }
this.listLoading1 = true
searchTableData1(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.customerName, this.customerName_check).then(response => {
searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.dateRange[0], this.dateRange[1], this.customerName, this.customerName_check).then(response => {
this.listLoading1 = false
const data = response.data
for (let i = 0; i < data.rows.length; i++) {
@@ -421,41 +549,67 @@ export default {
})
},
// 开票记录合计
getSummaries(param) {
getSummaries: function(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 6) {
sums[index] = '项目开票合计：'
if (index === 0) {
sums[index] = '合计'
return
} else if (index === 7) {
const values = data.map(item => Number(item['开票金额']))
} else if (index === 1) {
const values = data.map(item => Number(parseFloat(item['开票金额'])))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Number(prev) + Number(curr)
return prev + curr
} else {
return Number(prev)
return prev
}
}, 0)
sums[index] += ' 万元(含税)'
sums[index] = sums[index].toFixed(2) + ' 元'
} else {
sums[index] = 'N/A'
sums[index] = '0'
}
} else if (index === 8) {
sums[index] = this.taxRate * 100 + '% (税率)'
return
} else if (index === 9) {
sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
return
} else if (index === 10) {
sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
return
}
})
return sums
},
// getSummaries(param) {
// const { columns, data } = param
// const sums = []
// columns.forEach((column, index) => {
// if (index === 6) {
// sums[index] = '项目开票合计：'
// return
// } else if (index === 7) {
// const values = data.map(item => Number(item['开票金额']))
// if (!values.every(value => isNaN(value))) {
// sums[index] = values.reduce((prev, curr) => {
// const value = Number(curr)
// if (!isNaN(value)) {
// return Number(prev) + Number(curr)
// } else {
// return Number(prev)
// }
// }, 0)
// sums[index] += ' 万元(含税)'
// } else {
// sums[index] = 'N/A'
// }
// } else if (index === 8) {
// sums[index] = this.taxRate * 100 + '% (税率)'
// return
// } else if (index === 9) {
// sums[index] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
// return
// } else if (index === 10) {
// sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
// return
// }
// })
// return sums
// },
// 双击解锁选定行的税率编辑
unlockEditor(row) {
row.是是否禁用税率编辑 = false
@@ -573,6 +727,7 @@ export default {
}
}
})
this.fetchTableData1()
},
// 增加开票记录
addSubmit() {
@@ -591,6 +746,7 @@ export default {
this.$message.error('数据占用')
}
})
this.fetchTableData1()
},
openEditInvoiceRecordingDialog(row) {
this.editForm(row, 'form')
@@ -628,6 +784,7 @@ export default {
},
delInvoiceRecordingDialog(row) {
function a() {
this.fetchTableData1()
searchTableData2(this.projectid).then(response => {
const data = response.data
for (let i = 0; i < data.length; i++) {
@@ -642,11 +799,30 @@ export default {
}
</script>
<style lang="scss">
<style scoped>
/*.tableInput{*/
/* .el-textarea__inner, .el-radio__inner, .el-input__inner{*/
/* border: 1px solid #F56C6C !important*/
/* }*/
/*}*/
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>

77
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -1,15 +1,27 @@
<template>
<div>
<el-card>
<span>项目名称：</span>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
<!--<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>-->
<!--<el-option-->
<!--v-for="item in entryName"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-input v-model="customerName" clearable size="small" style="width:220px;margin: 3px 0" placeholder="请输入客户名称或项目名称"/>
<span style="font-size: 13px;margin-left: 10px">签订日期</span>
<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="结束日期"/>
<!-- <span style="margin-left: 10px">开始日期：</span>-->
<!-- <el-date-picker-->
<!-- v-model="startTime"-->
@@ -50,12 +62,12 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="已完成进度" width="100">
<el-table-column align="center" label="进程" width="100">
<template slot-scope="scope">
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同签订日期" width="100">
<el-table-column align="center" label="签订日期" width="86">
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
@@ -265,8 +277,8 @@
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="105px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="保证金金额" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :step="1" style="width: 150px" size="small"/>
<el-form-item label="保证金(万元)" prop="保证金金额">
<el-input-number v-model="form2.保证金金额" :precision="2" :min="0" :step="1" style="width: 150px" size="small"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -295,14 +307,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="截止时间(天)" prop="截止时间">
<el-input-number v-model="form2.截止时间" placeholder="请输入截止时间" style="width: 150px" size="small"/>
<el-input-number v-model="form2.截止时间" :min="0" placeholder="请输入截止时间" style="width: 150px" size="small"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOffPerformanceBondDialog('form2')">取消</el-button>
<el-button type="primary" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
<el-button size="small" icon="el-icon-circle-close" @click="callOffPerformanceBondDialog('form2')">取消</el-button>
<el-button type="distribution" size="small" icon="el-icon-circle-check" @click="submitPerformanceBondDialog('form2')">确 定</el-button>
</div>
</el-dialog>
</div>
@@ -326,6 +338,35 @@ export default {
}
}
return {
dateRange: '',
check1: '',
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])
}
}]
},
upload3: upload3,
title1: '', // 履约保证金新增或编辑对话框
entryNameValue: '', // 查询条件_项目名称
@@ -410,8 +451,10 @@ export default {
} else {
this.customerName_check = 1
}
// llj新增
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
this.listLoading1 = true
searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.check1, this.check1, this.dateRange[0], this.dateRange[1], this.customerName_check, this.customerName).then(response => {
this.tableData2 = []
this.listLoading1 = false
const data = response.data

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

@@ -2,7 +2,6 @@
<div class="app-container">
<!--顶栏结构-->
<el-card>
<span>项目名称：</span>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">
<el-option
v-for="item in entryName"

10
src/views/Outsourcing/OutFactoryMaintenance/index.vue
View File

@@ -1,23 +1,15 @@
<template>
<div class="app-container">
<el-card>
<span>厂家名称:</span>
<el-input v-model="ManufacturerName" clearable size="small" style="width:200px" @keyup.enter.native="pageCurrent=1;pageSize=50;searchTable()" @clear="pageCurrent=1;pageSize=50;searchTable()"/>
<!--<span>电话:</span>-->
<!--<el-input v-model="phNumber" size="small" clearable style="width:200px"/>-->
<!--<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>-->
<el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
<el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-tooltip>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
<el-table-column
label=" "
align="center"
type="index"
width="50"/>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="外协厂家名称" align="center" width="280px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}

3
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -3,9 +3,8 @@
<el-card style="width: 1050px">
<el-row style="width: 1020px">
<el-row>
<span>外协厂家:</span>
<el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
<el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=50;getParts()">查询</el-button>
<el-button type="primary" class="el-icon-search" style="margin-left: 20px" size="small" plain @click="pageCurrent=1;pageSize=50;getParts()">查询</el-button>
</el-row>
<el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="300" style="width: 690px;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">

5
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -1,9 +1,8 @@
<template>
<div class="app-container">
<el-card>
<span>零件号:</span>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="getList()">查询</el-button>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:160px"/>
<el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:20px" plain @click="getList()">查询</el-button>
<el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
<el-table v-loading="loading1" ref="multipleTable" :data="List1" border size="mini" stripe highlight-current-row height="265" style="width: 100%;margin-top: 20px" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"/>

2
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -32,7 +32,7 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" prop="材料" align="center" width="82px" show-overflow-tooltip>
<el-table-column label="材料" prop="材料" align="center" min-width="82px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>

4
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -72,7 +72,7 @@
size="small"
type="daterange"
align="center"
style="width: 240px;margin: 3px 10px"
style="width: 220px;margin: 3px 10px"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
@@ -337,7 +337,7 @@
icon="el-icon-check"
@click="submitAddPurchaseOrder">确定</el-button>
<el-button
v-show="title2==='编辑外购计划单'"
v-show="title2==='编辑采购计划单'"
type="primary"
size="small"
icon="el-icon-check"

25
src/views/layout/components/AppMain.vue
View File

@@ -1,30 +1,20 @@
<template>
<section class="app-main">
<!--<section class="app-main">-->
<section id="app-main" class="app-main">
<transition name="fade-transform" mode="out-in">
<!-- or name="fade" -->
<!-- <router-view :key="key"></router-view> -->
<transition name="fade-transform" mode="out-in">
<keep-alive id="keepAlive">
<router-view v-if="$route.meta.keepAlive"/>
<keep-alive>
<router-view/>
</keep-alive>
</transition>
<transition name="fade-transform" mode="out-in">
<router-view v-if="!$route.meta.keepAlive"/>
</transition>
</section>
</template>
<script>
import store from '@/store'
export default {
name: 'AppMain',
computed: {
keepAliveList() {
var keepAliveList = ''
store.state.tagsView.cachedViews.map(v => {
keepAliveList = keepAliveList + v + ','
})
console.log(keepAliveList)
return keepAliveList
}
// key() {
// return this.$route.name !== undefined ? this.$route.name + +new Date() : this.$route + +new Date()
// }
@@ -35,9 +25,8 @@ export default {
<style scoped>
.app-main {
/*50 = navbar */
width: 1380px;
position: relative;
overflow: hidden;
/*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/
/*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
}
</style>

200
src/views/layout/components/Navbar.vue
View File

@@ -27,13 +27,6 @@
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
export default {
components: {
Breadcrumb,
@@ -64,200 +57,7 @@ export default {
'token'
])
},
mounted() {
if (this.id.toString() === '3') {
this.checkApproval()
this.timer = setInterval(this.checkApproval, 1000 * 60 * 5)
} else if (this.token.toString() === '11' || this.token.toString() === '12') {
this.comfirmMaterial()
this.timer = setInterval(this.comfirmMaterial, 1000 * 60 * 5)
} else if (this.token.toString() === '2' || this.token.toString() === '3') {
this.comfirmMaterial_CG()
this.timer = setInterval(this.comfirmMaterial_CG, 1000 * 60 * 5)
} else if (this.token.toString() === '15') {
this.comfirmMaterial_KG()
this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
} else if (this.token.toString() === '5') {
this.comfirmUrgentItem()
this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60)
}
},
beforeDestroy() {
clearInterval(this.timer)
},
methods: {
comfirmMaterial_KG() {
getPickingList().then(res => {
if (res.data.length) {
this.noticeContractKG = null
this.noticeContractKG = this.$notify.success({
title: '提示',
message: '您有新的领料单需要备料确认，请及时处理，点击查看',
onClick: () => {
setPickingList().then(res => {
this.$router.push({ path: '/Inventory/MaterialOut' })
setTimeout(this.noticeContractKG.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
},
comfirmMaterial_CG() {
getMaterial_NOTES().then(res => {
if (res.data.length) {
this.noticeContract1 = null
this.noticeContract1 = this.$notify.success({
title: '提示',
message: '有新采购物料审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/MaterialMProcure' })
setTimeout(this.noticeContract1.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
if (this.token.toString() === '2') {
searchRequestFund(1, 9999, 0, 0, 0, 0, 0).then(res => {
if (res.data.length) {
this.noticeContract2 = null
this.noticeContract2 = this.$notify.success({
title: '提示',
message: '有合同请款申请审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract2.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
initApproval(1, 999, 1).then(res => {
if (res.data.rows.length) {
this.noticeContract3 = null
this.noticeContract3 = this.$notify.success({
title: '提示',
message: '有合同请款申请待审批，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/FundApproval1' })
setTimeout(this.noticeContract3.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
} else if (this.token.toString() === '3') {
searchRequestFund(1, 99999, 0, 0, 0, 0, 0).then(res => {
if (res.data.length) {
this.noticeContract4 = null
this.noticeContract4 = this.$notify.success({
title: '提示',
message: '有合同请款申请审批结果，点击查看',
onClick: () => {
setChakan().then(res => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractRequestFund' })
setTimeout(this.noticeContract4.close(), 1000)
})
},
duration: 1000 * 60
})
}
})
}
},
comfirmMaterial() {
getMaterial().then(res => {
if (res.data.length) {
this.noticeContract5 = null
this.noticeContract5 = this.$notify.success({
title: '提示',
message: '您有采购物料申请待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/MaterialManagement' })
setTimeout(this.noticeContract5.close(), 1000)
},
duration: 1000 * 60
})
}
})
},
checkApproval() {
searchTable1(1, 999, 0, null, null, 0, 0, 0, 0, 0, 0).then(res => {
if (res.data.total) {
this.noticeContract6 = null
this.noticeContract6 = this.$notify.success({
title: '提示',
message: '您有采购合同待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/PurchaseContractApproval' })
setTimeout(this.noticeContract6.close(), 1000)
},
duration: 1000 * 60
})
}
})
const p1 = new Promise((resolve, reject) => {
initApproval(1, 999, 1).then(res => {
resolve(res)
})
})
const p2 = new Promise((resolve, reject) => {
initApprovalOffline(1, 999, 1).then(res => {
resolve(res)
})
})
Promise.race([p1, p2]).then(res => {
if (res.data.total) {
this.noticeFund = this.$notify.success({
title: '提示',
message: '您有合同请款申请待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/FundApproval2' })
setTimeout(this.noticeFund.close(), 1000)
},
duration: 1000 * 60 * 5
})
}
})
searchTableInvoice(0, null, null, 1, 999, this.token).then(res => {
if (res.data.total) {
this.noticeInvoice = null
this.noticeInvoice = this.$notify.success({
title: '提示',
message: '您有发票结算申请待审批，请及时处理，点击查看',
onClick: () => {
this.$router.push({ path: '/PurchasingCenter/InvoiceSettlementApprove' })
setTimeout(this.noticeInvoice.close(), 1000)
},
duration: 1000 * 60 * 5
})
}
})
},
comfirmUrgentItem() {
console.log(1111)
searchUrgentItem().then(res => {
if (res.data.length > 0) {
this.noticeContractJJ = null
this.noticeContractJJ = this.$notify.success({
title: '提示',
message: '您有加急件未打印，请及时处理',
onClick: () => {
setTimeout(this.noticeContractJJ.close(), 1000)
},
duration: 1000 * 60
})
}
})
},
toggleSideBar() {
this.$store.dispatch('ToggleSideBar')
},

3
src/views/layout/components/Sidebar/SidebarItem.vue
View File

@@ -39,7 +39,6 @@ import { validateURL } from '@/utils/validate'
import Item from './Item'
export default {
inject: ['reload'],
name: 'SidebarItem',
components: { Item },
props: {
@@ -98,8 +97,6 @@ export default {
e.preventDefault()
const path = this.resolvePath(routePath)
this.$router.push(path)
// 关闭标签不缓存 20200220 ZDY 974548
// this.reload()
}
}
}

25
src/views/layout/components/TagsView.vue
View File

@@ -53,17 +53,21 @@ export default {
},
methods: {
// generateTitle, // generateTitle by vue-i18n
// generateRoute() {
// if (this.$route.name) {
// return this.$route
// }
// return false
// },
generateRoute() {
switch (this.$route.name) {
// 生产监控
case 'EquipmentMonitoring':
document.getElementsByClassName('app-main')[0].style.width = '1710px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1710px'
document.getElementById('app-main').style.width = '1710px'
break
case '0': // 补位用（switch至少两个case,否则显示警告）
break
// 默认
default:
document.getElementsByClassName('app-main')[0].style.width = '1380px'
document.getElementsByClassName('main-container')[0].style.minWidth = '1380px'
document.getElementById('app-main').style.width = '1380px'
}
if (this.$route.name) {
return this.$route
@@ -71,9 +75,6 @@ export default {
return false
},
isActive(route) {
if (!this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = true
}
return route.path === this.$route.path || route.name === this.$route.name
},
addViewTags() {
@@ -104,14 +105,8 @@ export default {
if (this.isActive(view)) {
const latestView = views.slice(-1)[0]
if (latestView) {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push(latestView.path)
} else {
if (this.$route.meta.keepAlive) {
this.$route.meta.keepAlive = false
}
this.$router.push('/')
}
}