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

样式

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,32 +2,19 @@
<div class="app-container">
<el-card>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px " size="small" clearable>
=======
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
<el-badge :value="value" :max="99" class="item">
<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
=======
<span style="margin-left: 10px">销售经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
<el-badge :value="value" :max="99" class="item">
<el-button size="small" type="text" @click="AccountsReceivable">查看收款信息</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</el-badge>
</el-card>
<el-card>
@@ -36,7 +23,6 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
:data="tableData1"
<<<<<<< HEAD
style="width: 100%;"
height="500px"
highlight-current-row
@@ -49,19 +35,6 @@
<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" >
=======
style="width: 100%;max-height: 440px;"
height="280"
highlight-current-row
border
size="mini"
@expand-change="selectMachine"
@row-click="getTableData2">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData3" border style="width: 600px; text-align: center" size="mini">
<el-table-column label="发货单号" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.发货单号 }}
</template>
@@ -79,138 +52,78 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同编号" width="140">
<template slot-scope="scope">
<el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="80" show-overflow-tooltip>
=======
<el-table-column align="center" label="合同编号" width="150">
<template slot-scope="scope">
<el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="已完成进度" width="90">
=======
<el-table-column align="center" label="已完成进度" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.执行进度名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="付款方式" width="80">
=======
<el-table-column align="center" label="付款方式" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.付款方式 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同总金额（万元）" width="130">
=======
<el-table-column align="center" label="合同总金额（万元）" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同总金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="已到账金额（万元）" width="130">
=======
<el-table-column align="center" label="已到账金额（万元）" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.已支付 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="未到账金额（万元）" width="130">
<template slot-scope="scope">
<el-tag size="mini" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
=======
<el-table-column align="center" label="未到账金额（万元）" width="150">
<template slot-scope="scope">
<el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
<el-table-column align="center" label="付款进度" width="150">
<template slot-scope="scope">
<div style="width: 130px">
<<<<<<< HEAD
<el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />
</div>
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" width="70">
=======
<el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" status="success" />
</div>
</template>
</el-table-column>
<el-table-column align="center" label="营销经理" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
=======
<el-table-column align="center" label="客户名称" width="260">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系人" width="60">
=======
<el-table-column align="center" label="联系人" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
=======
<el-table-column align="center" label="联系电话" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
=======
<el-table-column align="center" label="银行账号" width="230">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.银行账号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="税号" show-overflow-tooltip>
=======
<el-table-column align="center" label="税号" width="230">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.税号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="140">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
@@ -237,25 +150,6 @@
</el-table-column>
</el-table>
<div class="block">
=======
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用编辑"
size="mini"
type="warning"
icon="el-icon-edit"
@click.stop="EditTableData(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click.stop="dellist(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40]"
@@ -273,7 +167,6 @@
:row-key="getRowKeys1"
:expand-row-keys="expands1"
:data="tableData2"
<<<<<<< HEAD
style="width: 100%;max-height: 440px;text-align: center"
height="210"
highlight-current-row
@@ -284,17 +177,6 @@
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
=======
style="width: 100%;max-height: 440px; margin-top: 15px; text-align: center"
height="220"
highlight-current-row
border
size="mini"
@expand-change="selectMachine1">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :data="tableData4" border style="width: 600px; text-align: center" size="mini">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
align="center"
label="序号"
@@ -312,7 +194,6 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="250">
<template slot-scope="scope">
<<<<<<< HEAD
<el-tooltip effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
@@ -332,18 +213,6 @@
@click="handleDelete2(scope.row)"/>
</div>
</el-tooltip>
=======
<el-button
size="mini"
type="warning"
icon="el-icon-delete"
@click="handleEdit2(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete2(scope.row)">删除</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -364,33 +233,19 @@
{{ scope.row.已收金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="未收金额（万元）" width="200px">
=======
<el-table-column align="center" label="未收金额（万元）" width="180px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="转下阶段收款金额" width="200px">
=======
<el-table-column align="center" label="转下阶段收款金额" width="180px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.转下阶段金额 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="收款阶段" width="200px">
<template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
=======
<el-table-column align="center" label="收款阶段" width="180px">
<template slot-scope="scope">
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="small" @change="changeTime(scope.row)">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in plannedTime"
:key="item.value"
@@ -399,7 +254,6 @@
</el-select>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="截止时间" width="200px">
<template slot-scope="scope">
<span>后</span>
@@ -408,16 +262,6 @@
</template>
</el-table-column>
<el-table-column align="center" label="状态" >
=======
<el-table-column align="center" label="截止时间" width="180px">
<template slot-scope="scope">
<span>后</span>
<el-input v-model="scope.row.提前x天提醒" size="small" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
<span>天内完成</span>
</template>
</el-table-column>
<el-table-column align="center" label="状态" width="100px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-popover
placement="top-start"
@@ -441,7 +285,6 @@
</el-popover>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" fixed="right" align="center" width="140">
<template slot-scope="scope">
<el-tooltip effect="dark" content="收款" placement="top">
@@ -471,38 +314,6 @@
</el-card>
<!--新增合同资金对话框-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
=======
<el-table-column label="操作" fixed="right" align="center" width="220">
<template slot-scope="scope">
<el-button
:disabled="scope.row.是否禁用收款"
size="mini"
type="warning"
icon="el-icon-edit"
@click="handleEdit1(scope.row);flag=1">收款</el-button>
<el-button
:disabled="scope.row.是否禁用"
size="mini"
type="danger"
icon="el-icon-sort"
@click="TransferPlan(scope.row)">收款转移</el-button>
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="PageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="PageSize2"
:total="total2"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<!--新增合同资金对话框-->
<el-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
@@ -526,11 +337,7 @@
</div>
</el-dialog>
<!--编辑合同资金对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form2" :model="form2" :rules="rules" label-position="left">
<el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
<el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
@@ -554,11 +361,7 @@
</div>
</el-dialog>
<!--付款对话框-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form" :model="form" :rules="rules1" label-position="left">
<el-form-item label="项目名称" prop="EntryName" label-width="100px">
<el-input v-model="form.EntryName" :disabled="true" size="small" placeholder="请输入项目名称"/>
@@ -596,17 +399,10 @@
</div>
</el-dialog>
<!--营销经理选择-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
=======
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" @click="searchName">查询</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
@@ -616,11 +412,7 @@
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px">
<<<<<<< HEAD
<el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
=======
<el-table :data="dataPeople" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column label="销售经理" align="center" >
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -639,11 +431,7 @@
</div>
</el-dialog>
<!--编辑批次资金-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
=======
<el-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form3" :model="form3" :rules="rules2" label-position="left">
<el-form-item label="本次收款金额" prop="本次付款" label-width="110px">
<el-input-number v-model="form3.本次付款" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -664,11 +452,7 @@
</div>
</el-dialog>
<!--转移收款-->
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
=======
<el-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form ref="form4" :model="form4" :rules="rules3" label-position="left">
<el-form-item label="转移金额" prop="转移金额" label-width="110px">
<el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -689,24 +473,14 @@
</div>
</el-dialog>
<<<<<<< HEAD
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" width="60%" >
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
<el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
=======
<el-dialog :visible.sync="AccountsReceivableVisible" width="60%">
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border>
<el-table-column property="date" label="项目名称" width="200" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="name" label="客户名称" align="center" show-overflow-tooltip>
=======
<el-table-column property="name" label="客户名称" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -716,11 +490,7 @@
{{ scope.row.联系人 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="date" label="联系电话" align="center" width="200px" show-overflow-tooltip>
=======
<el-table-column property="date" label="联系电话" align="center" width="120px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
@@ -740,7 +510,6 @@
{{ scope.row.状态 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column property="date" label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="立即收款" placement="top">
@@ -762,18 +531,6 @@
@click="Never(scope.row)"/>
</div>
</el-tooltip>
=======
<el-table-column property="date" label="操作" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="success"
@click="Detail(scope.row)">立即收款</el-button>
<el-button
size="mini"
type="danger"
@click="Never(scope.row)">不再提醒</el-button>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
</template>
</el-table-column>
</el-table>
@@ -1076,11 +833,7 @@ export default {
},
handleEdit2(row) {
this.editForm(row, 'form3')
<<<<<<< HEAD
this.title = '编辑阶段收款'
=======
this.title = '修改阶段收款'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.max1 = parseFloat(this.max2) + parseFloat(row.本次收款金额)
this.dialogFormVisible3 = true
this.form3.本次付款 = row.本次收款金额
@@ -1467,11 +1220,7 @@ export default {
handleEdit1(row) {
this.addForm('form3')
this.changeTime1()
<<<<<<< HEAD
this.title = '收款'
=======
this.title = '阶段记录收款'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
this.dialogFormVisible3 = true
this.id = row.批次资金id
@@ -1936,33 +1685,22 @@ export default {
</script>
<style scoped>
<<<<<<< HEAD
/*.el-card {*/
/* !*margin-top: 15px;*!*/
/*}*/
=======
.el-card {
margin-top: 15px;
}
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
.el-date-editor{
width:237px;
}
.item {
float: right;
<<<<<<< HEAD
margin: 3px;
=======
margin-top: 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
margin-right: 40px;
}
.el-table td, .el-table th.is-leaf,
.el-radio__inner,
.el-input__inner{
border: 1px solid black!important;
<<<<<<< HEAD
width: 150px;
white-space: nowrap;
overflow: hidden;
@@ -1986,7 +1724,5 @@ export default {
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
</style>