From 684399b665ef8c25c43faff0fdc821a0b72b39ba Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 四月 2024 14:03:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 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 ee96bcb..dccd0a9 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
@@ -20,7 +20,7 @@
const titleUploadData = ref({
reportingWorkId: null,
//娴佺▼鍗″彿
- processId: 'NG24030804A02/1',
+ processId: null,
//閿�鍞崟鍙�
orderId: '',
reviewedState:0,
@@ -85,7 +85,7 @@
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
titleUploadData.value.processId = route.query.processId
}
- // route.query.reportingWorkId = 'BG2403140039'
+ //route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
if(route.query.reportingWorkId !== '' && route.query.reportingWorkId!=null){
request.post(`reportingWork/selectUpdateReportingWork/${route.query.reportingWorkId}`).then(res=>{
@@ -98,8 +98,14 @@
name: '淇敼',
status: 'primary',
}
+ if(route.query.reviewStatus === "1"){
+ button.name='瀹℃牳'
+ titleUploadData.value.qualityInspector=user.user.userName
+ }
+
gridOptions.toolbarConfig.buttons.push(button)
}
+ getQuantity()
inputDisabled.value = true
})
}
@@ -253,6 +259,9 @@
}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}鐨勬暟瀛梎)
+ }
}
}
@@ -319,6 +328,7 @@
break
}
case 'update': {
+ getQuantity()
const errMap = await $grid.validate(true)
if (errMap) {
ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
@@ -508,6 +518,9 @@
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
}
@@ -615,8 +628,11 @@
// 濡傛灉宸茬粡鍦╯eenIds涓紝杩斿洖false浠ヨ繃婊ゆ帀杩欎釜瀵硅薄
return false;
});
+ const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
+ return item.saveFlag === false
+ })
for(let item of uniqueByOrderNum){
- if(!checkSameNumForId(xGrid.value.getTableData().fullData,item.order_number)){
+ if(!checkSameNumForId(notFinishList,item.order_number)){
ElMessage.error(`璇锋鏌ヨ鍗曞簭鍙�: ${item.order_number} 鎶ュ伐鏁伴噺鏄惁鐩稿悓锛乣)
return false
}
@@ -642,6 +658,7 @@
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
+ //鍒ゆ柇淇濆瓨杩樻槸淇敼
if(saveType==='save'){
saveReportingWorkRequest(requestData)
}else{
@@ -676,7 +693,11 @@
//鏇存柊鎶ュ伐鏁版嵁
const updateReportingWorkRequest = (requestData) =>{
- request.post(`/reportingWork/updateReportingWork`,requestData).then(res =>{
+ let reviewState = 'update'
+ if(route.query.reviewStatus==="1"){
+ reviewState = 'review'
+ }
+ request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success("鎶ュ伐淇敼鎴愬姛")
router.push({path:'/main/reportingWorks/AddReportingWork',
@@ -725,7 +746,7 @@
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
- if (leftString.length !== 13) {
+ if (leftString.length !== 14) {
ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
return
}
@@ -765,17 +786,18 @@
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
- // }
+ let parts = processId.split('/');
+
+ if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
+ ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ return
+ }
+ let indexOfChar = processId.indexOf("/")
+ let leftString = processId.slice(0, indexOfChar)
+ if (leftString.length != 14) {
+ ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ return
+ }
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process == "" || process == null) {
@@ -787,17 +809,22 @@
ElMessage.warning("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
return
}
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const result = processId.match(regex);
//娴佺▼鍗″彿
- let processIdStr = processId.substring(0, 13);
+ let processIdStr = result[1];
//灞傚彿
- let technologyStr = processId.substring(14);
+ let technologyStr = result[2];
request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
if (res.code == 200) {
- if(res.data.data===null){
+ if(res.data.data==null){
ElMessage.error("鏈煡璇㈠埌姝ゆ祦绋嬪崱鏁版嵁")
return
}
+
//琛ㄥご璧嬪��
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
@@ -894,6 +921,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
@@ -912,16 +941,21 @@
titleUploadData.value.thisWornQuantity = sumBreak
}
+const changeTable=()=>{
+ const $grid = xGrid.value
+ this.$grid.commitProxy('data', yourData)
+}
+
</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-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
<el-select :disabled="inputDisabled" v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
- @change="getWork">
+ @change="getWork();getQuantity()">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -975,7 +1009,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"
@@ -1017,7 +1051,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"
@@ -1073,10 +1107,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"
>
--
Gitblit v1.8.0