From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +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 | 294 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 234 insertions(+), 60 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 0faacb6..7eb9d2e 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
@@ -4,11 +4,15 @@
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)
@@ -19,6 +23,8 @@
const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //鏄惁鍚堢墖宸ュ簭
+ laminating:'',
reportingWorkId: null,
//娴佺▼鍗″彿
processId: null,
@@ -86,9 +92,19 @@
let inputDisabled = ref(false)
-onMounted(() =>{
+onMounted(async () =>{
+ await initTiltle()
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
titleUploadData.value.processId = route.query.processId
+ //褰撹川妫�瀹℃牳鍚庡姞杞芥槑缁嗕俊鎭�
+ if(route.query.reviewStatus === '1'){
+ if(titleUploadData.value.thisProcess !== undefined
+ && titleUploadData.value.thisProcess!==''
+ && titleUploadData.value.thisProcess!=null){
+ getWork()
+ getQuantity()
+ }
+ }
}
//route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
@@ -98,6 +114,10 @@
titleUploadData.value = res.data.reportingWork
titleSelectJson.value = res.data.basic
layer= res.data.layer
+
+ //娣诲姞琛ョ墖鐘舵�佸垪
+ let column = {field: 'patchStatusOther', width: 90,title: t('reportingWorks.patchCondition')}
+ gridOptions.columns.push(column)
const s01Values = [];
for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
@@ -130,8 +150,6 @@
button.name=t('basicData.review')
titleUploadData.value.qualityInspector=user.user.userName
}
-
-
gridOptions.toolbarConfig.buttons.push(button)
}
// getQuantity()
@@ -141,7 +159,6 @@
})
const data = [{id:1,num:2},{id:1,num:3},{id:2,num:2},{id:1,num:2}];
-
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -233,6 +250,20 @@
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
+ },
]
]
}
@@ -320,6 +351,13 @@
},
{field: 'completed', width: 90, title:t('reportingWorks.completed'),},
{field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
+ {
+ field: 'reviewed_state',
+ title: t('processCard.reviewedState'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],
//琛ㄥ崟楠岃瘉
@@ -334,8 +372,12 @@
return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
}else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
+ }else if(row.quantity_card<row.completedQuantity){
+ return new Error(t('reportingWorks.pleaseNumber10'))
}
- if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
+ const completedNum =
+ (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity
+ if(titleUploadData.value.reportingWorkId!=null && completedNum>row.minQuantity){
return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
${row.minQuantity}
${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
@@ -390,7 +432,7 @@
const $grid = xGrid.value
if ($grid) {
switch (code) {
- case 'saveReportingWork': {
+ case 'saveReportingWork': {//淇濆瓨
const errMap = await $grid.validate(true)
if (errMap) {
ElMessage.error(t('basicData.msg.checkoutLose'))
@@ -408,14 +450,14 @@
saveReportingWork(1,'save')
break
}
- case 'update': {
+ case 'update': {//淇敼
//鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
- request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
- if (res.code == 200) {
- if (res.data > 0) {
- ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
- return
- } else {
+ // 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) {
@@ -423,11 +465,11 @@
return
}
saveReportingWork(0, 'update')
- }
- } else {
- ElMessage.warning(res.msg)
- }
- })
+ // }
+ // } else {
+ // ElMessage.warning(res.msg)
+ // }
+ // })
break
}
@@ -445,10 +487,12 @@
const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
//鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
if(column.field=="breakageQuantity"){
- brokenVisible.value = true
+ if (row.patchStatusOther!="宸茶ˉ鐗�"){
+ brokenVisible.value = true
+ }
}
},
- menuClick({menu, row, column}) {
+ menuClick({menu, row, column}) {//鍙抽敭鑿滃崟
const $grid = xGrid.value
if ($grid) {
switch (menu.code) {
@@ -491,6 +535,56 @@
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
+ }
+
}
})
}
@@ -703,8 +797,12 @@
return row.order_number === brokenRow.value.order_number
})
const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
+ let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
equalByOrderNum.forEach((row) =>{
- row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ if (laminating == 'laminating'){
+ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ }
})
@@ -716,20 +814,26 @@
//绗竴娆″姞杞芥暟鎹�
let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
-request.post(`/reportingWork/selectProcess`).then((res) => {
- if (res.code == 200) {
- 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
- groupChangeProcess.value = true
- gridOptions.toolbarConfig.buttons[1].visible=false
- }
+const initTiltle = async () => {
+ await request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
+ if (res.code == 200) {
+ 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
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
+ gridOptions.toolbarConfig.buttons[1].visible=false
+ }
- } else {
- ElMessage.warning(res.msg)
- }
-})
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
function checkSameNumForId(data, targetId) {
// 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
@@ -789,9 +893,10 @@
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 )){
+ if(!checkSameNumForId(notFinishList,item.order_number ) && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
${item.order_number}
${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
@@ -810,11 +915,14 @@
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
@@ -828,7 +936,6 @@
}
const saveReportingWorkRequest = (requestData) =>{
- //request.post(`/reportingWork/saveReportingWorkLog`, requestData)
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success(t('reportingWorks.successfulJobApplication'))
@@ -844,7 +951,7 @@
ElMessage.error(msg)
}
}).catch(err =>{
- ElMessage.error(err.message)
+ ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
}).finally(()=>{
gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -859,13 +966,15 @@
reviewState = 'review'
}
request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
- if (res.code == 200){
+ if (res.code == 200 && res.data===true){
ElMessage.success(t('reportingWorks.successfulModificationOfWorkApplication'))
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
random:Math.random()}
})
+ } else {
+ ElMessage.warning(t('reportingWorks.changeFailed'))
}
})
}
@@ -922,10 +1031,20 @@
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,
- thisProcess:titleUploadData.value.thisProcess
+ thisProcess:titleUploadData.value.thisProcess,
+ technologyStr:technologyStr,
+ userName:user.user.userName
}
loadingFlag.value= true
request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
@@ -934,6 +1053,7 @@
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
+ reviewStatus:1,
random:Math.random()
}
})
@@ -985,9 +1105,10 @@
//娴佺▼鍗″彿
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(t('reportingWorks.noDataThisProcessCard'))
@@ -998,10 +1119,11 @@
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
titleUploadData.value.teamsGroupsName = user.user.userName
+ titleUploadData.value.laminating = res.data.laminating
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
- titleSelectJson.value.teamsType = res.data.teams
+ //titleSelectJson.value.teamsType = res.data.teams
//褰撳墠娴佺▼鍗″伐搴�
titleSelectJson.value.thisProcessType = res.data.thisProcess
//鍘嗗彶鐝粍
@@ -1052,7 +1174,20 @@
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
- xGrid.value.reloadData(detail.value)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = detail.value.map(item => {
+ if (item.reviewed_state === 1) {
+ return { ...item, reviewed_state: "宸插鏍�" };
+ }
+ else if (item.reviewed_state === 0) {
+ return { ...item, reviewed_state: "鏈鏍�" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
} else {
ElMessage.warning(res.msg)
}
@@ -1104,9 +1239,11 @@
}
const editClosedEvent = ({ row, column }) => {
+ let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
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 && laminating == 'laminating'){
item.completedQuantity=row.completedQuantity
}
})
@@ -1116,12 +1253,15 @@
const getQuantity = () => {
titleUploadData.value.thisCompletedQuantity = 0
titleUploadData.value.thisWornQuantity = 0
+ let laminating = titleUploadData.value.laminating
const arr = xGrid.value.getTableData().fullData
- const returnArr = arr.filter((obj, index, self) =>
- self.findIndex((t) => t.order_number === obj.order_number) === index
- )
-
-
+ //鏍规嵁鏄惁鍚堢墖宸ュ簭杩囨护
+ const returnArr =
+ laminating === "laminating"
+ ? arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+ : arr;
let sumBreak = 0
let sumQuantity = 0
returnArr.forEach((item)=>{
@@ -1201,12 +1341,26 @@
}
}
+const changeRowClass = ({ row, rowIndex, $rowIndex }) => {
+ return row?.rowClass
+
+}
+const editConfigDisable = reactive({
+ trigger: 'click',
+ mode: 'cell',
+ beforeEditMethod ({ row }) {
+ if (row.patchStatusOther === '宸茶ˉ鐗�') {
+ return false
+ }
+ return true
+ }
+})
</script>
<template>
- <div style="height: 100%;width: 100%">
- <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<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()"/>
@@ -1230,7 +1384,7 @@
<label>{{technologicalProcess}}</label>
</div>
- <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
+ <div class="head1">
<el-row>
<el-col :span="2">
<el-text>{{$t('order.orderId')}}锛�</el-text>
@@ -1366,17 +1520,18 @@
</el-row>
</div>
- <div class="main-div-customer" style="width: 100%;height: 70%">
+ <div class="main-table">
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- max-height="100%"
- height="400px"
+ :row-class-name="changeRowClass"
+ height="100%"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
@edit-closed="editClosedEvent"
:cell-class-name="cellClassName"
+ :edit-config="editConfigDisable"
>
@@ -1384,13 +1539,16 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
</vxe-grid>
+ </div>
<el-dialog
@opened="openedBrokenTable"
:before-close="checkClose"
@@ -1494,12 +1652,24 @@
</vxe-grid>
</el-dialog>
- </div>
</div>
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+.head1{
+ width: 100%;
+ height: 105px;
+ background-color: white;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 135px);
+}
.processCard {
width: 140px;
@@ -1574,4 +1744,8 @@
color: #fff;
}
+
+::v-deep(.latter) {
+ //display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0