From 9ce98f78e1c1aa3216688651860d3a3a47c81e59 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 7 Dec 2018 15:31:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/StatusQuery/index.vue | 17 ++++++++--------- .../CreatePackingList/index.vue | 1 + 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 114b821e..aedc91ea 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -27,7 +27,6 @@ 零件号: -
零件状态: - 零件类型: - - - + + + + + + + + 查询 diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 9be6bbab..fe8b0655 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -293,6 +293,7 @@ value-format="yyyy-MM-dd" size="small" type="date" + style="width:200px" placeholder="请选择发货节点"/> From d1695c5d456d2febd8275baa2aa2b7644ab68087 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 7 Dec 2018 15:38:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/StatusQuery/index.vue | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index aedc91ea..47ca1a41 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -99,15 +99,15 @@ - - - + + + + + + + + +
{ - console.log(response.data) for (let i = 0; i < response.data.rows.length; i++) { response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2 if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) { @@ -434,7 +433,6 @@ export default { this.dialogFormVisible3 = false }, handleEdit(row) { - console.log(row) this.title = '编辑' this.partStateValue1 = parseInt(row.考核状态) + 2 this.dialogFormVisible4 = true From fcc2935bf83fc04b999871c232dd6c8431ca9fb5 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Fri, 7 Dec 2018 16:01:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractInformationManagement.js | 15 +- .../ContractInformationManagement/index.vue | 131 +++++++++++++++++- 2 files changed, 137 insertions(+), 9 deletions(-) diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js index 68abed60..c1d14060 100644 --- a/src/api/MarketingCenter/ContractInformationManagement.js +++ b/src/api/MarketingCenter/ContractInformationManagement.js @@ -61,7 +61,7 @@ export function addList() { data: { type: '2', name: '基础表_合同信息表_增加数据', - param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] } }) } @@ -92,7 +92,7 @@ export function editchar() { data: { type: '2', name: '合同信息管理_合同信息_编辑', - param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] } }) } @@ -254,3 +254,14 @@ export function changeExecutionProgressID() { } }) } +export function selectBidBond() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '投标保证金管理_投标保证金查询', + param: '是否收回_check=' + arguments[0] + '&是否收回=' + arguments[1] + '&保金类型_check=' + arguments[2] + '&保金类型=' + arguments[3] + '&投标人_check=' + arguments[4] + '&投标人=' + arguments[5] + '&招标企业_check=' + arguments[6] + '&招标企业=' + arguments[7] + '&开始日期_check=' + arguments[8] + '&开始日期=' + arguments[9] + '&结束日期_check=' + arguments[10] + '&结束日期=' + arguments[11] + } + }) +} diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 2d06d70c..d9661df7 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -37,13 +37,14 @@ :row-key="getRowKeys" :expand-row-keys="expands" style="width: 100%" - height="600" + height="460" border + size="mini" @row-click="fetchExecutionProgressdata" @expand-change="selectMachine">