Browse Source

2026-07-08

OA相关功能模块,【驳回】时不再校验流程配置里的必填项
master
fengyuan_yang 5 months ago
parent
commit
3d43254454
  1. 15
      src/views/modules/changeManagement/changeRecord.vue
  2. 2
      src/views/modules/lab/labRecord.vue
  3. 3
      src/views/modules/proofing/requestForProofing.vue
  4. 3
      src/views/modules/quotation/requestForQuote.vue
  5. 24
      src/views/modules/quote/index.vue
  6. 2
      src/views/modules/rohs/rohsRecord.vue
  7. 5
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  8. 3
      src/views/modules/test/requestForTest.vue
  9. 5
      src/views/modules/tooling/searchToolApply.vue

15
src/views/modules/changeManagement/changeRecord.vue

@ -4238,7 +4238,8 @@
// 提交
submitData () {
if (this.plmChangeRequestArr) {
const needValidateRequired = this.modalData.nodeConclusion === 'Y'
if (needValidateRequired && this.plmChangeRequestArr) {
for (let i = 0; i < this.plmChangeRequestArr.length; i++) {
if (!this.modalData[this.plmChangeRequestArr[i].fieldId] && this.plmChangeRequestArr[i].required === 'Y') {
this.$message.warning(this.plmChangeRequestArr[i].fieldName + '不能为空!')
@ -4246,7 +4247,7 @@
}
}
}
if (this.plmChangeRequestDetailArr) { // 所选技术参数卡
if (needValidateRequired && this.plmChangeRequestDetailArr) { // 所选技术参数卡
for (let i = 0; i < this.plmChangeRequestDetailArr.length; i++) {
// 判断集合中的该属性是否都有值
let val = this.chooseDataList.every(item => {
@ -4260,7 +4261,7 @@
}
}
}
if (this.plmChangeCostImpactArr) { // 库存成本影响
if (needValidateRequired && this.plmChangeCostImpactArr) { // 库存成本影响
for (let i = 0; i < this.plmChangeCostImpactArr.length; i++) {
if (!this.costImpactData[this.plmChangeCostImpactArr[i].fieldId] && this.plmChangeCostImpactArr[i].required === 'Y') {
this.$message.warning(this.plmChangeCostImpactArr[i].fieldName + '不能为空!')
@ -4268,7 +4269,7 @@
}
}
}
if (this.plmChangeFAItemArr) { // 评估信息
if (needValidateRequired && this.plmChangeFAItemArr) { // 评估信息
for (let i = 0; i < this.plmChangeFAItemArr.length; i++) {
let val = this.chooseItemList2.every(item => {
const value = item[this.plmChangeFAItemArr[i].fieldId]
@ -4280,7 +4281,7 @@
}
}
}
if (this.plmChangeExecutionInfoArr) {
if (needValidateRequired && this.plmChangeExecutionInfoArr) {
for (let i = 0; i < this.plmChangeExecutionInfoArr.length; i++) {
if (!this.executionInfoData[this.plmChangeExecutionInfoArr[i].fieldId] && this.plmChangeExecutionInfoArr[i].required === 'Y') {
this.$message.warning(this.plmChangeExecutionInfoArr[i].fieldName + '不能为空!')
@ -4288,7 +4289,7 @@
}
}
}
if (this.plmChangeItemArr) { // 执行信息
if (needValidateRequired && this.plmChangeItemArr) { // 执行信息
for (let i = 0; i < this.plmChangeItemArr.length; i++) {
let val = this.chooseItemList.every(item => {
const value = item[this.plmChangeItemArr[i].fieldId]
@ -4300,7 +4301,7 @@
}
}
}
if (this.plmChangeCountersignatureItemArr) { // 会签信息
if (needValidateRequired && this.plmChangeCountersignatureItemArr) { // 会签信息
for (let i = 0; i < this.plmChangeCountersignatureItemArr.length; i++) {
let val = this.currentChooseCSItemList.every(item => {
const value = item[this.plmChangeCountersignatureItemArr[i].fieldId]

2
src/views/modules/lab/labRecord.vue

@ -2625,7 +2625,7 @@ export default {
this.$message.warning('节点权限加载中,请稍后重试')
return
}
if (!this.validateSubmitRequiredFields()) {
if (nodeConclusion === 'Y' && !this.validateSubmitRequiredFields()) {
return
}
this.submitLoading = true

3
src/views/modules/proofing/requestForProofing.vue

@ -3936,7 +3936,8 @@ export default {
// 提交
submitData() {
if (this.columnFieldList1) {
const needValidateRequired = this.modalData.nodeConclusion === 'Y'
if (needValidateRequired && this.columnFieldList1) {
for (let i = 0; i < this.columnFieldList1.length; i++) {
let row = this.columnFieldList1[i]
if (!this.modalData[row.fieldId] && row.required === 'Y') {

3
src/views/modules/quotation/requestForQuote.vue

@ -3570,7 +3570,8 @@ export default {
// 提交
submitData () {
if (this.plmQuotationInformationArr) {
const needValidateRequired = this.modalData.nodeConclusion === 'Y'
if (needValidateRequired && this.plmQuotationInformationArr) {
for (let i = 0; i < this.plmQuotationInformationArr.length; i++) {
if (!this.modalData[this.plmQuotationInformationArr[i].fieldId] && this.plmQuotationInformationArr[i].required === 'Y') {
this.$message.warning(this.plmQuotationInformationArr[i].fieldName + '不能为空!')

24
src/views/modules/quote/index.vue

@ -897,30 +897,6 @@ export default {
},
// 驳回提交
rejectSubmit() {
// 校验报价主表的必填字段
if (this.plmQuoteArr && this.plmQuoteArr.length > 0) {
for (let i = 0; i < this.plmQuoteArr.length; i++) {
const field = this.plmQuoteArr[i]
if (field.required === 'Y') {
const fieldValue = this.saveQuote[field.fieldId]
// 统一判断是否有值(包括勾选字段)
if (!fieldValue && fieldValue !== 0) {
this.$message.warning(field.fieldName + '不能为空!')
return
}
}
}
}
// 校验默认报价行的必填字段
if (this.plmQuoteDetailArr && this.plmQuoteDetailArr.length > 0 && this.defaultQuoteDetailRow) {
for (let i = 0; i < this.plmQuoteDetailArr.length; i++) {
const field = this.plmQuoteDetailArr[i]
if (field.required === 'Y' && !this.defaultQuoteDetailRow[field.fieldId] && this.defaultQuoteDetailRow[field.fieldId] !== 0) {
this.$message.warning('默认报价行的' + field.fieldName + '不能为空!')
return
}
}
}
this.$confirm('是否确认驳回?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

2
src/views/modules/rohs/rohsRecord.vue

@ -3873,7 +3873,7 @@ export default {
this.$message.warning('节点权限加载中,请稍后重试')
return
}
if (!this.validateSubmitRequiredFields()) {
if (nodeConclusion === 'Y' && !this.validateSubmitRequiredFields()) {
return
}
const submitMaterialList = this.normalizeMaterialListForSave(this.modalData.materialList || [])

5
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@ -2414,7 +2414,8 @@
submitData (tempData) {
let map = new Map(Object.entries(this.dataForm2))
if (this.plmTechnicalSpecificationSheetArr) {
const needValidateRequired = tempData.nodeConclusion === 'Y'
if (needValidateRequired && this.plmTechnicalSpecificationSheetArr) {
for (let i = 0; i < this.plmTechnicalSpecificationSheetArr.length; i++) {
if (map.has(this.plmTechnicalSpecificationSheetArr[i].fieldId) && !this.dataForm[this.plmTechnicalSpecificationSheetArr[i].fieldId] && this.plmTechnicalSpecificationSheetArr[i].required === 'Y') {
this.$message.warning(this.plmTechnicalSpecificationSheetArr[i].fieldName + '不能为空!')
@ -2422,7 +2423,7 @@
}
}
}
if (this.plmTechnicalSpecificationTeamArr) {
if (needValidateRequired && this.plmTechnicalSpecificationTeamArr) {
for (let i = 0; i < this.plmTechnicalSpecificationTeamArr.length; i++) {
if (map.has(this.plmTechnicalSpecificationTeamArr[i].fieldId) && this.dataForm[this.plmTechnicalSpecificationTeamArr[i].fieldId].length === 0 && this.plmTechnicalSpecificationTeamArr[i].required === 'Y') {
this.$message.warning(this.plmTechnicalSpecificationTeamArr[i].fieldName + '不能为空!')

3
src/views/modules/test/requestForTest.vue

@ -3917,7 +3917,8 @@ export default {
// 提交
submitData() {
if (this.plmTestInformationArr) {
const needValidateRequired = this.modalData.nodeConclusion === 'Y'
if (needValidateRequired && this.plmTestInformationArr) {
for (let i = 0; i < this.plmTestInformationArr.length; i++) {
if (!this.modalData[this.plmTestInformationArr[i].fieldId] && this.plmTestInformationArr[i].required === 'Y') {
this.$message.warning(this.plmTestInformationArr[i].fieldName + '不能为空!')

5
src/views/modules/tooling/searchToolApply.vue

@ -3047,7 +3047,8 @@ export default {
// 提交
submitData() {
if (this.plmChangeApplyHeaderArr) {
const needValidateRequired = this.dataForm.nodeConclusion === 'Y'
if (needValidateRequired && this.plmChangeApplyHeaderArr) {
for (let i = 0; i < this.plmChangeApplyHeaderArr.length; i++) {
let fieldId = this.plmChangeApplyHeaderArr[i].fieldId;
let isRequired = this.plmChangeApplyHeaderArr[i].required === 'Y';
@ -3063,7 +3064,7 @@ export default {
}
}
}
if (this.plmChangeApplyDetailArr) {
if (needValidateRequired && this.plmChangeApplyDetailArr) {
for (let i = 0; i < this.plmChangeApplyDetailArr.length; i++) {
// 判断集合中的该属性是否都有值
let val = this.toolData.every(item => {

Loading…
Cancel
Save