From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 410 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 325 insertions(+), 85 deletions(-)
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 c6c71a8..132bd11 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
@@ -1,5 +1,5 @@
<script setup>
-import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
+import {computed, nextTick, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
import {useRouter,useRoute} from 'vue-router'
import request from "@/utils/request";
import {ElMessage} from "element-plus";
@@ -8,6 +8,7 @@
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum"
//璇█鑾峰彇
const { t } = useI18n()
let brokenVisible = ref(false)
@@ -20,7 +21,7 @@
const titleUploadData = ref({
reportingWorkId: null,
//娴佺▼鍗″彿
- processId: 'NG24030804A02/1',
+ processId: null,
//閿�鍞崟鍙�
orderId: '',
reviewedState:0,
@@ -64,6 +65,7 @@
})
let detail = ref([])
+let layer=''
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -80,6 +82,8 @@
})
+
+
let inputDisabled = ref(false)
onMounted(() =>{
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
@@ -92,19 +96,48 @@
if(res.code === '200'){
titleUploadData.value = res.data.reportingWork
titleSelectJson.value = res.data.basic
+ layer= res.data.layer
+
+ const s01Values = [];
+ // 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ res.data.numberList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+ // 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.reportingWorkDetails.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+ //titleUploadData.value.processId=titleUploadData.value.processId+'/'+layer
xGrid.value.reloadData(res.data.reportingWorkDetails)
let button = {
code: 'update',
- name: '淇敼',
+ name: t('basicData.update'),
status: 'primary',
}
if(route.query.reviewStatus === "1"){
- button.name='瀹℃牳'
+ button.name=t('basicData.review')
titleUploadData.value.qualityInspector=user.user.userName
}
gridOptions.toolbarConfig.buttons.push(button)
}
+ // getQuantity()
inputDisabled.value = true
})
}
@@ -127,15 +160,15 @@
const optionVal = ref('')
//鐝
-const classesVal = ref('鏃╃彮')
+const classesVal = ref(t('reportingWorks.early'))
const classesOption = [
{
- value: '鏃╃彮',
- label: '鏃╃彮',
+ value: t('reportingWorks.early'),
+ label: t('reportingWorks.early'),
},
{
- value: '鏅氱彮',
- label: '鏅氱彮',
+ value: t('reportingWorks.nightShift'),
+ label: t('reportingWorks.nightShift'),
},
]
@@ -163,16 +196,62 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
trigger: 'click',
mode: 'row',
showStatus: true
- },//琛ㄥご鍙傛暟
+ },
+ menuConfig: {
+ /*body: {
+ options: [
+ [
+ {
+ code: 'copyChecked',
+ name: t('basicData.selectSame'),
+ prefixIcon: 'vxe-icon-copy',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'copyAll',
+ name: t('basicData.sameAfterwards'),
+ prefixIcon: 'vxe-icon-feedback',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'clearChecked',
+ name: t('basicData.clearSelection'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ ]
+ ]
+ }*/
+ },
+ //琛ㄥご鍙傛暟
columns: [
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{
field: 'order_number',
title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 's01Value',
+ title: t('reportingWorks.glassNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -254,12 +333,14 @@
const brokenNum =
(row.breakageQuantity === undefined || row.breakageQuantity===null) ? 0 : row.breakageQuantity
if (row.completedQuantity && !regex.test(row.completedQuantity)) {
- return new Error('璇疯緭鍏ユ暣鏁帮紝骞朵笖澶т簬绛変簬0')
+ return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
}else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
}
if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
- return new Error(`璇疯緭鍏ュぇ浜庣瓑浜�${row.minQuantity}鐨勬暟瀛梎)
+ return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
+ ${row.minQuantity}
+ ${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
}
}
@@ -283,12 +364,15 @@
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
+ }
+ const List = ["quantity_card",'quantity','completedQuantity','completed','onceBroken']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -311,7 +395,7 @@
case 'saveReportingWork': {
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
saveReportingWork(0,'save')
@@ -320,16 +404,17 @@
case 'saveReportingWorkReview': {
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
saveReportingWork(1,'save')
break
}
case 'update': {
+ getQuantity()
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
saveReportingWork(0,'update')
@@ -346,9 +431,64 @@
}
//brokenGrid.value.reloadData(brokenRow.damageDetail)
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
- brokenVisible.value = true
+ const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
+ //鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
+ if(column.field=="breakageQuantity"){
+ brokenVisible.value = true
+ }
+ },
+ menuClick({menu, row, column}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'copyChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
- }
+ break
+ }
+ case 'copyAll' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'clearChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = ''
+ }
+ })
+ }
+ }
+ break
+ }
+ }
+ }
+ },
}
@@ -359,7 +499,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'CustomerListDetail',
//showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -444,7 +584,7 @@
validator ({ cellValue }) {
const regex = /^[1-9]\d*$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆澶т簬0鐨勬暣鏁�')
+ return new Error(t('reportingWorks.enterIntegerGreaterThan'))
}
}
}
@@ -454,25 +594,25 @@
validator ({ row }) {
const regex = /^\s*$/i
if(row.available===true && (regex.test(row.returnProcess)==='' || row.returnProcess===null)){
- return new Error('鍙埄鐢ㄥ凡閫夋嫨锛岃閫夋嫨杩斿洖宸ュ簭')
+ return new Error(t('reportingWorks.availableOkReturnProcess'))
}
}
}
],
breakageType: [
- { required: true, message: '璇烽�夋嫨娆＄牬绫诲瀷' }
+ { required: true, message: t('reportingWorks.selectBreakageType') }
],
breakageReason: [
- { required: true, message: '璇烽�夋嫨娆＄牬鍘熷洜' }
+ { required: true, message: t('reportingWorks.selectBreakageReason') }
],
responsibleProcess: [
- { required: true, message: '璇烽�夋嫨璐ｄ换宸ュ簭' }
+ { required: true, message: t('reportingWorks.selectResponsibleProcess')}
],
responsibleEquipment: [
- { required: true, message: '璇烽�夋嫨璐ｄ换璁惧' }
+ { required: true, message: t('reportingWorks.selectResponsibleEquipment') }
],
responsibleTeam: [
- { required: true, message: '璐ｄ换鐝粍' }
+ { required: true, message: t('reportingWorks.selectResponsibleTeam') }
],
},
toolbarConfig: {//琛ㄥご鎸夐挳
@@ -516,12 +656,15 @@
const checkClose = async (done) => {
if(brokenGrid.value.getTableData().fullData.length===0){
+ brokenRow.value.breakageQuantity=null
+ brokenRow.value.completedQuantity = brokenRow.value.quantity
+ brokenRow.value.damageDetails=[]
done()
return true
}
const errMap = await brokenGrid.value.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return false
}
let breakageQuantityCount = 0
@@ -532,8 +675,8 @@
let reportingWorkNum = isNaN(brokenRow.value.completedQuantity*1)?0:brokenRow.value.completedQuantity*1
if((breakageQuantityCount>brokenRow.value.quantity*1) ){
- ElMessage.warning(`鎹熻�楁暟:'${breakageQuantityCount}'
- 涓嶈兘澶т簬${brokenRow.value.quantity*1}`)
+ ElMessage.warning(`${t('reportingWorks.lossCount1')}':'${breakageQuantityCount}
+ ${t('reportingWorks.lossCount2')}${brokenRow.value.quantity*1}`)
return false
}
brokenRow.value.completedQuantity = brokenRow.value.quantity-breakageQuantityCount
@@ -598,17 +741,17 @@
const saveReportingWork = (state,saveType) => {
if(xGrid.value.getTableData().fullData.length===0){
- ElMessage.warning(`璇烽�夋嫨娴佺▼鍗℃暟鎹甡)
+ ElMessage.warning(t('reportingWorks.selectProcessCardData'))
return
}
const device = titleUploadData.value.deviceName
if(device === null || device === undefined || device === ''){
- ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ ElMessage.error(t('reportingWorks.selectWorkReportingEquipment'))
return
}
const teamsGroupsName = titleUploadData.value.teamsGroupsName
if(teamsGroupsName === null || teamsGroupsName === undefined || teamsGroupsName === ''){
- ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ ElMessage.error(t('reportingWorks.selectWorkReportingTeam'))
return
}
@@ -624,11 +767,14 @@
return false;
});
const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
- return item.saveFlag === false
+ return item.saveFlag === 0
})
+
for(let item of uniqueByOrderNum){
if(!checkSameNumForId(notFinishList,item.order_number)){
- ElMessage.error(`璇锋鏌ヨ鍗曞簭鍙�: ${item.order_number} 鎶ュ伐鏁伴噺鏄惁鐩稿悓锛乣)
+ ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
+ ${item.order_number}
+ ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
return false
}
}
@@ -642,7 +788,7 @@
return (a || b)
})
if(requestDetailData.length === 0){
- ElMessage.warning('璇峰～鍐欒嚦灏戜竴鏉℃崯鑰楁暟鍜屽畬宸ユ暟澶т簬0')
+ ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
return false
}
@@ -665,15 +811,15 @@
const saveReportingWorkRequest = (requestData) =>{
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
- ElMessage.success("鎶ュ伐鎴愬姛")
+ ElMessage.success(t('reportingWorks.successfulJobApplication'))
router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
}else{
const errorObj = JSON.parse(res.msg)
- const msg = "搴忓彿锛�"+errorObj.orderNumber+'\n'
- +'灏忕墖椤哄簭锛�'+errorObj.technologyNumber+'\n'
- +"瀹為檯鍙姤宸ユ暟閲忥細"+errorObj.processNum+'<'+
- "鎶ュ伐鏁伴噺锛�"+errorObj.sumNum+'\n'
- +"璇峰埛鏂扮晫闈㈤噸鏂版姤宸�"
+ const msg = t('reportingWorks.pleaseNumber1')+"锛�"+errorObj.orderNumber+'\n'
+ +t('reportingWorks.pleaseNumber2')+'锛�'+errorObj.technologyNumber+'\n'
+ +t('reportingWorks.pleaseNumber3')+'锛�'+errorObj.processNum+'<'+
+ +t('reportingWorks.pleaseNumber4')+'锛�'+errorObj.sumNum+'\n'
+ +t('reportingWorks.pleaseNumber5')
ElMessage.error(msg)
}
@@ -694,7 +840,7 @@
}
request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
if (res.code == 200){
- ElMessage.success("鎶ュ伐淇敼鎴愬姛")
+ ElMessage.success(t('reportingWorks.successfulModificationOfWorkApplication'))
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
@@ -736,23 +882,23 @@
const reviewReportingWork = () => {
const processId = titleUploadData.value.processId
if (processId.indexOf("/") < 0) {
- ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
return
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
- if (leftString.length !== 14) {
- ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ if (leftString.length < 14) {
+ ElMessage.warning(t('reportingWorks.processCardCorrectNumberDigits'))
return
}
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process === "" || process == null) {
- ElMessage.warning("璇烽�夋嫨宸ュ簭")
+ ElMessage.warning(t('reportingWorks.selectProcess'))
return
}
if(titleUploadData.value.previousProcess===''){
- ElMessage.warning("绗竴閬撳伐搴忎笉闇�瑕佸鏍�")
+ ElMessage.warning(t('reportingWorks.firstProcessNotReview'))
return
}
const reportWork = {
@@ -762,7 +908,7 @@
loadingFlag.value= true
request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
if(res.code === '200'){
- ElMessage.success("瀹℃牳鎴愬姛")
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
@@ -781,28 +927,35 @@
const getWork = () => {
let processId = titleUploadData.value.processId
- // if (processId.indexOf("/") < 0) {
- //
- // ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
- // return
- // }
- // let indexOfChar = processId.indexOf("/")
- // let leftString = processId.slice(0, indexOfChar)
- // if (leftString.length != 13) {
- // ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
- // return
- // }
+ if (processId == "" || processId == null) {
+ ElMessage.warning(t('reportingWorks.theProcessCardNumberCannotBeEmpty'))
+ return
+ }
+ let parts = processId.split('/');
+
+ if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
+ return
+ }
+ let indexOfChar = processId.indexOf("/")
+ let leftString = processId.slice(0, indexOfChar)
+ if (leftString.length < 14) {
+ ElMessage.warning(t('reportingWorks.processCardCorrectNumberDigits'))
+ return
+ }
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process == "" || process == null) {
- ElMessage.warning("璇烽�夋嫨宸ュ簭")
+ ElMessage.warning(t('reportingWorks.selectProcess'))
return
+ }
+ if (titleSelectJson.value.thisProcessType.length!=0){
+ if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting')) {
+ ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
+ return
+ }
}
- if (titleSelectJson.value.thisProcessType.indexOf(process) == -1 && process != "鍒囧壊" && titleSelectJson.value.thisProcessType != "") {
- ElMessage.warning("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
- return
- }
//鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
const regex = /([^\/]+)\/([^\/]+)/;
//鏌ユ壘鍖归厤鐨勫瓧绗︿覆
@@ -810,14 +963,15 @@
//娴佺▼鍗″彿
let processIdStr = result[1];
//灞傚彿
- let technologyStr = result[2];
+ let technologyStr = result[2];
request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
if (res.code == 200) {
- if(res.data.data===null){
- ElMessage.error("鏈煡璇㈠埌姝ゆ祦绋嬪崱鏁版嵁")
+ if(res.data.data==null){
+ ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
return
}
+
//琛ㄥご璧嬪��
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
@@ -850,6 +1004,37 @@
//鍒ゆ柇鏃╂櫄鐝�
titleUploadData.value.classes=t('reportingWorks.early')
titleUploadData.value.reportingWorkTime = formatCurrentTime()
+
+ // 澹版槑涓�涓┖鏁扮粍锛岀敤浜庡瓨鍌ㄦ瘡涓鍗曠殑 S01 鍊�
+ const s01Values = [];
+
+// 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ res.data.numberList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+
+// 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.Detail.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+
+
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
xGrid.value.reloadData(detail.value)
@@ -874,11 +1059,11 @@
}
if (item.quantity < item.completedQuantity) {
- ElMessage.success("搴忓彿" + item.order_number + "鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺")
+ ElMessage.success(t('reportingWorks.pleaseNumber6') + item.order_number + t('reportingWorks.pleaseNumber7'))
} else if (item.breakageQuantity * 1 + item.completedQuantity * 1 > item.quantity * 1) {
- ElMessage.success("璇疯緭鍏ュ簭鍙�" + item.order_number + "姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺")
+ ElMessage.success(t('reportingWorks.pleaseNumber8') + item.order_number + t('reportingWorks.pleaseNumber9'))
}
sum = item.completedQuantity * 1 + sum * 1
@@ -899,7 +1084,7 @@
let hours = dateObj.getHours().toString().padStart(2, '0'); // 灏忔椂
let minutes = dateObj.getMinutes().toString().padStart(2, '0'); // 鍒嗛挓
let seconds = dateObj.getSeconds().toString().padStart(2, '0'); // 绉掓暟
- if(parseInt(hours)>=17 && parseInt(hours)<8)titleUploadData.value.classes='鏅氱彮'
+ if(parseInt(hours)>=17 && parseInt(hours)<8)titleUploadData.value.classes=t('reportingWorks.nightShift')
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 杩斿洖鏍煎紡鍖栧悗鐨勬椂闂村瓧绗︿覆
}
@@ -914,6 +1099,8 @@
}
}
const getQuantity = () => {
+ titleUploadData.value.thisCompletedQuantity = 0
+ titleUploadData.value.thisWornQuantity = 0
const arr = xGrid.value.getTableData().fullData
const returnArr = arr.filter((obj, index, self) =>
self.findIndex((t) => t.order_number === obj.order_number) === index
@@ -932,16 +1119,73 @@
titleUploadData.value.thisWornQuantity = sumBreak
}
+const changeTable=()=>{
+ const $grid = xGrid.value
+ this.$grid.commitProxy('data', yourData)
+}
+onMounted(() => {
+ window.addEventListener('keypress', qrcodeScanner);
+ //addListener(xGrid.value, gridOptions)
+})
+
+// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
+onUnmounted(() => {
+ window.removeEventListener('keypress', qrcodeScanner);
+})
+
+let code = '';
+let codeArr = [];
+let lastTime,nextTime = ''
+let lastCode,nextCode = ''
+const qrcodeScanner = (e) =>{
+
+ nextCode = e.key;
+
+
+ // 褰撳墠瑙﹀彂鏃堕棿
+ nextTime = new Date().getTime();
+ // 绗竴娆¤幏鍙�
+ if(!lastTime && !lastCode && e.key !== 'Enter'){
+ codeArr = []
+ codeArr.push(e.key)
+ }
+
+ if(lastCode && lastTime && (nextTime - lastTime > 50)){
+ // 鐩搁殧鏃堕棿澶т簬30 璇存槑涓嶆槸鎵爜鏋壂鎻忕殑 娓呯┖閲嶆柊
+ codeArr = []
+ // 褰撴壂鐮佸墠鏈塳eypress浜嬩欢鏃�,闃叉棣栧瓧缂哄け
+ } else if(lastCode && lastTime && e.key !== 'Enter'){
+ codeArr.push(e.key)
+ }
+ lastCode = nextCode
+ lastTime = nextTime
+ // 鎵弿缁撴潫
+ if(e.keyCode === 13){
+ // 鍙繘琛屼笅涓�姝ユ搷浣�
+ /* 涓嬩竴姝ユ搷浣� */
+ if(codeArr.length!==0){
+ titleUploadData.value.processId = codeArr.join('')
+ }
+
+ codeArr=[]
+ lastTime = ''
+ nextTime = ''
+ lastCode = ''
+ nextCode = ''
+ }
+
+}
+
</script>
<template>
<div style="height: 100%;width: 100%">
<div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
- <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" placeholder="鎶ュ伐缂栧彿" style="width: 200px" />
- <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
+ <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
+ <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
- <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
- @change="getWork">
+ <el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable :placeholder="$t('reportingWorks.selectProcess')" style="width: 120px"
+ @change="getWork();getQuantity()">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -995,7 +1239,7 @@
<el-text>{{$t('reportingWorks.deviceType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
+ <el-select @change="getQuantity" v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
<el-option
v-for="item in titleSelectJson['deviceType']"
:key="item.id"
@@ -1037,7 +1281,7 @@
<el-text>{{$t('reportingWorks.teamsType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
+ <el-select v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
@@ -1093,10 +1337,10 @@
ref="xGrid"
class="mytable-scrollbar"
max-height="100%"
+ height="400px"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
- @filter-change="filterChanged"
@edit-closed="editClosedEvent"
>
@@ -1162,9 +1406,7 @@
<!-- 鍒虹牬绫诲瀷breakageType -->
<template #breakageType="{ row }">
<vxe-select v-model="row.breakageType "
- filterable
- clearable
- placeholder="">
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
@@ -1175,9 +1417,7 @@
<!--娆＄牬鍘熷洜-->
<template #breakageReason="{ row }">
<vxe-select v-model="row.breakageReason "
- filterable
- clearable
- placeholder="">
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
--
Gitblit v1.8.0