qqq
This commit is contained in:
@@ -1,35 +1,39 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin: 3px" size="small">
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">机床型号:</span>
|
||||
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
|
||||
<span style="margin-left: 10px">开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期:</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
<el-row>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">机床型号:</span>
|
||||
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期:</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
@@ -40,7 +44,7 @@
|
||||
:expand-row-keys="expands"
|
||||
highlight-current-row
|
||||
style="width: 100%; margin-top: 3px"
|
||||
height="600"
|
||||
height="500"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
{{ scope.row.税号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -192,7 +192,7 @@
|
||||
{{ scope.row.本次收款时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="250">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -222,28 +222,28 @@
|
||||
align="center"
|
||||
label="付款批次"
|
||||
type="index"
|
||||
width="150"/>
|
||||
<el-table-column align="center" label="应收金额(万元)" width="180px">
|
||||
width="70"/>
|
||||
<el-table-column align="center" label="应收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.应收金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="已收金额(万元)" width="180px">
|
||||
<el-table-column align="center" label="已收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.已收金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="未收金额(万元)" width="200px">
|
||||
<el-table-column align="center" label="未收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="转下阶段收款金额" width="200px">
|
||||
<el-table-column align="center" label="转下阶段收款金额" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.转下阶段金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收款阶段" width="200px">
|
||||
<el-table-column align="center" label="收款阶段" width="169px">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
|
||||
<el-option
|
||||
@@ -254,7 +254,7 @@
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="截止时间" width="200px">
|
||||
<el-table-column align="center" label="截止时间" width="156px">
|
||||
<template slot-scope="scope">
|
||||
<span>后</span>
|
||||
<el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
|
||||
@@ -285,7 +285,7 @@
|
||||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="收款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -473,7 +473,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" width="60%" >
|
||||
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" title="查看收款信息" center width="65%">
|
||||
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
|
||||
<el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
@@ -510,7 +510,7 @@
|
||||
{{ scope.row.状态 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="date" label="操作" align="center" width="150px">
|
||||
<el-table-column property="date" label="操作" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="立即收款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card>
|
||||
@@ -41,14 +41,14 @@
|
||||
:row-key="getRowKeys"
|
||||
:expand-row-keys="expands"
|
||||
style="width: 100%"
|
||||
height="700"
|
||||
height="460"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@expand-change="selectMachine">
|
||||
<el-table-column type="expand" label="详情">
|
||||
<template slot-scope="scope">
|
||||
<el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
|
||||
<el-table :data="tableData2" class="" border stripe style="width: 612px; text-align: center" size="mini">
|
||||
<el-table-column label="设备型号" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
@@ -68,12 +68,12 @@
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="editMachine(scope.row);flag = 2">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="deleteMachine(scope.row)">删除</el-button>
|
||||
</template>
|
||||
@@ -88,7 +88,7 @@
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="项目名称" width="150">
|
||||
<el-table-column align="center" label="项目名称" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
@@ -98,7 +98,7 @@
|
||||
{{ scope.row.合同签订日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同信息备注" width="150">
|
||||
<el-table-column align="center" label="合同信息备注" min-width="200">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
@@ -108,16 +108,19 @@
|
||||
<el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
plain
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click.stop="handleEdit(scope.row)">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
@click.stop="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
@@ -135,7 +138,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
<!--新增合同信息对话框-->
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
|
||||
<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="140px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
@@ -172,8 +175,7 @@
|
||||
<el-button type="primary" @click="submit('form')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
|
||||
<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 v-show="flag != 2" label="项目名称" prop="项目名称">
|
||||
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>
|
||||
|
||||
@@ -278,12 +278,12 @@
|
||||
style="width: 795px;margin-right: 10px"
|
||||
clearable/>
|
||||
</div>
|
||||
<el-divider content-position="right"><el-button :disabled="disabledPick" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
|
||||
<el-divider content-position="right"><el-button :disabled="disabledPick" size="mini" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData"
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
style="width: 100%;margin-top: 20px"
|
||||
height="560"
|
||||
border
|
||||
size="mini">
|
||||
@@ -327,7 +327,7 @@
|
||||
{{ scope.row.设计者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="disabledDetailsDelete"
|
||||
@@ -503,7 +503,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="dialogFormVisibleSearch" center style="min-height: 700px" width="95%">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleSearch" center style="height: 600px" width="98%">
|
||||
<div>
|
||||
<el-table
|
||||
:data="tableDataSearchList"
|
||||
|
||||
@@ -2,33 +2,37 @@
|
||||
<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>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
|
||||
<span style="margin-left: 10px">开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期:</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
<el-row>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期:</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<!--项目表格-->
|
||||
<el-card>
|
||||
@@ -89,7 +93,7 @@
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@@ -174,7 +178,7 @@
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
v-loading="listLoading1"
|
||||
:data="tableData1"
|
||||
style="width: 100%;margin-top: 3px;"
|
||||
height="600"
|
||||
height="500"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -84,7 +84,7 @@
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="300px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="210px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="scope.row.是否禁用增加履约保证金"
|
||||
|
||||
Reference in New Issue
Block a user