From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 210 +++++++++++++++++++++++++++++-----------------------
1 files changed, 117 insertions(+), 93 deletions(-)
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 caee1e8..bb51b5a 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
@@ -7,6 +7,13 @@
import deepClone from "@/utils/deepClone";
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+import userInfo from "@/stores/userInfo"
+
+//璇█鑾峰彇
+const { t } = useI18n()
+const user=userInfo()
let router = useRouter()
@@ -16,6 +23,11 @@
let produceList = ref([])
//瀹氫箟褰撳墠椤垫暟
let pageNum=$ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
const xGrid = ref();
let cellArea = ref()
@@ -49,14 +61,6 @@
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
//瀛愮粍浠舵帴鏀跺弬鏁�
@@ -66,7 +70,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -77,7 +81,7 @@
body: {
options: [
[
- { code: 'copyChecked', name: '閫変腑鐩稿悓', prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
]
]
}
@@ -99,34 +103,35 @@
},//琛ㄥご鍙傛暟
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {field: 'select',type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
- {field: 'reworkTeam', width: 120, title: '杩斿伐鐝粍', slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
- {field: 'orderId', width: 120, title: '閿�鍞崟鍙�', sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'processId', width: 120, title: '娴佺▼鍗″彿', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
- {field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
- {field: 'batch', width: 80, title: '鎵规', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
- {field: 'orderSort', width: 80, title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'productName', width: 120, title: '鍗曠墖鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'technologyNumber', width: 80, title: '鏍囪', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
- {field: 'glassAddress', width: 90, title: '鐗囨爣璁�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'breakageQuantity', width: 120, title: '娆＄牬鏁伴噺', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkNum',width:120, title: '杩斿伐鏁伴噺',editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'width', width: 80, title: '瀹�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'height', width: 80, title: '楂�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'shape', width: 80, title: '褰㈢姸', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkProcesses', width: 100, title: '杩斿伐宸ュ簭', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkType', width: 100, title: '杩斿伐绫诲瀷', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkReason', width: 120, title: '杩斿伐鍘熷洜', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'responsibleEquipment', width: 120, title: '璐ｄ换璁惧', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'responsibleTeam', width: 120, title: '璐ｄ换鐝粍', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'area', width: 120, title: '杩斿伐闈㈢Н', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'qualityInspector', width: 100, title: '璐ㄦ鍛�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
+ {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'reworkTeam', width: 160, title: t('rework.reworkTeam'), slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
+ {field: 'orderId', width: 130, title: t('order.orderId'), sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'processId', width: 140, title: t('processCard.processId'), sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'orderSort', width: 120, title: t('order.OrderNum'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'technologyNumber', width: 110, title: t('replenish.mark'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'reworkProcesses', width: 120, title: t('rework.reworkProcess'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkType', width: 120, title: t('rework.reworkType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkReason', width: 120, title: t('rework.reasonForRework'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'batch', width: 90, title: t('order.batch'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'glassAddress', width: 120, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkNum',width:120, title: t('productStock.reworkQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'width', width: 80, title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'height', width: 80, title: t('order.height'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'shape', width: 100, title: t('order.shape'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'area', width: 120, title: t('rework.reworkArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'qualityInspector', width: 120, title: t('reportingWorks.qualityInspector'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'productName', width: 120, title: t('order.product'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {'code': 'add', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save'}
+ {'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'}
],
import: false,
export: true,
@@ -140,10 +145,10 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ return footSum(data, column.field)
}
return ''
})
@@ -166,23 +171,28 @@
return
}
} else {
- ElMessage.warning("鏈�変腑鏁版嵁")
+ ElMessage.warning(t('productStock.unselectedData'))
return
}
-
+ gridOptions.loading=true
let flowData = ref({
- rework: selectRecords
-
+ rework: selectRecords,
+ userId:user.user.userId,
+ userName:user.user.userName
})
request.post("/rework/saveRework", flowData.value).then((res) => {
- if(res.code==200){
- ElMessage.success("杩斿伐鍗曟彁浜ゆ垚鍔�")
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
+ gridOptions.loading=false
}else{
- ElMessage.warning(res.msg)
- router.push("/login")
+ gridOptions.loading=false
+ ElMessage.warning(t('basicData.msg.saveFail'))
}
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
})
break
}
@@ -254,19 +264,19 @@
/*鏁版嵁鏍￠獙*/
const validRules = ref({
reworkTeam: [
- { required: true, message: '璇烽�夋嫨杩斿伐鐝粍' }
+ { required: true, message: t('rework.PleaseSelectAReworkTeam') }
],
reworkNum: [{
validator (e) {
if (e.row.reworkNum > e.row.breakageQuantity) {
- return new Error('杩斿伐鏁伴噺涓嶈兘澶т簬娆＄牬鏁伴噺')
+ return new Error(t('rework.TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity'))
}else if (e.row.reworkNum ==="") {
- return new Error('杩斿伐鏁伴噺涓嶈兘涓虹┖鎴栬�呮槸0')
+ return new Error(t('rework.reworkQuantityCannotBeEmptyOr0'))
}
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.reworkNum) ) {
- return new Error('璇疯緭鍏ユ鏁存暟')
+ return new Error(t('productStock.pleaseEnterAPositiveInteger'))
}
}
@@ -288,68 +298,72 @@
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- max-height="100%"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
- :edit-rules="validRules"
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ :edit-rules="validRules"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">淇濆瓨</el-button>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">淇濆瓨</el-button>
- </template>
+ </template>
- <!-- 绛涢�夋彃妲� -->
- <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)"/>
+ <!-- 绛涢�夋彃妲� -->
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- <!-- 杩斿伐鐝粍-->
- <template #responsibleTeam="{ row }">
- <vxe-select v-model="row.reworkTeam" transfer >
- <vxe-option v-for="item in row.basicCategory" :key="item.basicName" :label="item.basicName" :value="item.basicName"/>
- </vxe-select>
- </template>
- <template #responsibleTeam_default="{ row }">
- <span>{{ row.reworkTeam }}</span>
- </template>
+ <!-- 杩斿伐鐝粍-->
+ <template #responsibleTeam="{ row }">
+ <vxe-select v-model="row.reworkTeam" transfer >
+ <vxe-option v-for="item in row.basicCategory" :key="item.basicName" :label="item.basicName" :value="item.basicName"/>
+ </vxe-select>
+ </template>
+ <template #responsibleTeam_default="{ row }">
+ <span>{{ row.reworkTeam }}</span>
+ </template>
- </vxe-grid>
- </div>
- <div class="vxe-table--cell-area" ref="cellArea" >
- <span class="vxe-table--cell-main-area" ></span>
+ </vxe-grid>
+ </div>
+ <div class="vxe-table--cell-area" ref="cellArea" >
+ <span class="vxe-table--cell-main-area" ></span>
- <span class="vxe-table--cell-active-area" ></span>
+ <span class="vxe-table--cell-active-area" ></span>
+ </div>
</div>
</template>
<style scoped>
.main-div-customer {
width: 99%;
- height: 100%;
+ height: 95%;
}
.vxe-grid {
/* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
@@ -358,4 +372,14 @@
-ms-user-select: none;
user-select: none;
}
+
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0