From e063a4fa06690d01b50a9ffab56f4ca005015319 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 1 Dec 2022 10:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=202022=E5=B9=B412=E6=9C=881=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/shopOrder/shopOrder.js | 47 +-
.../shopOrder/soroutingAvailableResource.js | 8 +
src/assets/scss/global.scss | 29 +
src/views/modules/report/reportCategory.vue | 4 +-
.../searchProductionDispatchList.vue | 2 +-
.../shopOrder/common/tool_add_and_edit.vue | 2 +-
.../modules/shopOrder/shopOrder/shopOrder.vue | 4163 +++++++++--------
7 files changed, 2291 insertions(+), 1964 deletions(-)
create mode 100644 src/api/shopOrder/soroutingAvailableResource.js
diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index 456a9ad..7fda8c1 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -1,51 +1,51 @@
-import { createAPI } from "@/utils/httpRequest.js";
+import {createAPI} from "@/utils/httpRequest.js";
// -------------生产订单类型--------------
// 获取生产订单类型
-export const getShopOrderFamily = data => createAPI(`/shopOrder/getShopOrderFamily`,'post',data)
+export const getShopOrderFamily = data => createAPI(`/shopOrder/getShopOrderFamily`, 'post', data)
// 保存修改生产订单类型
-export const saveShopOrderFamily = data => createAPI(`/shopOrder/saveShopOrderFamily`,'post',data)
+export const saveShopOrderFamily = data => createAPI(`/shopOrder/saveShopOrderFamily`, 'post', data)
// 删除生产订单类型
-export const deleteShopOrderFamily = data => createAPI(`/shopOrder/deleteShopOrderFamily`,'post',data)
+export const deleteShopOrderFamily = data => createAPI(`/shopOrder/deleteShopOrderFamily`, 'post', data)
// -------------计划方式页面--------------
// 获取计划方式
-export const getPlanFamily = data => createAPI(`/shopOrder/getPlanFamily`,'post',data)
+export const getPlanFamily = data => createAPI(`/shopOrder/getPlanFamily`, 'post', data)
// 保存修改计划方式
-export const savePlanFamily = data => createAPI(`/shopOrder/savePlanFamily`,'post',data)
+export const savePlanFamily = data => createAPI(`/shopOrder/savePlanFamily`, 'post', data)
// 删除计划方式
-export const deletePlanFamily = data => createAPI(`/shopOrder/deletePlanFamily`,'post',data)
+export const deletePlanFamily = data => createAPI(`/shopOrder/deletePlanFamily`, 'post', data)
// -------------查询-生产订单无工艺路线--------------
-export const searchShopOrderWithNoProcessRoute = data => createAPI(`/shopOrder/searchShopOrderWithNoProcessRoute`,'post',data)
+export const searchShopOrderWithNoProcessRoute = data => createAPI(`/shopOrder/searchShopOrderWithNoProcessRoute`, 'post', data)
// -------------查询-生产派工单--------------
-export const searchProductionDispatchList = data => createAPI(`/shopOrder/searchProductionDispatchList`,'post',data)
+export const searchProductionDispatchList = data => createAPI(`/shopOrder/searchProductionDispatchList`, 'post', data)
// -------------查询-生产订单--------------
-export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`,'post',data)
+export const searchShopOrder = data => createAPI(`/shopOrder/searchShopOrder`, 'post', data)
// -------------生产订单--------------
-export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`,'post',data)
+export const getShopOrderData = data => createAPI(`/shopOrder/getShopOrderData`, 'post', data)
-export const deleteShopOrderData = data => createAPI(`/shopOrder/deleteShopOrderData`,'post',data)
+export const deleteShopOrderData = data => createAPI(`/shopOrder/deleteShopOrderData`, 'post', data)
-export const saveShopOrderData = data => createAPI(`/shopOrder/saveShopOrderData`,'post',data)
+export const saveShopOrderData = data => createAPI(`/shopOrder/saveShopOrderData`, 'post', data)
-export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDetail`,'post',data)
+export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDetail`, 'post', data)
// 获取shoporder 信息
-export const getOrderInfo = data => createAPI(`/shopOrder/getOrderInfo`,'post',data)
+export const getOrderInfo = data => createAPI(`/shopOrder/getOrderInfo`, 'post', data)
// 获取 shoporder sap sobom 信息
-export const getShopOrderSapSOBOM = data => createAPI(`/shopOrder/getShopOrderSapSOBOM`,'post',data)
+export const getShopOrderSapSOBOM = data => createAPI(`/shopOrder/getShopOrderSapSOBOM`, 'post', data)
//取消shopOrder
-export const cancelShopOrderBun = data => createAPI(`/shopOrder/cancelShopOrderBun`,'post',data)
+export const cancelShopOrderBun = data => createAPI(`/shopOrder/cancelShopOrderBun`, 'post', data)
//关闭订单
export const closeShopOrder = data => createAPI('/shopOrder/closeShopOrder', 'post', data)
@@ -77,20 +77,23 @@ export const getOrderNoRouteInMaxItemNo = data => createAPI('/shopOrder/getOrder
// 获取订单可用机台
export const getOrderNoItemNoCenter = data => createAPI('/shopOrder/getOrderNoItemNoCenter', 'post', data)
-//查询--生产派工单 ---》取消派工单操作
+// 查询--生产派工单 ---》取消派工单操作
export const cancelScheduleWithScheduleQuery = data => createAPI('/scheduling/cancelScheduleWithScheduleQuery', 'post', data)
-//查询工单的工具信息
+// 查询工单的工具信息
export const getShopOrderToolDatas = data => createAPI('/shopOrder/getShopOrderToolDatas', 'post', data)
-//新增工单的工具信息
+// 新增工单的工具信息
export const insertShopOrderToolData = data => createAPI('/shopOrder/insertShopOrderToolData', 'post', data)
-//修改工单的工具信息
+// 修改工单的工具信息
export const updateShopOrderToolData = data => createAPI('/shopOrder/updateShopOrderToolData', 'post', data)
-//查询工单的工具信息
+// 查询工单的工具信息
export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopOrderToolData', 'post', data)
+// 更改生产工单工艺路线
+export const shopOrderUpdateRoutingViaRev = data => createAPI('/shopOrder/shopOrderUpdateRoutingViaRev', 'post', data)
+
diff --git a/src/api/shopOrder/soroutingAvailableResource.js b/src/api/shopOrder/soroutingAvailableResource.js
new file mode 100644
index 0000000..108e1e1
--- /dev/null
+++ b/src/api/shopOrder/soroutingAvailableResource.js
@@ -0,0 +1,8 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// -------------产线操作员登记表--------------
+// 获取生产订单工序可用机台
+export const getSORoutingAvailableResource = data => createAPI(`/shoporder/soroutingAvailableResource/getSORoutingAvailableResource`,'post',data)
+
+// 修改生产订单工序可用机台
+export const updateSORoutingAvailableResource = data => createAPI(`/shoporder/soroutingAvailableResource/updateSORoutingAvailableResource`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 71c25f5..02f489d 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -398,3 +398,32 @@ a:hover{
font-size: 12px;
}
+ .el-transfer-panel {
+ border: 2px solid #17b3a3;
+ border-radius: 4px;
+ overflow: hidden;
+ background: #fff;
+ display: inline-block;
+ vertical-align: middle;
+ width: 252px;
+ max-height: 100%;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ position: relative;
+}
+
+ .el-transfer-panel .el-transfer-panel__header {
+ height: 40px;
+ line-height: 40px;
+ background: #17b3a3;
+ margin: 0;
+ padding-left: 15px;
+ border-bottom: 1px solid #17b3a3;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ color: #000;
+}
+
+ .rred input {
+ color: red;
+ }
diff --git a/src/views/modules/report/reportCategory.vue b/src/views/modules/report/reportCategory.vue
index e954103..e78e957 100644
--- a/src/views/modules/report/reportCategory.vue
+++ b/src/views/modules/report/reportCategory.vue
@@ -312,8 +312,8 @@ export default {
if (data.data.length > 0) {
this.buttons = data.data
} else {
- saveButtonList(this.buttonList).then(({data}) => {
- })
+ // saveButtonList(this.buttonList).then(({data}) => {
+ // })
}
})
},
diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index 91e2d95..d6c7ab8 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -188,7 +188,7 @@
},
searchData: {
site:'',
- orderNo:'',
+ orderNo:this.$route.query.orderNo,
checked: true,
partNo:'',
sResourceID:'',
diff --git a/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue b/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
index 2e8b85f..fc11e50 100644
--- a/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
+++ b/src/views/modules/shopOrder/shopOrder/common/tool_add_and_edit.vue
@@ -5,7 +5,7 @@
@close="closeDialog"
width="390px"
class="sxm"
- :title="titile"
+ :title="titleCon"
:close-on-click-modal="false"
:visible.sync="visible">
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 41feb94..9e15449 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -30,18 +30,39 @@
-
+
- {{ buttons.editButton }}
- {{ buttons.deleteButton }}
- {{ buttons.printButton }}
+
+
+ {{ buttons.orderPrimaryMenu }}
+
+
+ {{
+ buttons.orderToScheduling
+ }}
+
+ {{ buttons.changeRouting }}
+
+
+
+
+ {{ buttons.editButton }}
- {{ buttons.cancelButton }}
+
+ {{ buttons.deleteButton }}
- {{ buttons.closeButton }}
+
+ {{ buttons.printButton }}
- {{ buttons.openButton }}
+ {{ buttons.cancelButton }}
+
+ {{ buttons.closeButton }}
+
+ {{ buttons.openButton }}
@@ -239,11 +260,15 @@
{{ buttons.download2 }}
-
+
{{ buttons.routingPrimaryMenu }}
- {{ buttons.routingMenu }}
+ {{ buttons.routingMenu }}
+
+
+
+ {{ buttons.resources }}
@@ -255,6 +280,8 @@
:height="height"
:data="dataList2"
border
+ highlight-current-row
+ @current-change="routingCurrentChange"
v-loading="dataListLoading"
style="width: 100%;">
-
+
-
+
{{ buttons.toolPrimaryMenu }}
- {{ buttons.toolMenu }}
+ {{ buttons.toolMenu }}
@@ -331,6 +358,7 @@
+
@@ -414,9 +442,10 @@
- {{buttons.closeButton}}
+ {{ buttons.closeButton }}
+
@@ -453,7 +482,7 @@
onblur="this.value=this.value.toUpperCase()">
- {{labels.planMethod}}
+ {{ labels.planMethod }}
@@ -496,2022 +525,2280 @@
关闭
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+