From 2c00c608684c7907fa8f11160776042aadc1a3aa Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 13 Dec 2018 17:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CreatePreparationBill.js | 27 +++
.../CreatePreparationBill/index.vue | 154 ++++++++++++++++++
.../OutsourcingTaskExecution/index.vue | 12 +-
3 files changed, 187 insertions(+), 6 deletions(-)
create mode 100644 src/api/ManufacturingCenter/CreatePreparationBill.js
create mode 100644 src/views/ManufacturingCenter/CreatePreparationBill/index.vue
diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
new file mode 100644
index 00000000..fe656af7
--- /dev/null
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询已分配零件
+export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询',
+ param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 查询已分配零件
+export function edit(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '车间生产管理工艺_备料单导出_状态更改',
+ param: '工艺计划流水号=' + num1
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
new file mode 100644
index 00000000..4908c868
--- /dev/null
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -0,0 +1,154 @@
+
+
+
+
+ 零件图号:
+
+ 查询
+ 查询全部
+ 导出备料单
+
+
+
+
+
+
+
+
+ 已打印
+ 未打印
+
+
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.工艺要求 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | GAOJING |
+ 备料单 |
+
+
+ | 零件名称 |
+ 零件图号 |
+ 备料 |
+
+
+ | {{ list.零件名称 }} |
+ {{ list.零件图号 }} |
+ {{ list.工艺要求 }} |
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index d0b30233..0e01cc71 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -329,12 +329,12 @@
计算价格
确定价格
成交
- 导出外协加工任务单
+ 导出外协加工任务单
-
+
| GAOJING |
@@ -717,7 +717,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
- // cjn end
+ // RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -1016,7 +1016,7 @@ export default {
if (response.data.length === 0) {
this.loading = false
}
- // cjn end
+ // RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -1140,7 +1140,7 @@ export default {
}
this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费
this.大写金额 = convertCurrency(this.总计)
- // cjn end
+ // RWD end
if (response.data.length === 0) {
this.loading = false
}
@@ -1533,7 +1533,7 @@ export default {
this.$message.warning('请选择订单')
}
},
- downLoadCjn(tableid) {
+ downLoadRWD(tableid) {
if (this.List3.length === 0) {
this.$message.warning('暂无数据')
} else {