diff --git a/src/api/MarketingCenter/MarginManagement.js b/src/api/MarketingCenter/MarginManagement.js new file mode 100644 index 00000000..e69de29b diff --git a/src/api/MarketingCenter/PerformanceBond.js b/src/api/MarketingCenter/PerformanceBond.js index aa498530..be422e34 100644 --- a/src/api/MarketingCenter/PerformanceBond.js +++ b/src/api/MarketingCenter/PerformanceBond.js @@ -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 } }) diff --git a/src/api/MarketingCenter/SafetyMargin.js b/src/api/MarketingCenter/SafetyMargin.js index d2d5f1bc..e1007914 100644 --- a/src/api/MarketingCenter/SafetyMargin.js +++ b/src/api/MarketingCenter/SafetyMargin.js @@ -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 } }) diff --git a/src/api/MarketingCenter/ShippingInquiries.js b/src/api/MarketingCenter/ShippingInquiries.js new file mode 100644 index 00000000..71898ec7 --- /dev/null +++ b/src/api/MarketingCenter/ShippingInquiries.js @@ -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] + } + }) +} diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue index 99585555..ce745441 100644 --- a/src/views/MarketingCenter/BidBond/index.vue +++ b/src/views/MarketingCenter/BidBond/index.vue @@ -3,28 +3,28 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + 查询 新增 @@ -254,7 +254,7 @@ - + diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index e0cbc807..bf43cc6b 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -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" diff --git a/src/views/MarketingCenter/MarginManagement/index.vue b/src/views/MarketingCenter/MarginManagement/index.vue new file mode 100644 index 00000000..9e485603 --- /dev/null +++ b/src/views/MarketingCenter/MarginManagement/index.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 02767b01..d8ed31e9 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -9,22 +9,23 @@ :label="item.label" :value="item.value"/> - 开始日期： - - 结束日期： - + + + + + + + + + + + + + + + + + 查询 @@ -260,7 +261,7 @@ - + @@ -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 diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue index 817428a9..2f28cc6d 100644 --- a/src/views/MarketingCenter/SafetyMargin/index.vue +++ b/src/views/MarketingCenter/SafetyMargin/index.vue @@ -10,22 +10,23 @@ :label="item.label" :value="item.value"/> - 开始日期： - - 结束日期： - + + + + + + + + + + + + + + + + + 查询 @@ -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 diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue new file mode 100644 index 00000000..88e56a4c --- /dev/null +++ b/src/views/MarketingCenter/ShippingInquiries/index.vue @@ -0,0 +1,193 @@ + + + + +