From 7a2d8e315a666655616644bf015cb8297f5f8b17 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期二, 02 一月 2024 11:41:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index f192b1d..8ea5570 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -1,6 +1,6 @@
<script setup>
-import {reactive} from "vue";
+import {reactive, ref} from "vue";
import {useRouter} from 'vue-router'
let router=useRouter()
const getTableRow = (row,type) =>{
@@ -18,6 +18,33 @@
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/productStock/FinishedGoodsIssue', query: { id: row.id }})
break
+ }
+ }
+}
+
+const xGrid = ref();
+const gridEvents = {
+ toolbarButtonClick({ code }) {
+ const $grid = xGrid.value
+ if($grid){
+ switch (code){
+ case 'ver':{
+ alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+ // router.push({path: '/main/productStock/OrderAllocation'});
+ // return;
+ break
+ }
+ case 'record':{
+ router.push({path: '/main/productStock/TransferRecord'});
+ return;
+ break;
+ }
+ case 'rework':{
+ router.push({path: '/main/productStock/FinishedProductRework'});
+ return;
+ break;
+ }
+ }
}
}
}
@@ -83,7 +110,8 @@
toolbarConfig: {
buttons: [{
'name': '纭鍑哄簱',
- status: 'primary'
+ status: 'primary',
+ 'code':'ver'
}],
import: false,
export: true,
@@ -103,7 +131,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -124,7 +152,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -145,7 +173,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -166,7 +194,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -187,7 +215,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -208,7 +236,7 @@
"OrderQuantity": "7",
"Length": "1230.00",
"Width": "1075.00",
- "Thickness": "6銆�700",
+ "Thickness": "6.700",
"TotalQuantity": "100.00",
"TotalArea": "360.80",
"BoxNumber": "06",
@@ -249,7 +277,7 @@
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
-
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
--
Gitblit v1.8.0