From b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 25 九月 2024 16:31:14 +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 | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 152 insertions(+), 23 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 ae44cbf..595cdeb 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)
@@ -99,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 = [];
@@ -131,6 +139,7 @@
titleUploadData.value.qualityInspector=user.user.userName
}
+
gridOptions.toolbarConfig.buttons.push(button)
}
// getQuantity()
@@ -140,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) => {
@@ -228,6 +236,20 @@
{
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
@@ -408,13 +430,26 @@
break
}
case 'update': {
- getQuantity()
- const errMap = await $grid.validate(true)
- if (errMap) {
- ElMessage.error(t('basicData.msg.checkoutLose'))
- 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
}
}
@@ -431,7 +466,9 @@
const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
//鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
if(column.field=="breakageQuantity"){
- brokenVisible.value = true
+ if (row.patchStatusOther!="宸茶ˉ鐗�"){
+ brokenVisible.value = true
+ }
}
},
menuClick({menu, row, column}) {
@@ -477,6 +514,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
+ }
+
}
})
}
@@ -569,7 +656,7 @@
},
{
field: 'responsiblePersonnel',
- title: t('reportingWorks.responsiblePersonnel'),
+ title: '璐ｄ换淇℃伅',
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -689,8 +776,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
+ }
+
})
@@ -702,13 +793,16 @@
//绗竴娆″姞杞芥暟鎹�
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
groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
gridOptions.toolbarConfig.buttons[1].visible=false
}
@@ -775,9 +869,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')}`)
@@ -796,11 +890,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
@@ -814,7 +911,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'))
@@ -830,7 +926,7 @@
ElMessage.error(msg)
}
}).catch(err =>{
- ElMessage.error(err.message)
+ ElMessage.error('鎻愪氦澶辫触锛岃鍒锋柊鍚庨噸璇�')
}).finally(()=>{
gridOptions.toolbarConfig.buttons[0].disabled=false
@@ -867,6 +963,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
@@ -907,10 +1004,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) =>{
@@ -970,9 +1077,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'))
@@ -1089,9 +1197,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
}
})
@@ -1186,6 +1295,20 @@
}
}
+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>
@@ -1355,13 +1478,15 @@
<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"
+ :edit-config="editConfigDisable"
>
@@ -1559,4 +1684,8 @@
color: #fff;
}
+
+::v-deep(.latter) {
+ //display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0