From 0c2c9981aa2e65401ded5bddfa68c44e84ef10e9 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 28 Oct 2019 11:53:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessPlanningNew/index.vue | 466 +++++++++++++++--- .../ProcessQuotaEstablishment/index.vue | 3 - 2 files changed, 406 insertions(+), 63 deletions(-) diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index 8eb8efec..fe7a4af9 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -30,28 +30,182 @@ 是否核准 保存 + 关闭 + 展开 + +
+ 种       类: + + 零件名称: + + 规格: + + 投产总数量: + + 物料: + + + + + + +
+
+ + + 物料类型: + + + + + + 直      径: + + 长度: + + 计算重量 + 重量: + + + + 合并生产 + + + + 长: + + 宽: + + 厚: + + 计算重量 + + 重量: + + + + + + + 对边宽: + + 长度: + + 计算重量 + + 重量: + + + + + + + 边宽: + + 边厚: + + 长度: + + 计算重量 + + 重量: + + + + + + + 壁厚: + + 外径: + + 长度: + + 计算重量 + + 重量: + + + + + + +
+ + 输入数值: + + 选择参数: + + + + 公差: + + 计算公差 + + 粘贴 + + 原有 + + + 完艺 + + 删除 + + + 复制并保存 + + 保存 + + + 记录修改备注 + +
符号： + ∮ + ° + # + □ + ± + × + Ⅰ + Ⅱ + Ⅲ + ⊥ + ％ + ■ + ∠ + mm + ◎ + ○ + δ + μm + ／ + ◇ + () +
+ - + - + - + - - - - + @@ -180,6 +539,7 @@ export default { }, data() { return { + isShowN: false, defaultProps: { children: 'children', label: 'label' @@ -357,9 +717,11 @@ export default { methods: { onClick(num) { if (this.partNumValue) { - editGongyi(this.partNumValue, num.value).then(response => { - this.searchDetail() - }) + if (num.father === false) { + editGongyi(this.partNumValue, num.value).then(response => { + this.searchDetail() + }) + } } }, getTreeData() { @@ -369,6 +731,7 @@ export default { this.options.push({ label: response.data[i].工艺分类名称, value: response.data[i].工艺分类流水号, + father: true, children: [] }) } @@ -379,7 +742,8 @@ export default { for (let j = 0; j < response.data.length; j++) { firstLevel.children.push({ label: response.data[j].工艺名称, - value: response.data[j].工艺编号 + value: response.data[j].工艺编号, + father: false }) } }) @@ -463,26 +827,14 @@ export default { } }, singleChange(row) { - singleChange(row.工序流水号, row.单件定额工时).then(response => { - if (response.data[0].result === '1') { - this.$message.success('单件定额编辑成功') - } else { - this.$message.error('单件定额编辑失败') - } - }) + singleChange(row.工序流水号, row.单件定额工时) }, readyChange(row) { - readyChange(row.工序流水号, row.准结定额工时).then(response => { - if (response.data[0].result === '1') { - this.$message.success('准结定额编辑成功') - } else { - this.$message.error('准结定额编辑失败') - } - }) + readyChange(row.工序流水号, row.准结定额工时) }, saveWeight() { if (this.partNumValue === '' || this.material === '') { - this.$message.error('请选择一个零件') + this.$message.error('请选择一个零件或物料') } else { saveWeight(this.partNumValue, this.weight).then(response => { if (response.data[0].result === '1') { @@ -1182,20 +1534,8 @@ export default { if (this.partNumValue === '') { this.$message.error('请先选择一个零件') } else { - this.$confirm('此操作将永久删除该行工艺, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - deleteOne(this.partNumValue, row.工序流水号).then(() => { - this.$message.success('删除成功') - this.searchDetail() - }) - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消删除' - }) + deleteOne(this.partNumValue, row.工序流水号).then(() => { + this.searchDetail() }) } }, @@ -1312,3 +1652,9 @@ export default { } } + diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue index a99bdaa5..9452dd73 100644 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue @@ -341,7 +341,6 @@ - @@ -396,7 +395,6 @@ - @@ -471,7 +469,6 @@ -