From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 135 insertions(+), 8 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 e48f729..d9c0f21 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
@@ -15,12 +15,14 @@
import {useI18n} from 'vue-i18n'
import footSum from "@/hook/footSum"
import {changeFilterEvent,filterChanged} from "@/hook"
+import userInfo from "@/stores/userInfo"
//璇█鑾峰彇
const {t} = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
const username = userStore.user.userName
+const user=userInfo()
let flag = $ref(true)
function intoCreateProduct() {
@@ -74,13 +76,14 @@
const orderOtherMoney = ref(null)
-
+let maxProcseeId=null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/selectNoCard/${orderId}/${productionId}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
+ maxProcseeId=res.data.maxFlowCard[0].process_id
orderOtherMoney.value = res.data.orderOtherMoney
orderOtherMoney.value.forEach(item => {
let column = {
@@ -90,6 +93,7 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
+ sortable: true
}
gridOptions.columns.push(column)
@@ -189,12 +193,24 @@
filterMethod: filterChanged,
width: '78px'
},
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
{field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '80px'},
{field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
{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},
+ {field: 'processing_note', title: t('order.processingNote'), width: '105px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
+ {field: 'bend_radius', title: t('order.bendRadius'), width: '120px',filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged,sortable: true,}
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -301,6 +317,15 @@
filterMethod: filterChanged,
width:70
},
+ {
+ field: 'building_number',
+ title: t('order.buildingNumber'),
+ sortable: true,
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: '120px'
+ },
{field: 'width', title: t('order.width'), showOverflow: "ellipsis",width:70},
{field: 'height', title: t('order.height'),width:70},
{field: 'quantity', title: t('order.quantity'),width:70},
@@ -354,7 +379,32 @@
index = leftData[0].landingSequence + 1
//index = index.toString().padStart(2, '0')
}
- const processId = productionId + index.toString().padStart(3, '0')
+ let processId= null
+ // if (leftData.length !== 0){
+ // processId = productionId + index.toString().padStart(3, '0')
+ // }
+ // else {
+ if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
+ if (leftData.length !== 0){
+ const str=leftData[0].processId
+ const lastThree = str.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+ else {
+ // 鎴彇鍚庝笁浣�
+ const lastThree = maxProcseeId.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+
+ }
+ else {
+ processId = productionId + index.toString().padStart(3, '0')
+ }
+ //}
+
+
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
ElMessage.warning(t('processCard.schedulingNo'))
@@ -403,6 +453,75 @@
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
}
+}
+
+
+//鎸夌紪鍙峰垱寤烘祦绋嬪崱
+const createProcessCardNo = () => {
+ const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+
+ if (checkedList.length === 0) {
+ ElMessage.warning(t('processCard.schedulingOk'))
+ return
+ }
+ //productionId
+ const $gridLeft = xGridLeft.value
+ const leftData = $gridLeft.getTableData().fullData
+ let index = 0
+ if (leftData.length !== 0) {
+ index = leftData[0].landingSequence + 1
+ //index = index.toString().padStart(2, '0')
+ }
+
+ let processId= null
+
+ if (maxProcseeId!== null || maxProcseeId!== undefined|| maxProcseeId!== ''){
+ if (leftData.length !== 0){
+ const str=leftData[0].processId
+ const lastThree = str.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+ else {
+ // 鎴彇鍚庝笁浣�
+ const lastThree = maxProcseeId.slice(-3);
+ const result = lastThree*1 + 1;
+ processId= productionId + result.toString().padStart(3, '0')
+ }
+
+ }
+ else {
+
+ processId = productionId + index.toString().padStart(3, '0')
+
+
+ }
+
+
+ const regex = /^(\d+|)$/;
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
+ return
+ }
+
+ checkedList.forEach((item) => {
+ index++
+ processId = productionId + index.toString().padStart(3, '0')
+ item.processId = processId
+ item.landingSequence = index
+ item.quantity = item.baiscQuantity
+ })
+ //鍒犻櫎key
+ checkedList.forEach((item) => {
+ delete item._X_ROW_KEY
+ })
+ $gridLeft.insertAt(checkedList)
+ $grid.remove(checkedList)
+ //娓呴櫎涓よ竟澶嶉�夋
+ $gridLeft.clearCheckboxRow()
+ $grid.clearCheckboxRow()
+
}
@@ -641,6 +760,7 @@
if ($grid) {
switch (code) {
case 'saveFlowCard': {
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=true
const $table = xGridLeft.value
const $tableRight = xGrid.value
if ($table) {
@@ -649,17 +769,20 @@
let leftData = $tableRight.getTableData().fullData
if (selectRecords.length === 0) {
ElMessage.warning(t('processCard.pleaseSelectTheSavedDataFirst'))
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return
}
if (leftData.length > 0) {
ElMessage.warning(t('processCard.pleaseFirstCreateAProcessCardForAllTheDataOnTheRightSideAndSaveIt'))
+ gridLeftOptions.toolbarConfig.buttons[0].disabled=false
return;
}
let flowCardData = ref({
flowCard: selectRecords,
userName: username,
- productionId: productionId
+ productionId: productionId,
+ userId:user.user.userId
})
request.post("/processCard/addFlowCard", flowCardData.value).then((res) => {
@@ -710,9 +833,7 @@
<template>
<div style="width: 75%;height: 90%">
-
- <div class="common-layout" style="width: 100%;height: 100%">
-
+ <div class="common-layout">
<el-button
id="searchButton1"
:icon="ArrowLeftBold"
@@ -753,6 +874,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>
@@ -776,6 +898,9 @@
<br>
<br>
<el-button type="primary" @click="createProcessCard">{{ $t('processCard.establishProcessCards') }}
+ </el-button>
+ <br><br><br><br><br>
+ <el-button type="primary" @click="createProcessCardNo">{{ $t('processCard.createBySequenceNumber') }}
</el-button>
</el-main>
</div>
@@ -816,6 +941,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>
@@ -835,7 +961,8 @@
}
.common-layout {
- height: 100%;
+ width: 99%;
+ height: 96%;
}
.header {
--
Gitblit v1.8.0