From 5a5e59f8aaa2a030511ef245886bf6d1db9bf774 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 15 三月 2024 14:40:14 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 163 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 97 insertions(+), 66 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 6602727..bcab2ab 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
@@ -12,7 +12,9 @@
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";
import useUserInfoStore from "@/stores/userInfo";
-
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
const userStore = useUserInfoStore()
@@ -30,11 +32,11 @@
case 'delete': {
request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
if (res.code == 200) {
- ElMessage.success("鍒犻櫎鎴愬姛")
+ ElMessage.success(t('workOrder.deleteOk'))
location.reload();
} else {
ElMessage.warning(res.msg)
- router.push("/login")
+ // router.push("/login")
}
})
break
@@ -166,17 +168,17 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: '閫夋嫨'},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check')},
{
field: 'orderNumber',
- title: '璁㈠簭',
+ title: t('basicData.check'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'shape',
- title: '褰㈢姸',
+ title: t('order.shape'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -184,7 +186,7 @@
},
{
field: 'width',
- title: '瀹�',
+ title: t('order.width'),
sortable: true,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -193,18 +195,18 @@
},
{
field: 'height',
- title: '楂�',
+ title: t('order.height'),
sortable: true,
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
width: '60px'
},
- {field: 'baiscQuantity', title: '寰呭垎鏁伴噺', showOverflow: "ellipsis", width: '60px'},
- {field: 'computeGrossArea', title: '寰呭垎闈㈢Н', width: '60px'},
- {field: 'totalThickness', title: '鎬诲帤搴�', width: '80px'},
- {field: 'thickness', title: '鐜荤拑鍘氬害', width: '60px'},
- {field: 'weight', title: '閲嶉噺'}
+ {field: 'baiscQuantity', title: t('processCard.quantityToDivided'), showOverflow: "ellipsis", width: '60px'},
+ {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '60px'},
+ {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
+ {field: 'thickness', title: t('processCard.glassThickness'), width: '60px'},
+ {field: 'weight', title: t('processCard.weight')}
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -224,7 +226,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -267,10 +269,10 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'checkbox', fixed: "left", title: '閫夋嫨'},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check')},
{
field: 'processId',
- title: '娴佺▼鍗″彿',
+ title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
width: 130,
@@ -278,7 +280,7 @@
},
{
field: 'orderNumber',
- title: '璁㈠簭',
+ title: t('order.OrderNum'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
@@ -286,21 +288,21 @@
},
{
field: 'landingSequence',
- title: '灏忕墖椤哄簭',
+ title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
- {field: 'shape', title: '褰㈢姸', filters: [{data: ''}], slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
- {field: 'width', title: '瀹�', showOverflow: "ellipsis"},
- {field: 'height', title: '楂�'},
- {field: 'quantity', title: '鎬绘暟閲�'},
- {field: 'totalThickness', title: '鎬诲帤搴�'},
+ {field: 'shape', title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
+ {field: 'width', title: t('order.width'), showOverflow: "ellipsis"},
+ {field: 'height', title: t('order.height')},
+ {field: 'quantity', title: t('order.quantity')},
+ {field: 'totalThickness', title: t('processCard.totalThickness')},
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
- {code: 'saveFlowCard', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'saveFlowCard', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
// export: true,
@@ -315,7 +317,7 @@
return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -326,13 +328,15 @@
}
})
+//瀹氫箟杈撳叆鏁伴噺
+let checkedNum = ref('')
//鍒涘缓娴佺▼鍗�
const createProcessCard = () => {
const $grid = xGrid.value
const checkedList = $grid.getCheckboxRecords()
if (checkedList.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨鍙充晶鏁版嵁")
+ ElMessage.warning(t('processCard.schedulingOk'))
return
}
//productionId
@@ -344,23 +348,61 @@
//index = index.toString().padStart(2, '0')
}
const processId = productionId + index.toString().padStart(2, '0')
- checkedList.forEach((item) => {
- item.processId = processId
- item.landingSequence = index
- item.quantity = item.baiscQuantity
- })
- checkedList.forEach((item) => {
- delete item._X_ROW_KEY
- })
- $gridLeft.insertAt(checkedList)
- $grid.remove(checkedList)
- if ($gridLeft || $grid) {
+ const regex = /^(\d+|)$/;
+ if (!regex.test(checkedNum.value)) {
+ ElMessage.warning(t('processCard.schedulingNo'))
+ return
+ }
+ //鍒ゆ柇姝ｆ暣鏁�
+ if (/^[1-9]\d*$/.test(checkedNum.value)) {
+ checkedList.forEach((item) => {
+ //瀹氫箟key鍊间繚鎸�
+
+ //鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
+ if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error(t('processCard.schedulingQuantity'));
+ item.quantity = checkedNum.value
+ item.processId = processId
+ item.landingSequence = index
+ item.baiscQuantity=item.baiscQuantity - checkedNum.value
+ })
+ //鍒犻櫎key
+ checkedList.forEach((item) => {
+ let key = item._X_ROW_KEY
+ delete item._X_ROW_KEY
+ if (item.baiscQuantity===0){
+ $grid.remove(checkedList)
+ }
+ $gridLeft.insertAt(checkedList)
+ item._X_ROW_KEY = key
+ })
+
+//娓呴櫎涓よ竟澶嶉�夋
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
}
+ else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
+
+ checkedList.forEach((item) => {
+ 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()
+ }
+
+
+
}
-let checkedNum = ref('')
+
//鍚戝彸杈硅〃鏍兼坊鍔犳暟鎹�
const addRight = () => {
@@ -373,12 +415,12 @@
const checkedList = $gridLeft.getCheckboxRecords()
//鍒ゆ柇宸﹁竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
if (checkedList.length === 0) {
- ElMessage.warning("璇峰厛閫夋嫨宸︿晶鏁版嵁")
+ ElMessage.warning(t('processCard.schedulingArea'))
return
}
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
- ElMessage.warning("璇疯緭鍏ユ鏁存暟")
+ ElMessage.warning(t('processCard.schedulingNo'))
return
}
//鍒ゆ柇姝ｆ暣鏁�
@@ -386,7 +428,7 @@
//瀵归�変腑鐨勫乏杈硅〃鏍兼暟鎹繘琛屽惊鐜�
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.quantity < checkedNum.value) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡彲鐢ㄦ暟閲忕殑鏁板瓧");
+ if (item.quantity < checkedNum.value) throw new Error(t('processCard.schedulingQuantity'));
//宸﹁竟琛ㄦ牸鍙敤鏁伴噺鍑忓幓杈撳叆鐨勬暟閲�
item.quantity = item.quantity - checkedNum.value
//鍙宠竟琛ㄦ牸鏁版嵁
@@ -409,7 +451,7 @@
$grid.insert(item)
}
})
- } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘湁鏃犺緭鍏ユ暟瀛�
+ } else if (checkedNum.value === '') {//鍒ゆ柇鏁伴噺杈撳叆妗嗘棤杈撳叆鏁板瓧
checkedList.forEach((item) => {
let rightData = $grid.getTableData().fullData
@@ -427,6 +469,7 @@
}
+ //娓呴櫎涓よ竟澶嶉�夋
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
} catch (e) {
@@ -446,23 +489,23 @@
const checkedListLeft = $gridLeft.getCheckboxRecords()
//鍒ゆ柇鍙宠竟琛ㄦ牸鏄惁鏈夐�変腑鐨勬暟鎹�
if (checkedList.length * 1 === 0) {
- ElMessage.warning("璇峰厛閫夋嫨鍙充晶鏁版嵁")
+ ElMessage.warning(t('processCard.schedulingOk'))
return
}
if (checkedListLeft.length !== 1) {
- ElMessage.warning("璇峰厛閫夋嫨宸︿晶涓�鏉℃暟鎹�")
+ ElMessage.warning(t('processCard.schedulingTime'))
return
}
const regex = /^(\d+|)$/;
if (!regex.test(checkedNum.value)) {
- ElMessage.warning("璇疯緭鍏ユ鏁存暟")
+ ElMessage.warning(t('processCard.schedulingNo'))
return
}
//鍒ゆ柇姝ｆ暣鏁�
if (/^[1-9]\d*$/.test(checkedNum.value)) {
checkedList.forEach((item) => {
//鍒ゆ柇鍙敤鏁伴噺鏄惁澶т簬绛変簬杈撳叆鐨勬暟閲�,涓嶆弧瓒冲垯鎶涘嚭寮傚父
- if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡彲鐢ㄦ暟閲忕殑鏁板瓧");
+ if (item.baiscQuantity * 1 < checkedNum.value * 1) throw new Error("璇疯緭鍏ュ皬浜庣瓑浜庡緟鍒嗘暟閲忕殑鏁板瓧");
item.baiscQuantity = item.baiscQuantity - checkedNum.value
//瀹氫箟key鍊间繚鎸�
let key = item._X_ROW_KEY
@@ -491,9 +534,6 @@
}
} else {
- // if (){
- //
- // }
//濡傛灉鍕鹃�変袱涓�间笉鍚屽垯鎻掑叆鍚屾祦绋嬪崱
item.quantity = checkedNum.value
item.processId = checkedListLeft[0].processId
@@ -521,18 +561,6 @@
break
}
}
- // leftData.forEach((items) => {
- // console.log(items.processId, item.processId,"鈥斺�斺�斺�斺�斺��",items.orderNumber, item.orderNumber)
- // if (items.orderNumber === item.orderNumber && items.processId===item.processId) {
- // console.log("娴嬭瘯333")
- //
- // }
- // else{
- //
- // }
- //
- // })
-
}
})
@@ -546,6 +574,7 @@
$gridLeft.insertAt(checkedList)
$grid.remove(checkedList)
}
+ //娓呴櫎涓よ竟澶嶉�夋
if ($gridLeft || $grid) {
$gridLeft.clearCheckboxRow()
$grid.clearCheckboxRow()
@@ -568,12 +597,14 @@
const $tableRight = xGrid.value
if ($table) {
const selectRecords = $table.getCheckboxRecords()
- const selectRight = $tableRight.getCheckboxRecords()
+ // const selectRight = $tableRight.getCheckboxRecords()
+ let leftData = $tableRight.getTableData().fullData
if (selectRecords.length === 0) {
ElMessage.warning("璇峰厛閫夋嫨淇濆瓨鐨勬暟鎹�")
return
}
- if (selectRight.length > 0) {
+
+ if (leftData.length > 0) {
ElMessage.warning("璇峰厛灏嗗彸渚ф暟鎹叏閮ㄥ缓绔嬫祦绋嬪崱鍚庝繚瀛�")
return;
}
@@ -623,7 +654,7 @@
style="float: left"
type="primary"
@click="intoCreateProduct">
- {{ flag ? '杩斿洖' : '杩斿洖' }}
+ {{ flag ? t('processCard.return') : t('processCard.return') }}
</el-button>
<!-- <el-button type="primary">淇濆瓨鍒嗘灦</el-button>-->
<!-- <el-button type="primary" :hidden="true">鍒嗘灦姹囨��</el-button>-->
@@ -676,14 +707,14 @@
<div width="12%">
<el-main style="">
- <span>閫変腑鏁伴噺:<el-input v-model="checkedNum" clearable type="number"></el-input></span><br>
+ <span>{{$t('processCard.selectedQuantity')}}:<el-input v-model="checkedNum" clearable type="number"></el-input></span><br>
<el-button type="primary" @click="addRight"> 鈫�</el-button>
<br>
<br>
<el-button type="primary" @click="addLeft"> 鈫�</el-button>
<br>
<br>
- <el-button type="primary" @click="createProcessCard">寤虹珛娴佺▼鍗�</el-button>
+ <el-button type="primary" @click="createProcessCard">{{$t('processCard.establishProcessCards')}}</el-button>
</el-main>
</div>
--
Gitblit v1.8.0