From 761aa895b2955a13a8d3d56405336404bca18451 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 七月 2024 11:58:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue | 26 +++++++++++++++++++++++++-
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 22 +++++-----------------
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 2 ++
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2 +-
4 files changed, 33 insertions(+), 19 deletions(-)
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 39783f8..e48f729 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
@@ -14,6 +14,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
+import {changeFilterEvent,filterChanged} from "@/hook"
//璇█鑾峰彇
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
@@ -84,7 +85,7 @@
orderOtherMoney.value.forEach(item => {
let column = {
field: `${item.column}`,
- width: 85,
+ width: 100,
title: item.alias,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -102,11 +103,7 @@
}
})
-/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
-const changeFilterEvent = (event, option, $panel,) => {
- // 鎵嬪姩瑙﹀彂绛涢��
- $panel.changeOption(event, !!option.data, option)
-}
+
function padLeftZero(str) {
return ('00' + str).substr(str.length)
@@ -120,14 +117,7 @@
}
-//绛涢�夋柟娉�
-const filterChanged = ({option, row, column}) => {
- if (option.data) {
- return row[column.field].toString().toLowerCase().indexOf(option.data) > -1
- }
- return true
- //@filter-change="filterChanged"
-}
+
//鍙充晶瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
@@ -204,9 +194,7 @@
{field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
{field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
{field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
- {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged}
+ {field: 'remarks', title: t('processCard.notes'), width: '85px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged}
],//琛ㄥご鎸夐挳
toolbarConfig: {
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
index 7d1f64d..ee26e9c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
@@ -51,6 +51,7 @@
}
}
}
+
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -99,6 +100,23 @@
body.removeChild(style);
}, 20);
}
+
+//淇敼鐩稿悓浜у搧鍚嶇О鏍囩
+const updataProductName = () => {
+ // 閬嶅巻闆嗗悎涓殑姣忎釜瀵硅薄
+ // lastList.value.forEach(obj => {
+ // // 鎻愬彇 processId 鐨勫墠11浣�
+ // let prefix = obj.processId.substring(0, 11);
+ // let enName= obj.productAbbreviation
+ // if (prefix === obj.processId.substring(0, 11)){
+ // obj.productAbbreviation = enName
+ // }
+ // })
+ for (let i = 0; i < lastList.value.length; i++) {
+ let prefix = lastList.value[i].processId.substring(0, 11);
+ let enName= lastList.value[i].productAbbreviation
+ }
+}
</script>
<template>
@@ -109,7 +127,7 @@
<div v-for="(item,id) in labelList" :class="company.printLabel.className.custom.contentRowName()">
<div v-if="item.title==null" class="row1">{{ item.title }}</div>
<div v-else class="row1">{{ item.title }}:</div>
- <div class="row2">{{ item1[item.name] }}</div>
+ <div class="row2" style="width: 100%;"><input v-model="item1[item.name]" @keyup="updataProductName()" style="background-color: #D5EAFF;border: none;"/></div>
</div>
<div v-html="company.printLabel.custom(item1)"></div>
</div>
@@ -196,6 +214,12 @@
text-align: left;
}
+input{
+ width: 100%;
+ background-color: #D5EAFF;
+ border: none;
+}
+
@page {
size: auto; /* auto is the initial value */
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 d491154..88c0b3d 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
@@ -4,11 +4,13 @@
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import {changeFilterEvent, filterChanged} from "@/hook"
+import domZIndex from 'dom-zindex'
import {indexOf} from "xe-utils";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum"
+domZIndex.setCurrent(3000)
//璇█鑾峰彇
const { t } = useI18n()
let brokenVisible = ref(false)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index a64157a..fb4669b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -915,7 +915,7 @@
</select>
<select id="selectorderOtherMoney">
- select * from sd.basic_other_money where (id=21 or id>31)
+ select * from sd.basic_other_money where id between 21 and 35
</select>
<select id="selectReworkPrintMp">
--
Gitblit v1.8.0