diff --git a/src/api/mes/bg.js b/src/api/mes/bg.js
deleted file mode 100644
index d3f37fab..00000000
--- a/src/api/mes/bg.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询生产报工列表
-export function listBg(query) {
- return request({
- url: '/mes/bg/list',
- method: 'get',
- params: query
- });
-}
-
-// 查询生产报工详细
-export function getBg(ID) {
- return request({
- url: '/mes/bg/' + ID,
- method: 'get'
- });
-}
-
-// 新增生产报工
-export function addBg(data) {
- return request({
- url: '/mes/bg',
- method: 'post',
- data: data
- });
-}
-
-// 修改生产报工
-export function updateBg(data) {
- return request({
- url: '/mes/bg',
- method: 'put',
- data: data
- });
-}
-
-// 删除生产报工
-export function delBg(ID) {
- return request({
- url: '/mes/bg/' + ID,
- method: 'delete'
- });
-}
diff --git a/src/api/mes/copy1.js b/src/api/mes/copy1.js
deleted file mode 100644
index 2f2ed444..00000000
--- a/src/api/mes/copy1.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询车间/产线管理列表
-export function listCopy1(query) {
- return request({
- url: '/mes/copy1/list',
- method: 'get',
- params: query
- });
-}
-
-// 查询车间/产线管理详细
-export function getCopy1(id) {
- return request({
- url: '/mes/copy1/' + id,
- method: 'get'
- });
-}
-
-// 新增车间/产线管理
-export function addCopy1(data) {
- return request({
- url: '/mes/copy1',
- method: 'post',
- data: data
- });
-}
-
-// 修改车间/产线管理
-export function updateCopy1(data) {
- return request({
- url: '/mes/copy1',
- method: 'put',
- data: data
- });
-}
-
-// 删除车间/产线管理
-export function delCopy1(id) {
- return request({
- url: '/mes/copy1/' + id,
- method: 'delete'
- });
-}
diff --git a/src/api/mes/order.js b/src/api/mes/order.js
deleted file mode 100644
index f4c92470..00000000
--- a/src/api/mes/order.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询粉料采购计划列表
-export function listOrder(query) {
- return request({
- url: '/mes/order/list',
- method: 'get',
- params: query
- });
-}
-
-// 查询粉料采购计划详细
-export function getOrder(ID) {
- return request({
- url: '/mes/order/' + ID,
- method: 'get'
- });
-}
-
-// 新增粉料采购计划
-export function addOrder(data) {
- return request({
- url: '/mes/order',
- method: 'post',
- data: data
- });
-}
-
-// 修改粉料采购计划
-export function updateOrder(data) {
- return request({
- url: '/mes/order',
- method: 'put',
- data: data
- });
-}
-
-// 删除粉料采购计划
-export function delOrder(ID) {
- return request({
- url: '/mes/order/' + ID,
- method: 'delete'
- });
-}
diff --git a/src/api/mes/pro/proroute.js b/src/api/mes/pro/proroute.js
new file mode 100644
index 00000000..d587e250
--- /dev/null
+++ b/src/api/mes/pro/proroute.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工艺路线列表
+export function listProroute(query) {
+ return request({
+ url: '/mes/pro/proroute/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询工艺路线详细
+export function getProroute(routeId) {
+ return request({
+ url: '/mes/pro/proroute/' + routeId,
+ method: 'get'
+ })
+}
+
+// 新增工艺路线
+export function addProroute(data) {
+ return request({
+ url: '/mes/pro/proroute',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改工艺路线
+export function updateProroute(data) {
+ return request({
+ url: '/mes/pro/proroute',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除工艺路线
+export function delProroute(routeId) {
+ return request({
+ url: '/mes/pro/proroute/' + routeId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/mes/pro/routeprocess.js b/src/api/mes/pro/routeprocess.js
new file mode 100644
index 00000000..efec2e7e
--- /dev/null
+++ b/src/api/mes/pro/routeprocess.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询工艺组成列表
+export function listRouteprocess(query) {
+ return request({
+ url: '/mes/pro/routeprocess/list',
+ method: 'get',
+ params: query
+ })
+}
+
+
+// 查询产品的工艺组成列表
+export function listProductprocess(productId) {
+ return request({
+ url: '/mes/pro/routeprocess/listProductProcess/'+productId,
+ method: 'get'
+ })
+}
+
+
+// 查询工艺组成详细
+export function getRouteprocess(recordId) {
+ return request({
+ url: '/mes/pro/routeprocess/' + recordId,
+ method: 'get'
+ })
+}
+
+// 新增工艺组成
+export function addRouteprocess(data) {
+ return request({
+ url: '/mes/pro/routeprocess',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改工艺组成
+export function updateRouteprocess(data) {
+ return request({
+ url: '/mes/pro/routeprocess',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除工艺组成
+export function delRouteprocess(recordId) {
+ return request({
+ url: '/mes/pro/routeprocess/' + recordId,
+ method: 'delete'
+ })
+}
diff --git a/src/views/mes/bg/index.vue b/src/views/mes/bg/index.vue
deleted file mode 100644
index 4fcaac8f..00000000
--- a/src/views/mes/bg/index.vue
+++ /dev/null
@@ -1,381 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.barcodeClearDate, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/mes/copy1/index.vue b/src/views/mes/copy1/index.vue
deleted file mode 100644
index 652c5334..00000000
--- a/src/views/mes/copy1/index.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/mes/order/index.vue b/src/views/mes/order/index.vue
deleted file mode 100644
index ae632987..00000000
--- a/src/views/mes/order/index.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index 67d4582e..a7fc19f1 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -211,7 +211,7 @@
-
+
@@ -404,6 +404,11 @@ export default {
},
/** 提交按钮 */
submitForm() {
+
+ if(Array.isArray(this.form.fileList)){
+ this.form.fileList = this.listToString(this.form.fileList);
+ }
+
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.processId != null) {
@@ -438,9 +443,14 @@ export default {
...this.queryParams
}, `process_${new Date().getTime()}.xlsx`)
},
- //自动生成编码
- handleAutoGenChange(autoGenFlag){
-
+ // 对象转成指定字符串分隔
+ listToString(list, separator) {
+ let strs = "";
+ separator = separator || ",";
+ for (let i in list) {
+ strs += list[i].url + separator;
+ }
+ return strs != '' ? strs.substr(0, strs.length - 1) : '';
}
}
};
diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue
new file mode 100644
index 00000000..f7021388
--- /dev/null
+++ b/src/views/mes/pro/proroute/index.vue
@@ -0,0 +1,401 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+ {{scope.row.routeCode}}
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue
new file mode 100644
index 00000000..e90fedad
--- /dev/null
+++ b/src/views/mes/pro/proroute/routeprocess.vue
@@ -0,0 +1,323 @@
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关键工序
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+