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

发货记录

Browse Source
This commit is contained in:
bryan sun
2019-11-14 17:15:07 +08:00
parent 13bdb7dfa6
commit 48f697fd77
10 changed files with 335 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/api/MarketingCenter/MarginManagement.js Normal file
View File

6
src/api/MarketingCenter/PerformanceBond.js
View File

@@ -10,14 +10,14 @@ export function initProject() {
}
})
}
export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) {
export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '合同信息管理_履约保证金_合同信息统计_查询',
param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date',
name: '合同信息管理_履约保证金_合同信息统计_查询_新',
param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string',
Pagination: pageCurrent + '&' + pageSize
}
})

6
src/api/MarketingCenter/SafetyMargin.js
View File

@@ -112,14 +112,14 @@ export function TakeBack() {
}
})
}
export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6) {
export function searchTableDataProject(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '合同信息管理_安全保证金_合同信息统计_查询',
param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date',
name: '合同信息管理_安全保证金_合同信息统计_查询_新',
param: '项目流水号=' + num1 + '=int&项目流水号_check=' + num2 + '=int&开始日期_check=' + num3 + '=int&结束日期_check=' + num4 + '=int&开始日期=' + num5 + '=date&结束日期=' + num6 + '=date&客户名称_check=' + num7 + '=int&客户名称=' + num8 + '=string',
Pagination: pageCurrent + '&' + pageSize
}
})

25
src/api/MarketingCenter/ShippingInquiries.js Normal file
View File

@@ -0,0 +1,25 @@
import request from '@/utils/request'
export function InvoiceListSearch() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单_发货单列表_查询',
param: '发货单号=' + arguments[0] + '\\&收货单位=' + arguments[1] + '\\&发货单名_check=0\\&发货单号_check=' + arguments[2] + '\\&收货单位_check=' + arguments[3] + '\\&车辆牌号_check=0\\&司机姓名_check=0\\&司机电话_check=0\\&制单人_check=0\\&核准人_check=0\\&执行人_check=0\\&开始制单日期_check=0\\&结束制单日期_check=0\\&开始核准日期_check=0\\&结束核准日期_check=0\\&开始发货日期_check=0\\&结束发货日期_check=0'
}
})
}
export function DetailsFeach() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '发货管理_发货申请_发货单明细_查询',
param: '发货单流水号=' + arguments[0]
}
})
}

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

@@ -3,28 +3,28 @@
<!--顶栏结构-->
<el-card>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
<el-option
v-for="item in TypeOfGoldDeposit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
<el-date-picker
v-model="startTime"
style="width: 150px;margin: 3px 0"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<el-date-picker
v-model="endTime"
style="width: 150px;"
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择结束日期"/>
<!-- <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">-->
<!-- <el-option-->
<!-- v-for="item in TypeOfGoldDeposit"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>-->
<!-- <el-date-picker-->
<!-- v-model="startTime"-->
<!-- style="width: 150px;margin: 3px 0"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择开始日期"/>-->
<!-- <el-date-picker-->
<!-- v-model="endTime"-->
<!-- style="width: 150px;"-->
<!-- 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-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-card>
@@ -254,7 +254,7 @@
</el-dialog>
<!--投标保证金对话框-->
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="80%">
<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-row>
<el-col :span="12">

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

@@ -37,8 +37,8 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
highlight-current-row
style="width: 100%; margin-top: 3px"
height="500"
style="width: 75%; margin-top: 3px"
height="700"
border
stripe
size="mini"

35
src/views/MarketingCenter/MarginManagement/index.vue Normal file
View File

@@ -0,0 +1,35 @@
<template>
<div class="app-container">
<el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card">
<el-tab-pane label="投标保证金" name="投标保证金">
<BidBond/>
</el-tab-pane>
<el-tab-pane label="履约保证金" name="履约保证金">
<PerformanceBond/>
</el-tab-pane>
<el-tab-pane label="安全保证金" name="安全保证金">
<SafetyMargin/>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import BidBond from '@/views/MarketingCenter/BidBond'
import PerformanceBond from '@/views/MarketingCenter/PerformanceBond'
import SafetyMargin from '@/views/MarketingCenter/SafetyMargin'
export default {
components: {
BidBond, PerformanceBond, SafetyMargin
},
data() {
return {
tabName: '投标保证金'
}
}
}
</script>
<style scoped>
</style>

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

@@ -9,22 +9,23 @@
:label="item.label"
:value="item.value"/>
</el-select>
<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-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
<!-- <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-card>
@@ -260,7 +261,7 @@
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="70%">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" 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-row>
<el-col :span="12">
@@ -352,6 +353,8 @@ export default {
dialogImageUrl: '',
fileList: [],
performanceGuaranteeShow: true,
customerName_check: '',
customerName: '', // 客户名称
form: {
实际收回日期: ''
},
@@ -402,8 +405,13 @@ export default {
} else {
this.endTime_check = 1
}
if (this.customerName === '' || this.customerName === null) {
this.customerName_check = 0
} else {
this.customerName_check = 1
}
this.listLoading1 = true
searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
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 => {
this.tableData2 = []
this.listLoading1 = false
const data = response.data

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

@@ -10,22 +10,23 @@
:label="item.label"
:value="item.value"/>
</el-select>
<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-input v-model="customerName" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入客户名称"/>
<!-- <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="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
</el-card>
@@ -541,6 +542,8 @@ export default {
}
}
return {
customerName: '',
customerName_check: '',
pickerOptions: {},
pickerOptions1: {},
pickerOptions2: {},
@@ -693,8 +696,13 @@ export default {
} else {
this.endTime_check = 1
}
if (this.customerName === '' || this.customerName === null) {
this.customerName_check = 0
} else {
this.customerName_check = 1
}
this.listLoadingProject = true
searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => {
this.tableData1 = []
this.tableData2 = []
this.listLoadingProject = false

193
src/views/MarketingCenter/ShippingInquiries/index.vue Normal file
View File

@@ -0,0 +1,193 @@
<template>
<div>
<el-card>
<el-input v-model="invoiceNumber" placeholder="请输入发货单号" clearable style="width: 150px;margin-right: 10px" size="mini"/>
<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>
<el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 10px" @click="openSearch">查询</el-button>
<el-table
:data="tableDataSearchList"
highlight-current-row
style="width: 100%; max-height: 500px"
border
size="mini"
@row-click="searchListItem">
<el-table-column align="center" label="状态" width="60">
<template slot-scope="scope">
{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}
</template>
</el-table-column>
<el-table-column align="center" label="发货单号" width="120px">
<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 align="center" label="收货单位" width="180px">
<template slot-scope="scope">
{{ scope.row.收货单位 }}
</template>
</el-table-column>
<el-table-column align="center" label="收货地址" width="150px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.收货地址 }}
</template>
</el-table-column>
<el-table-column align="center" label="收货人员" width="80">
<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 align="center" label="车辆牌号" width="140px">
<template slot-scope="scope">
{{ scope.row.车辆牌号 }}
</template>
</el-table-column>
<el-table-column align="center" label="司机姓名" width="80">
<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 align="center" label="制单人">
<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 align="center" label="发货人">
<template slot-scope="scope">
{{ scope.row.发货人 }}
</template>
</el-table-column>
<el-table-column align="center" label="制单时间" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.操作日期 === null"/>
<span v-else>{{ scope.row.操作日期.substr(0,10) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="审核时间">
<template slot-scope="scope">
<span v-if="scope.row.审核日期 === null"/>
<span v-else>{{ scope.row.审核日期.substr(0,10) }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="发货时间">
<template slot-scope="scope">
<span v-if="scope.row.发出时间 === null"/>
<span v-else>{{ scope.row.发出时间.substr(0,10) }}</span>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table
v-loading="listLoading"
:data="tableData"
highlight-current-row
style="width: 100%"
height="560"
border
size="mini">
<el-table-column align="center" label="货品类别" width="80">
<template slot-scope="scope">
<el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="货品编号">
<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 align="center" label="货品规格">
<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 align="center" label="数量" width="130">
<template slot-scope="scope">
<template v-if="disabledPick === false">
<el-input-number v-model="scope.row.数量" :min="1" label="描述文字" size="mini" controls-position="right" style="width:100px" @change="handleChange"/>
</template>
<template v-else>
{{ scope.row.数量 }}
</template>
</template>
</el-table-column>
<el-table-column align="center" label="设计者" width="80">
<template slot-scope="scope">
{{ scope.row.设计者 }}
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import { InvoiceListSearch, DetailsFeach } from '@/api/MarketingCenter/ShippingInquiries'
export default {
data() {
return {
tableDataSearchList: [],
invoiceNumber: '',
receivingUnit: '',
invoiceNumber_check: '',
receivingUnit_check: '',
listLoading: '',
tableData: []
}
},
created() {
this.openSearch()
},
methods: {
openSearch() {
this.tableDataSearchList = []
this.invoiceNumber !== null && this.invoiceNumber !== '' ? this.invoiceNumber_check = 1 : this.invoiceNumber_check = 0
this.receivingUnit !== null && this.receivingUnit !== '' ? this.receivingUnit_check = 1 : this.receivingUnit_check = 0
InvoiceListSearch(this.invoiceNumber, this.receivingUnit, this.invoiceNumber_check, this.receivingUnit_check).then(response => {
if (response.data.length !== 0) {
console.log(response)
this.tableDataSearchList = response.data
}
})
},
searchListItem(row) {
DetailsFeach(row.发货单流水号).then(response => {
this.tableData = response.data
})
}
}
}
</script>
<style scoped>
</style>