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-10-25 09:24:44 +08:00
parent ac8079a593
commit 3d02306337
8 changed files with 47 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.0.110:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

@@ -2,40 +2,31 @@
<div class="app-container"> <div class="app-container">
<!--顶栏结构--> <!--顶栏结构-->
<el-card> <el-card>
<!--<el-radio v-model="radio" label="1">未收回</el-radio>--> <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
<!--<el-radio v-model="radio" label="2">已收回</el-radio>--> <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
<span>招标企业:</span>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
<span style="margin-left: 10px">保金类型:</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
<el-option <el-option
v-for="item in TypeOfGoldDeposit" v-for="item in TypeOfGoldDeposit"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">投标人:</span> <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
<el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/> <el-date-picker
<el-row> v-model="startTime"
<span>开始日期: </span> style="width: 150px;margin: 3px 0"
<el-date-picker value-format="yyyy-MM-dd"
v-model="startTime" size="small"
style="width: 200px;margin: 3px 0" type="date"
value-format="yyyy-MM-dd" placeholder="请选择开始日期"/>
size="small" <el-date-picker
type="date" v-model="endTime"
placeholder="请选择开始日期"/> style="width: 150px;"
<span style="margin-left: 10px">结束日期: </span> value-format="yyyy-MM-dd"
<el-date-picker size="small"
v-model="endTime" type="date"
style="width: 200px;" placeholder="请选择结束日期"/>
value-format="yyyy-MM-dd" <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
size="small" <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
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-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
</el-row>
</el-card> </el-card>
<!--投标保证金表格--> <!--投标保证金表格-->

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

@@ -2,32 +2,25 @@
<div> <div>
<el-card> <el-card>
<el-row> <el-row>
<span>项目名称：</span> <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right:5px;width:150px" size="small">
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
<el-option <el-option
v-for="item in entryName" v-for="item in entryName"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">机床型号：</span> <el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/> <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
<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 <el-date-picker
v-model="startTime" v-model="startTime"
style="width: 200px;" style="margin-right:5px;width:150px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
placeholder="请选择开始日期"/> placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
style="width: 200px;" style="width: 150px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"

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

@@ -24,7 +24,7 @@
:expand-row-keys="expands" :expand-row-keys="expands"
:data="tableData1" :data="tableData1"
style="width: 100%;" style="width: 100%;"
height="500px" height="600px"
highlight-current-row highlight-current-row
border border
stripe stripe

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

@@ -2,32 +2,25 @@
<div class="app-container"> <div class="app-container">
<el-card style="background: rgb(233,240,250)"> <el-card style="background: rgb(233,240,250)">
<div> <div>
<span>项目名称：</span> <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
<el-option <el-option
v-for="item in entryName" v-for="item in entryName"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">机床型号：</span> <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/> <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
<span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
</div>
<div style="margin-top: 10px">
<span style="margin-top: 20px">开始日期：</span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
style="width: 200px;" style="width: 150px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
placeholder="请选择开始日期"/> placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
style="width: 200px;margin-bottom: 3px;" style="width: 150px;margin-bottom: 3px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
@@ -44,7 +37,7 @@
:expand-row-keys="expands" :expand-row-keys="expands"
highlight-current-row highlight-current-row
style="width: 100%;margin: 3px 0px" style="width: 100%;margin: 3px 0px"
height="500" height="700"
border border
stripe stripe
size="mini" size="mini"
@@ -146,7 +139,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="发货节点" width="85"> <el-table-column align="center" label="发货节点" width="85">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }} {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="安装调试节点" width="100"> <el-table-column align="center" label="安装调试节点" width="100">

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

@@ -3,30 +3,24 @@
<!--查询条件--> <!--查询条件-->
<el-card> <el-card>
<el-row> <el-row>
<span>项目名称：</span> <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
<el-option <el-option
v-for="item in entryName" v-for="item in entryName"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">营销经理：</span> <el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
<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 <el-date-picker
v-model="startTime" v-model="startTime"
style="width: 200px;" style="margin-right: 5px;width: 150px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
placeholder="请选择开始日期"/> placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
style="width: 200px;" style="width: 150px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
@@ -40,8 +34,8 @@
v-loading="listLoading1" v-loading="listLoading1"
:data="tableData1" :data="tableData1"
highlight-current-row highlight-current-row
style="width: 100%;margin-top: 3px" style="width: 1360px;margin-top: 3px"
height="460" height="550"
border border
stripe stripe
size="mini" size="mini"
@@ -88,7 +82,7 @@
<el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/> <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注"> <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同信息备注 }} {{ scope.row.合同信息备注 }}
</template> </template>

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

@@ -32,8 +32,8 @@
<el-table <el-table
v-loading="listLoading1" v-loading="listLoading1"
:data="tableData1" :data="tableData1"
style="width: 100%;margin-top: 3px;" style="margin-top: 3px;width: 1355px"
height="500" height="600"
border border
stripe stripe
size="mini" size="mini"
@@ -79,12 +79,12 @@
{{ scope.row.电话 }} {{ scope.row.电话 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注"> <el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同信息备注 }} {{ scope.row.合同信息备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="210px"> <el-table-column label="操作" align="center" width="210px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="scope.row.是否禁用增加履约保证金" :disabled="scope.row.是否禁用增加履约保证金"

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

@@ -33,7 +33,7 @@
<el-table <el-table
v-loading="listLoadingProject" v-loading="listLoadingProject"
:data="projectTableData" :data="projectTableData"
style="width: 100%;margin-top: 3px;" style="width: 1360px;margin-top: 3px;"
height="650" height="650"
border border
stripe stripe
@@ -65,7 +65,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="250" show-overflow-tooltip> <el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.客户名称 }} {{ scope.row.客户名称 }}
</template> </template>
@@ -80,7 +80,7 @@
{{ scope.row.电话 }} {{ scope.row.电话 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同信息备注" > <el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同信息备注 }} {{ scope.row.合同信息备注 }}
</template> </template>