From 6ac9391135ded7e668d2d42f408f4a6c59b27d23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 14 十月 2024 16:05:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue | 4
north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue | 1
north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue | 4
north-glass-erp/northglass-erp/src/stores/sd/companySet/新疆恒鑫.js | 110 +++++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 4
north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue | 4
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue | 4
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue | 4
north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue | 11 +
north-glass-erp/northglass-erp/src/components/pp/SelectSortTable.vue | 1
north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPrice.vue | 66 ++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue | 4
north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue | 4
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue | 1
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 4
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue | 1
north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue | 4
north-glass-erp/northglass-erp/src/stores/sd/companySet/天津北玻.js | 120 ++++++++++++
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 4
north-glass-erp/northglass-erp/src/router/index.js | 23 ++
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 1
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue | 4
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 4
north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue | 1
north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 4
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue | 4
north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue | 1
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 4
north-glass-erp/northglass-erp/src/stores/sd/companySet/常州吉利.js | 91 +++++++++
north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue | 4
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 4
north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProducePriceCompute.vue | 11 +
north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue | 4
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue | 1
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue | 1
north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue | 4
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 4
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue | 4
north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue | 4
56 files changed, 556 insertions(+), 37 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue b/north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue
index 6f0fb6f..186f993 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/OrderSortDetail.vue
@@ -487,6 +487,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
index 4745b3b..2e06522 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
@@ -505,6 +505,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectSortTable.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectSortTable.vue
index 4a846c0..9921b36 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectSortTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectSortTable.vue
@@ -250,6 +250,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index d4cb144..2361f9a 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -84,6 +84,29 @@
]
},
+ {
+ path:'glassPrice',
+ name: 'glassPrice',
+ component: () => import('../views/sd/glassPrice/GlassPrice.vue'),
+ children:[
+ {
+ path: 'producePriceCompute',
+ name: 'producePriceCompute',
+ component: () => import('../views/sd/glassPrice/ProducePriceCompute.vue')
+ },
+ {
+ path: 'glassPriceSet',
+ name: 'glassPriceSet',
+ component: () => import('../views/sd/glassPrice/GlassPriceSet.vue')
+ },
+ {
+ name: 'GlassPrice1',
+ path: '',
+ redirect:'/main/glassPrice/producePriceCompute'
+ }
+ ]
+ },
+
//sd妯″潡
{
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
new file mode 100644
index 0000000..3d2c584
--- /dev/null
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\244\251\346\264\245\345\214\227\347\216\273.js"
@@ -0,0 +1,120 @@
+import {defineStore} from "pinia";
+
+export default defineStore('companyInfo', {
+
+ state: () => ({
+ companyName: '澶╂触鍖楃幓鐜荤拑宸ヤ笟鎶�鏈湁闄愬叕鍙革紙TJBB-QR7.1-01锛�',
+ address:'澶╂触瀹濆澔鍖鸿妭鑳界幆淇濆伐涓氬尯澶╁叴璺タ渚у疂涓亾鍗椾晶',
+ telephone:'022-59280088',
+ fax:'022-59280066',
+ widHeiLength:{//璁㈠崟瀹介珮闀垮害
+ regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-99999.99
+ //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-9999.99
+ msg:'basicData.msg.range99999Dec2'
+ },
+ orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:姣忓勾鐢熸垚
+ deliveryIdType:'day',
+ columnName:'鍥惧彿',
+ selectOrderReviewShow:true, //璁㈠崟棣栭〉鍔犲伐鍗曞鏍告寜閽槸鍚︽樉绀�
+ productName:"product_name",
+ decValue:3,//璁㈠崟淇濈暀浣嶆暟锛屽ぉ娲�3浣�,甯稿窞2浣�
+ label:1,//鏍囩绫诲瀷
+ calculateType:1,//璁㈠崟璁＄畻鏂瑰紡
+ reportType:1,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
+ qualityInsStatus:1,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1涓嶉渶瑕侊紝2闇�瑕�
+ remarkSwitch:1,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
+ icon:"",//鍟嗘爣鍙傛暟
+ longSide:null,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊 null涓嶆彁绀洪鑹�
+ //澶╂触
+ printLabel: {
+ custom: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-size: 22px;margin-top: 28px;">W:${item1.width}</label>
+
+
+
+
+ <label style="font-size: 22px;margin-top: 28px;">H:${item1.height}</label>
+ </div>`
+ },
+ customSemi: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 8px;">W:${item1.width}</label>
+
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 8px;">H:${item1.height}</label>
+ </div>`
+ },
+ labelType: '鍗婂搧鏍囩',
+ labelValue:2,
+ labelType3: '鎴愬搧鏍囩3',
+ labelValue3:3,
+ className:{
+ custom:{
+ printFlowCardName: () => {
+ return `printFlowCard_finished`
+ },
+ entiretyName: () => {
+ return `entirety_finished`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ },
+ semi:{
+ printFlowCardName: () => {
+ return `printFlowCard_semi`
+ },
+ entiretyName: () => {
+ return `entirety_semi`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ },
+
+
+ },
+ printFlowCard: {//娴佺▼鍗℃墦鍗版牱寮�
+ patch:'琛�',
+ lackOf:'娆�',
+ processingNote: (itemtextarea) => {
+ return ``
+ },
+ },
+ hideButton:'true',//娴佺▼鍗℃墦鍗扮晫闈㈡寜閽槸鍚︽樉绀�
+ getSelectFlowCard:1,//娴佺▼鍗℃墦鍗版煡璇㈡槸鍚﹀悎骞� 1鍚堝苟2涓嶅悎骞�
+ columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
+ },
+
+ //甯稿窞
+ printLabel1: {
+ custom: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size:12px;">${item1.width}*${item1.height}=${item1.quantity}</label>
+ </div>`
+
+ },
+ customSemi: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size:10px;">${item1.width}*${item1.height}=${item1.quantity}</label>
+ </div>`
+ },
+ labelType: '鎴愬搧鏍囩2',
+ labelValue:3,
+
+ printFlowCard: {
+ patch:'姝ｅ搧',
+ lackOf:'娆″搧',
+ processingNote: (itemtextarea) => {
+ return `${itemtextarea.processing_note}`
+ },
+ },
+ hideButton:'false',
+ },
+
+
+ }),
+ actions: {
+ //
+ }
+})
\ No newline at end of file
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
new file mode 100644
index 0000000..0fb7bd1
--- /dev/null
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\345\270\270\345\267\236\345\220\211\345\210\251.js"
@@ -0,0 +1,91 @@
+import {defineStore} from "pinia";
+
+export default defineStore('companyInfo', {
+
+ state: () => ({
+ companyName: '甯稿窞甯傚悏鍒╃幓鐠冩湁闄愬叕鍙�',
+ address:'甯稿窞甯傚ぉ瀹佸尯閮戦檰闀囧ぇ鏄庡崡璺�8鍙�',
+ telephone:'022-59280088',
+ fax:'022-59280066',
+ widHeiLength:{//璁㈠崟瀹介珮闀垮害
+ regexp:/^(\d{1,4})$/,//姝ｅ垯鍥涗綅鏁存暟
+ //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-9999.99
+ msg:'basicData.msg.range9999Dec'
+ },
+ orderIdType:'month',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
+ deliveryIdType:'month',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
+ columnName:'寮傚舰鍙傛暟',
+ selectOrderReviewShow:false, //璁㈠崟棣栭〉鍔犲伐鍗曞鏍告寜閽槸鍚︽樉绀�
+ productName:"product_abbreviation", //浜у搧鍒涘缓鏌ラ噸瀛楁
+ decValue:2,//璁㈠崟淇濆瓨闈㈢Н浣嶆暟
+ label:2,//鏍囩绫诲瀷
+ calculateType:2,//璁㈠崟璁＄畻鏂瑰紡
+ reportType:2,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
+ qualityInsStatus:2,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1涓嶉渶瑕侊紝2闇�瑕�
+ remarkSwitch:2,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
+ icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟
+ longSide:6500,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊
+
+ //澶╂触
+ printLabel: {
+ custom: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size: 22px;margin-top: 28px;">W:${item1.width}</label>
+
+ <label style="font-weight: bolder;font-size: 22px;margin-top: 28px;">H:${item1.height}</label>
+ </div>`
+ },
+ customSemi: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 28px;">W:${item1.width}</label>
+
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 28px;">H:${item1.height}</label>
+ </div>`
+ },
+ labelType: '鎴愬搧鏍囩2',
+ labelValue:2,
+ labelType3: '鎴愬搧鏍囩3',
+ labelValue3:3,
+ printFlowCard: {
+ patch:'姝ｅ搧',
+ lackOf:'娆″搧',
+ processingNote: (itemtextarea) => {
+ return `${itemtextarea.processing_note}`
+ },
+ },
+ hideButton:'false',
+ getSelectFlowCard:2,//鎵撳嵃娴佺▼鍗℃煡璇㈢姸鎬�
+ columnsLabel:2,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
+ className:{
+ custom:{
+ printFlowCardName: () => {
+ return `printFlowCard_finished`
+ },
+ entiretyName: () => {
+ return `entirety_finished`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ },
+ semi:{
+ printFlowCardName: () => {
+ return `printFlowCard_semi`
+ },
+ entiretyName: () => {
+ return `entirety_semi`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ }
+
+ }
+ }
+
+
+ }),
+ actions: {
+ //
+ }
+})
\ No newline at end of file
diff --git "a/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js" "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
new file mode 100644
index 0000000..d275dbe
--- /dev/null
+++ "b/north-glass-erp/northglass-erp/src/stores/sd/companySet/\346\226\260\347\226\206\346\201\222\351\221\253.js"
@@ -0,0 +1,110 @@
+import {defineStore} from "pinia";
+import {filterChanged} from "@/hook";
+
+export default defineStore('companyInfo', {
+
+ state: () => ({
+ companyName: '鏂扮枂鎭掗懌鐜荤拑绉戞妧鏈夐檺鍏徃',
+ address:'鏂扮枂浜斿娓犲伐涓氬洯鍏靛洟鏂板瀷寤烘潗宸ヤ笟鍥尯宸ヤ竴璺�11鍙烽檮1鍙�',
+ telephone:'13419168999',
+ fax:'',
+ widHeiLength:{//璁㈠崟瀹介珮闀垮害
+ regexp:/^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-99999.99
+ //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//姝ｅ垯0.00-9999.99
+ msg:'basicData.msg.range99999Dec2'
+ },
+ orderIdType:'year',//鍚庣鐢熸垚璁㈠崟鍙风被鍨嬶紝day:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚,year:鎸夊勾鐢熸垚
+ deliveryIdType:'day',//鍚庣鐢熸垚鍙戣揣鍗曞彿绫诲瀷锛宒ay:姣忓ぉ鐢熸垚锛宮onth:姣忔湀鐢熸垚
+ columnName:'鍥惧彿',
+ selectOrderReviewShow:true, //璁㈠崟棣栭〉鍔犲伐鍗曞鏍告寜閽槸鍚︽樉绀�
+ productName:"product_name",//浜у搧鍒涘缓鏃堕噸澶嶉獙璇侊紝鈥榩roduct_abbreviation鈥�
+ decValue:2,//璁㈠崟淇濈暀浣嶆暟锛屽ぉ娲�3浣�,甯稿窞2浣�
+ label:1,//鏍囩绫诲瀷 1鏄ぉ娲� 2鏄父宸�
+ calculateType:2,//璁㈠崟璁＄畻鏂瑰紡
+ reportType:1,//鎶ュ伐鏄惁鏌ヨ鏍峰搧璁㈠崟2鏌ヨ锛�1涓嶆煡璇�
+ qualityInsStatus:1,//璺ㄥ伐搴忚川妫�瀹℃牳锛�1.涓嶉渶瑕侊紝2.闇�瑕�
+ remarkSwitch:2,//娴佺▼鍗′笂鏄惁鏄剧ず鍏跺畠澶囨敞锛�1鏄剧ず锛�2涓嶆樉绀�
+ icon:"濂ラ涔呴��",//鍟嗘爣鍙傛暟
+ longSide:null,//璁㈠崟鍒涘缓鏈�闀胯竟鎻愮ず棰滆壊
+
+
+ //澶╂触
+ printLabel: {
+ custom: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size: 22px;margin-top: 28px;">W:${item1.width}</label>
+
+ <label style="font-weight: bolder;font-size: 22px;margin-top: 28px;">H:${item1.height}</label>
+ </div>`
+ },
+ customSemi: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 28px;">W:${item1.width}</label>
+
+ <label style="font-weight: bolder;font-size: 10px;margin-top: 28px;">H:${item1.height}</label>
+ </div>`
+ },
+ labelType: '鍗婂搧鏍囩',
+ labelValue:2,
+ labelType3: '鎴愬搧鏍囩3',
+ labelValue3:3,
+ className:{
+ custom:{
+ printFlowCardName: () => {
+ return `printFlowCard_finished`
+ },
+ entiretyName: () => {
+ return `entirety_finished`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ },
+ semi:{
+ printFlowCardName: () => {
+ return `printFlowCard_semi`
+ },
+ entiretyName: () => {
+ return `entirety_semi`
+ },
+ contentRowName: () => {
+ return `contentRow`
+ }
+ }
+
+ },
+ printFlowCard: {
+ patch:'琛�',
+ lackOf:'娆�',
+ processingNote: (itemtextarea) => {
+ return ``
+ },
+ },
+ hideButton:'true',
+ getSelectFlowCard:2,//1鏄ぉ娲� 2鏄父宸� 鏄剧ず鍚堝苟娴佺▼鍗�
+ columnsLabel:1,//涓�琛屼袱鍒楁垚鍝佹爣绛� 1鏂扮枂涓�琛屼袱鍒楁垚鍝佹爣绛撅紝2鍏跺畠
+ },
+
+ //甯稿窞
+ printLabel1: {
+ custom: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size:12px;">${item1.width}*${item1.height}=${item1.quantity}</label>
+ </div>`
+
+ },
+ customSemi: (item1) => {
+ return `<div class="row3" style="text-align: center;font-weight: bolder;">
+ <label style="font-weight: bolder;font-size:10px;">${item1.width}*${item1.height}=${item1.quantity}</label>
+ </div>`
+ },
+ labelType: '鎴愬搧鏍囩2',
+ labelValue:3,
+ },
+
+
+ }),
+ actions: {
+ //
+ }
+})
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
index 8311031..544a4bc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -180,7 +180,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
index 51ac9fe..c5357ff 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
@@ -237,7 +237,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
index 49b6a06..81c50bd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -309,7 +309,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
index 97f4394..95d8acc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -155,7 +155,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 6ac6a3c..cdb5e10 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -853,6 +853,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -919,6 +920,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
index cf780b1..6f9a505 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -727,6 +727,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
index 404cc45..2033e05 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCardDetails.vue
@@ -755,6 +755,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
index 4eac0c1..3ce82a2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProjectDetails.vue
@@ -637,6 +637,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index a0ea302..24c23d6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -718,7 +718,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index 515e4ec..bec2f10 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -316,7 +316,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 03d40fb..cdce0be 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -275,7 +275,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
index 3d5cda2..e5b63f1 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -388,7 +388,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
index dccf874..8d56876 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -329,7 +329,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index dae375d..9bea5a9 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -502,7 +502,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
index 3436ab4..8d5734e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SplittingDetails.vue
@@ -230,6 +230,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
index 106111b..c53ab07 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
@@ -167,7 +167,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
index 3ff5cf2..777e673 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
@@ -167,7 +167,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
index f5b7729..1feac71 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
@@ -178,7 +178,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
index 19d0e8b..b96d472 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -225,7 +225,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
index 51f98a2..07b739f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
@@ -303,7 +303,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
index de1ee3b..ca6d927 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -776,6 +776,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
index 37c2a49..b312428 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
@@ -403,7 +403,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 22b3721..433b703 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -328,7 +328,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
index c5eebb5..5a59f91 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
@@ -234,7 +234,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
index e68a0b5..99a9647 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
@@ -255,7 +255,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
index 4e75127..a6b1c79 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -336,7 +336,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 39b1c13..6b7ec73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -247,6 +247,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 31a5ae0..0aae4c5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -428,7 +428,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
index 88af88f..f655d45 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -228,6 +228,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input v-model="option.data"
type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
index a183665..a0f504e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
@@ -334,7 +334,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index 3a0fd99..6f0fad7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -308,7 +308,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
index f76be23..cb48552 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
@@ -341,7 +341,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
index 2ed8a40..e486cfb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
@@ -286,7 +286,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
index 6592116..2dcf982 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
@@ -266,7 +266,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="text" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index e6d9056..326fe83 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -397,7 +397,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index f121f3d..163f213 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -479,7 +479,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
index 171c995..615aae5 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -381,7 +381,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index e5fcb9f..bde8b03 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1498,7 +1498,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue
index a44b0d9..0e43edb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInReviewDetail.vue
@@ -185,7 +185,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
index 84a802e..925bdbc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -414,7 +414,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 477bf86..0647455 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -453,7 +453,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index 92f44d9..b7ff859 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -328,7 +328,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
index 1080fbe..cc66d02 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
@@ -736,6 +736,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index 0c62ec5..b0c1fba 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -381,7 +381,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index b4e1514..da8d7a2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -281,7 +281,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index e4c3edd..9bd43c6 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -411,7 +411,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPrice.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPrice.vue
new file mode 100644
index 0000000..954640a
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPrice.vue
@@ -0,0 +1,66 @@
+<script setup>
+import {ref} from "vue";
+import {ArrowLeftBold, ArrowRight, Search} from "@element-plus/icons-vue"
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElMessage} from "element-plus";
+import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router"
+import {useI18n} from "vue-i18n"
+const { t } = useI18n()
+const router = useRouter()
+const route = useRoute()
+let indexFlag=$ref(1)
+function changeRouter(index){
+ indexFlag=index
+}
+
+</script>
+
+<template>
+ <div id="main">
+ <div id="div-title">
+ <el-breadcrumb :separator-icon="ArrowRight">
+ <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/glassPrice/producePriceCompute' }">{{'鐜荤拑鎶ヤ环'}}</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/glassPrice/glassPriceSet' }">{{'鐜荤拑浠锋牸璁剧疆'}}</el-breadcrumb-item>
+ <!-- <el-breadcrumb-item :to="{ path: '/main/product/test' }">娴嬭瘯</el-breadcrumb-item>-->
+ <!-- <el-breadcrumb-item :to="{ path: '/main/product/testSort11' }">娴嬭瘯</el-breadcrumb-item>-->
+ <el-breadcrumb-item v-show="false" />
+ </el-breadcrumb>
+
+ </div>
+
+ <div id="main-body">
+ <router-view :key="route.fullPath" />
+ </div>
+ </div>
+</template>
+
+<style scoped>
+#main{
+ width: 100%;
+ height: 100%;
+}
+#div-title{
+ height: 2%;
+ width: 100%;
+}
+#searchButton{
+ margin-top: -5px;
+ margin-left: 1rem;
+}
+#searchButton1{
+//margin-left: 10rem;
+}
+/*main-body鏍峰紡*/
+#main-body{
+ width: 99%;
+ height: 95%;
+ margin-top: 1%;
+}
+#select{
+ margin-left:0.5rem;
+}
+:deep(.indexTag .el-breadcrumb__inner){
+ color: #5CADFE !important;
+}
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue
new file mode 100644
index 0000000..f79cdd8
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/GlassPriceSet.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProducePriceCompute.vue b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProducePriceCompute.vue
new file mode 100644
index 0000000..79492dd
--- /dev/null
+++ b/north-glass-erp/northglass-erp/src/views/sd/glassPrice/ProducePriceCompute.vue
@@ -0,0 +1,11 @@
+<script setup>
+
+</script>
+
+<template>
+1
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
--
Gitblit v1.8.0