From 76fcd76bd29a5945f6f51f815fc289df40fd1f1a Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 08:02:25 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 58 +++++++++++++-------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 7d9a2f97..38cde6c8 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -41,63 +41,43 @@
超级管理员 - 账号：1001 - 密码：1001 + 账号：0000 + 密码：admin
- 采购管理员 - 账号：6201 - 密码：6201 + 营销中心 + 账号：2001 + 密码：2001
- 外协管理员 - 账号：1003 - 密码：1003 -
-
- 车间计划管理员 - 账号：2002 - 密码：2002 -
-
- 技术中心管理员 + 技术中心 账号：3001 密码：3001
- 库存管理员 - 账号：3002 - 密码：3002 -
-
- 营销中心管理员 + 制造中心 账号：4001 密码：4001
- 财务总监 - 账号：7001 - 密码：7001 + 采购部 + 账号：4101 + 密码：4101
- 出纳 - 账号：7002 - 密码：7002 + 仓库 + 账号：4201 + 密码：4201
- 会计 - 账号：7003 - 密码：7003 + 金工车间 + 账号：4301 + 密码：4301
- 总经理 - 账号：1002 - 密码：1002 -
-
- 工艺定额员 - 账号：6301 - 密码：6301 + 装配车间 + 账号：4401 + 密码：4401
From 4c4d7d00a6334d7c04f47d5fd851fb3b270583b3 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 12:11:11 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicData/WorkshopProcessMaintenance.js | 5 +- .../WorkshopEquipmentManagement.js | 2 +- .../WorkshopProcessMaintenance/index.vue | 3 +- .../WorkshopEquipmentManagement/index.vue | 59 +++++++++++-------- 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/api/BasicData/WorkshopProcessMaintenance.js b/src/api/BasicData/WorkshopProcessMaintenance.js index 07e1f574..8d6dcc09 100644 --- a/src/api/BasicData/WorkshopProcessMaintenance.js +++ b/src/api/BasicData/WorkshopProcessMaintenance.js @@ -1,13 +1,12 @@ import request from '@/utils/request' // 查工艺分类名称 -export function searchProcessClassification(ProcessClassification) { +export function searchProcessClassification() { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_基础表_工艺分类名称_查询数据', - param: '工艺分类名称=' + ProcessClassification + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据' } }) } diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js index d24ecf3d..1c57210f 100644 --- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js +++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js @@ -30,7 +30,7 @@ export function addTable(equipmentName, equipmentModel, performance, processingC data: { type: '2', name: '设备管理_设备加工能力_增加数据_设备维护New', - param: '设备名称=' + equipmentName + '=string&设备型号=' + equipmentModel + '=string&设备性能指标=' + performance + '= string&设备加工能力工时=' + processingCapacity + '=string&设备工时系数=' + workingTimeFactor + '=string&工艺名称简称=' + processName + '=string&工艺编号=' + processNumber + '=string&班次类型=' + shift + '= string&整改工时系数=' + reorganizationTimeFactor + '=string&设备编号=' + equipmentNumber + '=string&预留工时系数=' + reservedTimeFactor + param: '设备名称=' + equipmentName + '&设备型号=' + equipmentModel + '&设备性能指标=' + performance + '&设备加工能力工时=' + processingCapacity + '&设备工时系数=' + workingTimeFactor + '&工艺名称简称=' + processName + '&工艺编号=' + processNumber + '&班次类型=' + shift + '&整改工时系数=' + reorganizationTimeFactor + '&设备编号=' + equipmentNumber + '&预留工时系数=' + reservedTimeFactor } }) } diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index 23add9cb..21f77eb7 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -242,13 +242,14 @@ export default { methods: { searchProcessClassification() { this.loading1 = true - searchProcessClassification(this.ProcessClassification).then(response => { + searchProcessClassification().then(response => { this.loading1 = false this.tableData1 = response.data this.total1 = response.data return this.tableData1 }).then(data => { this.Num = data + this.max = [] for (let i = 0; i < this.Num.length; i++) { this.max.push(this.Num[i].工艺分类流水号) } diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index c3a6fafa..80447156 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -98,18 +98,6 @@ - - - - - - - - - - - - @@ -122,7 +110,19 @@ - + + + + + + + + + + + + + @@ -140,7 +140,7 @@ - + @@ -200,12 +200,12 @@ export default { 设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }], 设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }], 设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }], - 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }], - 设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }], - 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }], - 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }], - 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }], - 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }] + 设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }] + // 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }], + // 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }], + // 设备工时系数: [{ required: true, message: '请选择设备工时系数', change: 'blur' }], + // 整改工时系数: [{ required: true, message: '请选择整改工时系数', change: 'blur' }], + // 预留工时系数: [{ required: true, message: '请选择预留工时系数', change: 'blur' }] } } }, @@ -241,9 +241,20 @@ export default { if (this.$refs['form'] !== undefined) { this.$refs['form'].resetFields() } - this.dialogFormVisible = true this.title = '增加' - this.form = {} + this.form = { + 设备名称: '', + 设备编号: '', + 设备型号: '', + 设备加工工艺: '' + } + this.form.设备性能指标 = 1 + this.form.设备加工能力 = 1 + this.form.班次类型 = 1 + this.form.设备工时系数 = 1 + this.form.整改工时系数 = 1 + this.form.预留工时系数 = 1 + this.dialogFormVisible = true }, handleEdit(row) { if (this.$refs['form'] !== undefined) { @@ -268,10 +279,8 @@ export default { if (valid) { if (this.title === '增加') { this.submitAdd() - this.title = '' } else if (this.title === '编辑') { this.submitEdit() - this.title = '' } } }) @@ -290,6 +299,7 @@ export default { type: 'success' }) this.dialogFormVisible = false + this.title = '' this.fetchData() } else { this.$message.error('信息添加失败') @@ -305,6 +315,7 @@ export default { type: 'success' }) this.dialogFormVisible = false + this.title = '' this.fetchData() } else { this.$message.error('信息编辑失败') From a374973e1de1738adf850db461bbc85d912a6887 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 14:45:40 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessPlanning.js | 2 +- src/api/ManufacturingCenter/ProcessTaskAssignment.js | 2 +- src/api/ManufacturingCenter/QuotaFormulation.js | 2 +- src/views/BasicData/WorkshopProcessMaintenance/index.vue | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 9fb095b0..b150f8e4 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 5c9d3372..2a897c9b 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -129,7 +129,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17=int' + param: '考核部门编号=9' } }) } diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/api/ManufacturingCenter/QuotaFormulation.js index 8a37fcc0..04062dbc 100644 --- a/src/api/ManufacturingCenter/QuotaFormulation.js +++ b/src/api/ManufacturingCenter/QuotaFormulation.js @@ -32,7 +32,7 @@ export function getPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17=int' + param: '考核部门编号=9' } }) diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index 21f77eb7..e6f8982c 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -102,7 +102,6 @@ - From 48a37d75844df34216a9d6ab34285a7928b0c086 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 14:56:13 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/QuotaFormulation/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index fe1f2ecf..d0a01fde 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -308,6 +308,7 @@ export default { numm: response.data[i].工艺计划流水号 }) } + this.listLoading = false } }) }) From 581827a4b28fcc83c9faab68ba9ceff9a4eaa01f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 15:37:29 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index b92cd5a1..70de676c 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -113,12 +113,12 @@ - + - + From 4d10a5d56eb1ccbf656c91244992f8526c60b6df Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 16:06:57 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/PreorderAssociation/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 70de676c..03764682 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -266,14 +266,14 @@ export default { }, // 修改外协状态 edit(index, row) { + this.count = 0 for (let i = 0; i < this.tableData2.length; i++) { if (this.checkBox[i] === false) { this.count = this.count + 1 } } if (this.count === this.tableData2.length) { - edit2(row.工序流水号, row.工艺计划流水号, 0).then(response => { - }) + edit2(row.工序流水号, row.工艺计划流水号, 0) } if (this.checkBox[index] === true) { this.InOut = 2 From 8437cf2a8109b21892381197f29abd939dcf959b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 17:08:03 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 5133f0e9..f043dcba 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -609,7 +609,7 @@ export default { this.form.完成时间 = '' this.form.人员 = '' this.form.考勤编号 = '' - if (this.worker[index][a] !== '请选择') { + if (this.worker[index][a] !== '超级管理员') { this.midd = 1 this.form.人员 = this.worker[index][a] } From ab1380147d54db208d9ecaf72106748bd08365e5 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 17:11:04 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=A0=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessingStatus.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js index f77b1134..e445996c 100644 --- a/src/api/ManufacturingCenter/ProcessingStatus.js +++ b/src/api/ManufacturingCenter/ProcessingStatus.js @@ -43,7 +43,6 @@ export function getTable(stepNumber, a, b, c, d, e, f, g, i, pageCurrent, pageSi data: { type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程', - // param: '项目流水号_check=0=string&项目流水号=428=string&机床流水号_check=0=string&机床流水号=8903=string&组件流水号_check=1=string&组件流水号=39539=string&零件图号_check=0=string&零件图号=0=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=string', param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int', Pagination: pageCurrent + '&' + pageSize } From 09ad7c304ebbf3adaee6eee04d37ed74a69205b5 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 6 Dec 2018 17:19:42 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E9=A2=84=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Outsourcing/InterBudgetaryBudgets/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 999b803b..5595bd25 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -281,7 +281,6 @@ export default { this.tableData = [] if (this.radio === 1) { searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => { - console.log(response.data) this.tableData2 = response.data.rows this.total2 = response.data.total }).then(() => { From b73e85447f6370ac935abc85a07be23a53286ea9 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Thu, 6 Dec 2018 19:54:59 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractInformationManagement.js | 19 ++- .../ContractInformationManagement/index.vue | 109 +++++++++++++++--- 2 files changed, 107 insertions(+), 21 deletions(-) diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js index 4bc92b69..68abed60 100644 --- a/src/api/MarketingCenter/ContractInformationManagement.js +++ b/src/api/MarketingCenter/ContractInformationManagement.js @@ -20,14 +20,14 @@ export function initMarketingManager() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { return request({ url: '', method: 'post', data: { type: '1', name: '合同信息管理_合同信息_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date', Pagination: pageCurrent + '&' + pageSize } }) @@ -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] + 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] } }) } @@ -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] + 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] } }) } @@ -243,3 +243,14 @@ export function money() { } }) } +export function changeExecutionProgressID() { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '创建合同_改变执行进度', + param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1] + } + }) +} diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 053e523d..2d06d70c 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -1,7 +1,7 @@ + + + @@ -377,6 +383,7 @@ export default { this.MachineDrawingValue ? this.MachineCode_check = 1 : this.MachineCode_check = 0 this.TeamValue ? this.TeamCode_check = 1 : this.TeamCode_check = 0 this.PartDrawing ? this.PartDrawing_check = 1 : this.PartDrawing_check = 0 + this.tableData2 = [] this.getTable(TableDataSelect, [this.ProjectCode_check, this.ProjectNameValue, this.MachineCode_check, this.MachineDrawingValue, this.TeamCode_check, this.TeamValue, this.ComponentPartsBasicCattleTaxNumber_check, this.ComponentPartsBasicCattleTaxNumber, this.CutCode_check, this.CutCode, this.CutCodeBefore_check, this.CutCodeBefore, this.Assess_check, this.Assess, this.PartDrawing_check, this.PartDrawing, this.currentPage1, this.pageSize1], ['tableData', 'total1', 'loading']) }, fetchTableData2(row) { 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 12/14] =?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 13/14] =?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 14/14] =?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">