From 2e6b9aaba821fd57f3d56a49f73f207227942e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
<411641505@qq.com>
Date: Sun, 29 Oct 2023 23:04:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/pro/schedule/index.vue | 1 +
src/views/mes/pro/workorder/index.vue | 77 ++++++++++++++++++++++++---
2 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 57604d0..2f475dc 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -322,6 +322,7 @@ export default {
pageSize: 10,
workorderCode: null,
workorderName: null,
+ workorderType: 'SELF', //这里的排产要排除自产之外的外协和外购
orderSource: null,
sourceCode: null,
productId: null,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 6aee0e8..51ff35d 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -59,6 +59,14 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
+
+
@@ -210,7 +223,7 @@
-
+
@@ -270,7 +283,19 @@
-
+
+
+
+
+
+
+
+
@@ -278,7 +303,7 @@
-
+
@@ -321,7 +346,7 @@
-
+
@@ -334,6 +359,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -357,8 +398,8 @@
@@ -371,17 +412,19 @@ import Workorderbom from "./bom/bom.vue";
import WorkorderItemList from "./items/item.vue";
import ItemSelect from "@/components/itemSelect/single.vue";
import ClientSelect from "@/components/clientSelect/single.vue";
+import VendorSelect from "@/components/vendorSelect/single.vue";
import {genCode} from "@/api/system/autocode/rule"
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Workorder",
- dicts: ['mes_order_status','mes_workorder_sourcetype'],
+ dicts: ['mes_order_status','mes_workorder_sourcetype','mes_workorder_type'],
components: {
Treeselect,
ItemSelect ,
ClientSelect,
+ VendorSelect,
Workorderbom,
WorkorderItemList
},
@@ -443,6 +486,9 @@ export default {
workorderName: [
{ required: true, message: "工单名称不能为空", trigger: "blur" }
],
+ workorderType: [
+ { required: true, message: "请选择生产工单类型", trigger: "blur" }
+ ],
orderSource: [
{ required: true, message: "来源类型不能为空", trigger: "blur" }
],
@@ -508,6 +554,7 @@ export default {
workorderId: null,
workorderCode: null,
workorderName: null,
+ workorderType: 'SELF',
orderSource: null,
sourceCode: null,
productId: null,
@@ -522,6 +569,9 @@ export default {
clientId: null,
clientCode: null,
clientName: null,
+ vendorId: null,
+ vendorCode: null,
+ vendorName: null,
requestDate: null,
parentId: null,
status: "PREPARE",
@@ -681,6 +731,19 @@ export default {
this.form.clientName = obj.clientName;
}
},
+ //供应商选择
+ handleSelectVendor(){
+ this.$refs.vendorSelect.showFlag = true;
+ },
+ //供应商选择弹出框
+ onVendorSelected(obj){
+ debugger;
+ if(obj != undefined && obj != null){
+ this.form.vendorId = obj.vendorId;
+ this.form.vendorCode = obj.vendorCode;
+ this.form.vendorName = obj.vendorName;
+ }
+ },
//自动生成编码
handleAutoGenChange(autoGenFlag){
if(autoGenFlag){