From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 109 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 85 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 8eca868..c4c6653 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
@@ -103,6 +103,10 @@
titleSelectJson.value = res.data.basic
layer= res.data.layer
+ //娣诲姞琛ョ墖鐘舵�佸垪
+ let column = {field: 'patchStatusOther', width: 90,title: res.data.title}
+ gridOptions.columns.push(column)
+
const s01Values = [];
for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
const s01Values = [];
@@ -145,7 +149,6 @@
})
const data = [{id:1,num:2},{id:1,num:3},{id:2,num:2},{id:1,num:2}];
-
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -239,7 +242,14 @@
},
{
code: 'SecondaryBreakage',
- name: "娆＄牬鐩稿悓",
+ name: "搴忓彿娆＄牬鐩稿悓",
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'checkedBreakage',
+ name: "閫変腑娆＄牬鐩稿悓",
prefixIcon: 'vxe-icon-indicator',
visible: true,
disabled: false
@@ -345,6 +355,8 @@
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("瀹屽伐鏁颁笉鑳藉ぇ浜庢祦绋嬪崱鏁伴噺")
}
if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
@@ -421,12 +433,12 @@
}
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) {
@@ -434,11 +446,11 @@
return
}
saveReportingWork(0, 'update')
- }
- } else {
- ElMessage.warning(res.msg)
- }
- })
+ // }
+ // } else {
+ // ElMessage.warning(res.msg)
+ // }
+ // })
break
}
@@ -456,7 +468,9 @@
const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
//鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
if(column.field=="breakageQuantity"){
- brokenVisible.value = true
+ if (row.patchStatusOther!="宸茶ˉ鐗�"){
+ brokenVisible.value = true
+ }
}
},
menuClick({menu, row, column}) {
@@ -510,7 +524,7 @@
}
case 'SecondaryBreakage' : {
let result = toolbarButtonClickEvent()
- if (result.cell === "breakageQuantity"){
+ if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
if (result) {
const dataList = xGrid.value.getTableData().visibleData
const seenOrders = {}
@@ -532,6 +546,27 @@
}
}
+ })
+ }
+ }
+ 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
+ }
+
+ }
})
}
}
@@ -743,8 +778,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
+ }
+
})
@@ -756,14 +795,15 @@
//绗竴娆″姞杞芥暟鎹�
let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
-request.post(`/reportingWork/selectProcess`).then((res) => {
+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
- if (user.user.address!=='鎶�鏈儴澶氭洸'){
- groupChangeProcess.value = true
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
}
gridOptions.toolbarConfig.buttons[1].visible=false
}
@@ -831,9 +871,9 @@
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')}`)
@@ -861,7 +901,6 @@
userName:user.user.userName,
qualityInsStatus:status
}
- console.log('requestData',requestData)
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
//鍒ゆ柇淇濆瓨杩樻槸淇敼
@@ -967,10 +1006,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) =>{
@@ -1150,9 +1199,10 @@
}
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
}
})
@@ -1251,6 +1301,16 @@
return row?.rowClass
}
+const editConfigDisable = reactive({
+ trigger: 'click',
+ mode: 'cell',
+ beforeEditMethod ({ row }) {
+ if (row.patchStatusOther === '宸茶ˉ鐗�') {
+ return false
+ }
+ return true
+ }
+})
</script>
@@ -1428,6 +1488,7 @@
v-on="gridEvents"
@edit-closed="editClosedEvent"
:cell-class-name="cellClassName"
+ :edit-config="editConfigDisable"
>
--
Gitblit v1.8.0