ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 修改企标评审会记录和企标详情总分计算，企标制修订流程-部所联络人下发节点截止日期可以等于计划日期当天

Browse Source
This commit is contained in:
lideqin
2024-01-16 15:17:33 +08:00
parent 424e49aa92
commit 7c014955ee
3 changed files with 28 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/enterpriseStandardLibrary/reviewMeeting/modules/ScoreDetail.vue
+13 -102
View File
@@ -154,95 +154,6 @@ const fixDataSourse = [
project: '总分：0'
}
]
const initData = {
'60.00': null,
'test_chh（00712）': [
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '1',
evaluateScore: '10',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
},
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '2',
evaluateScore: '11',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
},
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '3',
evaluateScore: '12',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
},
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '4',
evaluateScore: '13',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
},
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '5',
evaluateScore: '14',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
},
{
id: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
orgCode: null,
reviewMeetingId: null,
evaluateItem: '6',
evaluateScore: '15',
adjudicatorId: null,
adjudicatorName: 'test_chh（00712）',
deductionScoreReason: '无'
}
]
}
export default {
name: 'ScoreDetail',
data () {
@@ -375,7 +286,8 @@ export default {
}
}
],
dataSource: []
dataSource: [],
allScore: 0
}
},
watch: {
@@ -389,7 +301,7 @@ export default {
if (dataArr) {
for (const i in fixDataSourse) {
this.dataSource[i] = { ...fixDataSourse[i] }
if (i % 3 === 0) {
if (i % 3 === 0 && Number(i) !== 18) {
this.dataSource[i].evaluateScore = dataArr[Math.floor(i / 3)].evaluateScore || ''
this.dataSource[i].deductionScoreReason = dataArr[Math.floor(i / 3)].deductionScoreReason || ''
}
@@ -397,26 +309,25 @@ export default {
} else {
this.dataSource = [...fixDataSourse]
}
this.getAllScore()
}
}
}
},
computed: {
// 总分
allScore () {
const arr = [0, 3, 6, 9, 12, 15]
let score = 0
for (const item of arr) {
score += Number(this.dataSource[item].evaluateScore) || 0
}
return score
}
},
methods: {
open (id) {
this.visible = true
this.initData(id)
},
// 获取总分
getAllScore () {
const arr = [0, 3, 6, 9, 12, 15]
let score = 0
for (const item of arr) {
score += Number(this.dataSource[item].evaluateScore) || 0
}
this.allScore = score
},
initData (id) {
this.confirmLoading = true
getScoreDetail(id).then(res => {
src/views/enterpriseStandardLibrary/standard/detail/module/EnterpriseStandardEvaluateModal.vue
+13 -13
View File
@@ -286,7 +286,8 @@ export default {
}
}
],
dataSource: []
dataSource: [],
allScore: 0
}
},
watch: {
@@ -300,7 +301,7 @@ export default {
if (dataArr) {
for (const i in fixDataSourse) {
this.dataSource[i] = { ...fixDataSourse[i] }
if (i % 3 === 0) {
if (i % 3 === 0 && Number(i) !== 18) {
this.dataSource[i].evaluateScore = dataArr[Math.floor(i / 3)].evaluateScore || ''
this.dataSource[i].deductionScoreReason = dataArr[Math.floor(i / 3)].deductionScoreReason || ''
}
@@ -308,26 +309,25 @@ export default {
} else {
this.dataSource = [...fixDataSourse]
}
this.getAllScore()
}
}
}
},
computed: {
// 总分
allScore () {
const arr = [0, 3, 6, 9, 12, 15]
let score = 0
for (const item of arr) {
score += Number(this.dataSource[item].evaluateScore) || 0
}
return score
}
},
methods: {
open (standardId) {
this.visible = true
this.initData(standardId)
},
// 获取总分
getAllScore () {
const arr = [0, 3, 6, 9, 12, 15]
let score = 0
for (const item of arr) {
score += Number(this.dataSource[item].evaluateScore) || 0
}
this.allScore = score
},
initData (standardId) {
this.confirmLoading = true
detailEvaluate(standardId).then(res => {
src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
+2 -2
View File
@@ -116,12 +116,12 @@ export default {
let data = {}
await this.$refs.ruleForm.validate(valid => {
if (valid) {
// 有征求意见稿计划完成日期和征求意见截止日期，需要征求意见截止日期比计划完成日期早
// 有征求意见稿计划完成日期和征求意见截止日期，需要征求意见截止日期比计划完成日期早可以等于
if (JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate && this.formInline.adviceDeadline) {
console.log('征求意见稿计划完成日期', JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate)
const planDate = new Date(Date.parse(JSON.parse(this.formInline.businessJson).solicitationDraftPlanCompleteDate))
const deadlineDate = new Date(Date.parse(this.formInline.adviceDeadline))
if (deadlineDate < planDate) {
if (deadlineDate <= planDate) {
// 截止日期比完成日期早
data = Object.assign({}, this.formInline)
} else {