From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 549 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 451 insertions(+), 98 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 4969a00..0a3edbe 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,14 +1,18 @@
<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";
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"
+import companyInfo from "@/stores/sd/companyInfo"
+domZIndex.setCurrent(3000)
+const company = companyInfo()
//璇█鑾峰彇
const { t } = useI18n()
let brokenVisible = ref(false)
@@ -66,6 +70,7 @@
})
let detail = ref([])
let layer=''
+let technologicalProcess=''
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -82,6 +87,8 @@
})
+
+
let inputDisabled = ref(false)
onMounted(() =>{
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
@@ -95,17 +102,39 @@
titleUploadData.value = res.data.reportingWork
titleSelectJson.value = res.data.basic
layer= res.data.layer
+
+ const s01Values = [];
+ for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
+ const s01Values = [];
+ // 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
+ if (res.data.reportingWorkDetails[i].other_columns!=null|| res.data.reportingWorkDetails[i].other_columns!=undefined){
+ res.data.reportingWorkDetails.forEach(element => {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
+ });
+
+ // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.reportingWorkDetails.forEach((detail, index) => {
+ detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
+ });
+ }
+
+ }
+
+
//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)
}
@@ -132,15 +161,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'),
},
]
@@ -151,7 +180,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddReportingWork_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -168,16 +197,77 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
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
+ },
+ {
+ code: 'SecondaryBreakage',
+ name: "搴忓彿娆＄牬鐩稿悓",
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'checkedBreakage',
+ name: "閫変腑娆＄牬鐩稿悓",
+ 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
@@ -259,12 +349,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')}`)
}
}
@@ -319,7 +411,7 @@
case 'saveReportingWork': {
const errMap = await $grid.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return
}
saveReportingWork(0,'save')
@@ -328,20 +420,33 @@
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(`鏍￠獙涓嶉�氳繃锛乣)
- return
- }
- saveReportingWork(0,'update')
+ //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
+ request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
+ if (res.code == 200) {
+ if (res.data > 0) {
+ ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
+ return
+ } else {
+ getQuantity()
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(0, 'update')
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+
break
}
}
@@ -355,9 +460,114 @@
}
//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
+ }
+ case 'SecondaryBreakage' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const seenOrders = {}
+ dataList.forEach((item, index) => {
+ const list = item.damageDetails
+ if (list!== null || list.length > 0){
+ const { order_number, damageDetails, breakageQuantity } = item;
+ // 濡傛灉 order_number 杩樻病鏈夊鐞嗚繃
+ if (!seenOrders[order_number]) {
+ // 璁板綍绗竴涓嚭鐜扮殑 damageDetails 鍜� breakageQuantity
+ seenOrders[order_number] = {
+ damageDetails,
+ breakageQuantity
+ };
+ } else {
+ // 灏嗗悗缁殑 damageDetails 鍜� breakageQuantity 鏇存柊涓虹涓�涓殑
+ item.damageDetails = seenOrders[order_number].damageDetails;
+ item.breakageQuantity = seenOrders[order_number].breakageQuantity;
+ }
+ }
+
+ })
+ }
+ }
+ break
+ }
+ case 'checkedBreakage' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start].damageDetails
+ const quantity = dataList[result.start].breakageQuantity
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item.damageDetails = val
+ item.breakageQuantity = quantity
+ if (index!=result.start){
+ item.completedQuantity = item.completedQuantity - quantity
+ }
+
+ }
+ })
+ }
+ }
+ break
+ }
+ }
+ }
+ },
}
@@ -368,7 +578,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddReportingWork_2',
//showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -391,6 +601,7 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
{type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
// {
// field: 'order_number',
@@ -440,7 +651,7 @@
},
{
field: 'responsiblePersonnel',
- title: t('reportingWorks.responsiblePersonnel'),
+ title: '璐ｄ换淇℃伅',
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -453,7 +664,7 @@
validator ({ cellValue }) {
const regex = /^[1-9]\d*$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆澶т簬0鐨勬暣鏁�')
+ return new Error(t('reportingWorks.enterIntegerGreaterThan'))
}
}
}
@@ -463,25 +674,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: {//琛ㄥご鎸夐挳
@@ -506,9 +717,10 @@
break
}
case 'removeRow': {
- let result = toolbarButtonClickEvent()
- if(result){
- $grid.remove(result.row)
+ const $grid = brokenGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+ if(checkedList){
+ $grid.remove(checkedList)
}
break
}
@@ -517,7 +729,7 @@
}
}
const openedBrokenTable = () => {
- addListener(brokenGrid.value,brokenGridOptions)
+ //addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
}
@@ -533,7 +745,7 @@
}
const errMap = await brokenGrid.value.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return false
}
let breakageQuantityCount = 0
@@ -544,8 +756,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
@@ -559,8 +771,12 @@
return row.order_number === brokenRow.value.order_number
})
const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
+ let process = titleUploadData.value.thisProcess
equalByOrderNum.forEach((row) =>{
- row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ if (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�'){
+ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ }
+
})
@@ -571,10 +787,21 @@
//绗竴娆″姞杞芥暟鎹�
-
+let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
request.post(`/reportingWork/selectProcess`).then((res) => {
if (res.code == 200) {
- titleSelectJson.value.processType = res.data.process;
+ titleSelectJson.value.processType = res.data.process
+ if(user.user.address!==null && user.user.address!==''){
+ titleUploadData.value.thisProcess = user.user.address
+ titleUploadData.value.teamsGroupsName = user.user.userName
+ console.log(user.user.address)
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
+ gridOptions.toolbarConfig.buttons[1].visible=false
+ }
+
} else {
ElMessage.warning(res.msg)
}
@@ -610,17 +837,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
}
@@ -638,14 +865,15 @@
const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
return item.saveFlag === 0
})
-
+ let process = titleUploadData.value.thisProcess
for(let item of uniqueByOrderNum){
- if(!checkSameNumForId(notFinishList,item.order_number)){
- ElMessage.error(`璇锋鏌ヨ鍗曞簭鍙�: ${item.order_number} 鎶ュ伐鏁伴噺鏄惁鐩稿悓锛乣)
+ if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
+ ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
+ ${item.order_number}
+ ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
return false
}
}
-
titleUploadData.value.creator = user.user.userName
titleUploadData.value.creatorId = user.user.userId
@@ -654,15 +882,18 @@
const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
return (a || b)
})
- if(requestDetailData.length === 0){
- ElMessage.warning('璇峰～鍐欒嚦灏戜竴鏉℃崯鑰楁暟鍜屽畬宸ユ暟澶т簬0')
+ if(requestDetailData.length === 0 && (route.query.reportingWorkId===undefined)){
+ ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
return false
}
-
+ let status=company.qualityInsStatus
const requestData = {
title:titleUploadData.value,
detail:xGrid.value.getTableData().fullData,
- type:state//瀹℃牳鐘舵��
+ type:state,//瀹℃牳鐘舵��
+ userId:user.user.userId,
+ userName:user.user.userName,
+ qualityInsStatus:status
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -678,20 +909,20 @@
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)
}
}).catch(err =>{
- ElMessage.error(err.message)
+ ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
}).finally(()=>{
gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -707,7 +938,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,
@@ -728,6 +959,7 @@
})
// 鏌ヨ璐ｄ换鐝粍
const computedResponsibleTeam = computed((responsibleProcess) => {
+ titleSelectJson.value.historyTeams.push({basic_name: user.user.userName, process: titleUploadData.value.thisProcess, basic_type: 'teamsgroups', basic_category: 179, id: 555})
return function (responsibleProcess){
return titleSelectJson.value.historyTeams.filter((item) => {
return item.process === responsibleProcess
@@ -749,33 +981,44 @@
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("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ 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 regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const result = processId.match(regex);
+ //娴佺▼鍗″彿
+ let processIdStr = result[1];
+ //灞傚彿
+ let technologyStr = result[2];
const reportWork = {
process: titleUploadData.value.previousProcess,
- processId:processId
+ processId:processId,
+ thisProcess:titleUploadData.value.thisProcess,
+ technologyStr:technologyStr,
+ userName:user.user.userName
}
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,
@@ -795,32 +1038,34 @@
let processId = titleUploadData.value.processId
if (processId == "" || processId == null) {
- ElMessage.warning("娴佺▼鍗″彿涓嶈兘涓虹┖")
+ ElMessage.warning(t('reportingWorks.theProcessCardNumberCannotBeEmpty'))
return
}
let parts = processId.split('/');
if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
- ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
return
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
if (leftString.length < 14) {
- ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ 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 = /([^\/]+)\/([^\/]+)/;
//鏌ユ壘鍖归厤鐨勫瓧绗︿覆
@@ -828,18 +1073,20 @@
//娴佺▼鍗″彿
let processIdStr = result[1];
//灞傚彿
-
let technologyStr = result[2];
- request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
+
+ let reportType= company.reportType
+ request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
if (res.code == 200) {
if(res.data.data==null){
- ElMessage.error("鏈煡璇㈠埌姝ゆ祦绋嬪崱鏁版嵁")
+ ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
return
}
-
+ technologicalProcess=res.data.technologicalProcess
//琛ㄥご璧嬪��
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
+ titleUploadData.value.teamsGroupsName = user.user.userName
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
@@ -869,6 +1116,29 @@
//鍒ゆ柇鏃╂櫄鐝�
titleUploadData.value.classes=t('reportingWorks.early')
titleUploadData.value.reportingWorkTime = formatCurrentTime()
+
+ //澶勭悊缂栧彿鍒�
+ //瀹氫箟瀛樻斁缂栧彿鏁扮粍
+ const s01Values = [];
+ for (let i = 0; i < res.data.Detail.length; i++) {
+ const s01Values = [];
+ // 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
+ if (res.data.Detail[i].other_columns!=null|| res.data.Detail[i].other_columns!=undefined){
+ res.data.Detail.forEach(element => {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
+ });
+
+ // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.Detail.forEach((detail, index) => {
+ detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
+ });
+ }
+
+ }
+
+
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
xGrid.value.reloadData(detail.value)
@@ -893,11 +1163,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
@@ -918,14 +1188,15 @@
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}`; // 杩斿洖鏍煎紡鍖栧悗鐨勬椂闂村瓧绗︿覆
}
const editClosedEvent = ({ row, column }) => {
+ let process = titleUploadData.value.thisProcess
if (column.property==='completedQuantity') {
xGrid.value.getTableData().fullData.forEach((item, index) =>{
- if(item.order_number===row.order_number){
+ if(item.order_number===row.order_number && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
item.completedQuantity=row.completedQuantity
}
})
@@ -957,16 +1228,87 @@
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('')
+ }
+ if(user.user.address!==null || user.user.address!==''){
+ getWork()
+ }
+
+ codeArr=[]
+ lastTime = ''
+ nextTime = ''
+ lastCode = ''
+ nextCode = ''
+ }
+
+}
+
+
+const cellClassName = ({ row, column }) => {
+ if (column.field === 'breakageQuantity') {
+ return 'col-red'
+ }
+
+}
+const changeRowClass = ({ row, rowIndex, $rowIndex }) => {
+ return row?.rowClass
+
+}
</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();getQuantity()"/>
+ <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"
+ <el-select :disabled="inputDisabled || groupChangeProcess"
+ v-model="titleUploadData.thisProcess"
+ clearable
+ :placeholder="$t('reportingWorks.selectProcess')"
+ style="width: 120px"
@change="getWork();getQuantity()">
<el-option
v-for="item in titleSelectJson['processType']"
@@ -980,7 +1322,7 @@
</el-button>
<!-- <el-button type="primary">瀹℃牳涓嶉�氳繃</el-button>-->
- <label>{{$t('reportingWorks.processCardArea')}}锛�</label>
+ <label>{{technologicalProcess}}</label>
</div>
<div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
<el-row>
@@ -1009,10 +1351,11 @@
<el-text class="customClass"></el-text>
</el-col>
<el-col :span="2">
- <el-text>{{$t('order.project')}}锛�</el-text>
+ <el-text >{{$t('order.project')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-text wrap-text="false">{{ titleUploadData.order.project }}</el-text>
+ <el-input :readonly="true" v-model="titleUploadData.order.project"/>
+<!-- <el-text style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ titleUploadData.order.project }}</el-text>-->
</el-col>
</el-row>
@@ -1063,7 +1406,10 @@
<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 :disabled="groupChangeProcess"
+ v-model="titleUploadData.teamsGroupsName"
+ clearable
+ :placeholder="$t('reportingWorks.selectTeam')">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
@@ -1118,12 +1464,14 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
+ :row-class-name="changeRowClass"
max-height="100%"
- height="400px"
+ height="100%"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
@edit-closed="editClosedEvent"
+ :cell-class-name="cellClassName"
>
@@ -1188,9 +1536,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>
@@ -1201,9 +1547,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>
@@ -1320,4 +1664,13 @@
user-select: none;
}
+::v-deep(.mytable-scrollbar .col-red) {
+ background-color: rgb(66,159,254);
+ color: #fff;
+}
+
+
+::v-deep(.latter) {
+ //display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0