diff --git a/src/api/process.js b/src/api/process.js index 683f86681..132ac33b5 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -77,6 +77,14 @@ export function processCreateStand (data) { }) } +export function processCreateBuss (data) { + return axios({ + url: '/api/lawss/actSarItemsLaws/processCreateBuss', + method: 'post', + data + }) +} + export function processCreateLaws (data) { return axios({ url: '/api/lawss/actSarItemsLaws/processCreateLaws', @@ -432,6 +440,14 @@ export function isEnd (data) { }) } +export function evaluationHisList (data) { + return axios({ + url: '/api/lawss/activiti/evaluationHisList', + method: 'get', + params: data + }) +} + export function execTask (data) { return axios({ url: '/api/lawss/activiti/execTask', diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 7fe30ebb5..aea6be615 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -134,7 +134,17 @@ export default { }, res => { if (res.ok) { this.fit = res.data.fit.records + this.fit.forEach(item => { + if(item.standardItem){ + item.standNumber = item.standardItem + } + }) this.unfit = res.data.unfit.records + this.unfit.forEach(item => { + if(item.standardItem){ + item.standNumber = item.standardItem + } + }) } else { this.$message.warning(res.message) } diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index eaf946066..3258600ba 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -127,6 +127,7 @@ + width="200px"> + style="width: 100%" + :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}"> @@ -291,7 +293,8 @@ @@ -1292,19 +1295,20 @@ export default { data () { return { commentAverageScoreTag: '1', - firstHistoryPeopleId: '',//最新评价的人的id + qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id + dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id historyInfoLoading: false,//历史评价信息的loading historyCommentForm: { averageScore: 0, // 平均分值 revise: '', reviseReason: '', // 修订理由 }, // 历史评价表单 - dynamicHistoryCommentTable: [], // 动态评价历史评价表格 qualityHistoryCommentTable: [], // 质量评价历史评价表格 - dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格 + dynamicHistoryCommentTable: [], // 动态评价历史评价表格 qualityHistoryPeopleTable: [], // 质量评价历史评价人表格 - dynamicCommentScore: 0,// 动态评价总平均分 + dynamicHistoryPeopleTable: [], // 动态评价历史评价人表格 qualityCommentScore: 0,// 质量评价总平均分 + dynamicCommentScore: 0,// 动态评价总平均分 commentActiveName: 'dynamicComment', indexType: 'dynamic', commentReason: '', // 评价理由 @@ -1535,13 +1539,19 @@ export default { methods: { historyPeopleChange(row){ this.historyInfoLoading = true - const allData = { - lawId: this.sarStandardsInfoEO.id, + const qualityAllData = { + lawId: this.$route.params.id, + userId: row.userId, + evaluationType: this.indexType, + processNode: row.processNode + } + const dynamicAllData = { + lawId: this.$route.params.id, userId: row.userId, evaluationType: this.indexType } if (this.indexType === 'quality'){ - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', qualityAllData , { _this: this }, res => { this.qualityHistoryCommentTable = res.data @@ -1551,7 +1561,7 @@ export default { this.historyInfoLoading = false }) }else if (this.indexType === 'dynamic'){ - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', dynamicAllData , { _this: this }, res => { this.dynamicHistoryCommentTable = res.data @@ -1580,9 +1590,10 @@ export default { this.indexType = 'quality' //查询评分表 const allData = { - lawId: this.sarStandardsInfoEO.id, - userId: this.firstHistoryPeopleId, - evaluationType: this.indexType + lawId: this.$route.params.id, + userId: this.qualityFirstHistoryPeopleId, + evaluationType: this.indexType, + processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null } this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { _this: this @@ -1598,8 +1609,8 @@ export default { this.indexType = 'dynamic' //查询评分表 const allData = { - lawId: this.sarStandardsInfoEO.id, - userId: this.firstHistoryPeopleId, + lawId: this.$route.params.id, + userId: this.dynamicFirstHistoryPeopleId, evaluationType: this.indexType } this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { @@ -1624,7 +1635,7 @@ export default { } //查询动态评价总平均分和质量评价总平均分 - let standId = this.sarStandardsInfoEO.id + let standId = this.$route.params.id this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { @@ -1634,6 +1645,32 @@ export default { }, e => { }) + // 刷新质量评价评分人表格和动态评价评分人表格 + const qualityRequest = { + lawId: standId, + evaluationType: 'quality' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { + _this: this + }, res => { + this.qualityHistoryPeopleTable = res.data.records + this.qualityFirstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) + const dynamicRequest = { + lawId: standId, + evaluationType: 'dynamic' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { + _this: this + }, res => { + this.dynamicHistoryPeopleTable = res.data.records + this.dynamicFirstHistoryPeopleId = res.data.records[0].userId + + }, e => { + }) + }, targetScoreChange(row){ if (this.targetScore1 === '') { @@ -1714,9 +1751,9 @@ export default { const allData = { tableData: this.businessCommentTable, formData: JSON.stringify(this.businessCommentForm), - standId: this.sarStandardsInfoEO.id, + standId: this.$route.params.id, userId: this.$store.getters.userInfo.userId, - evaluationType: this.indexType + evaluationType: 'dynamic' } this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, { @@ -1726,16 +1763,17 @@ export default { this.$message.success('提交成功') this.commentSubmitLoading = false //重新评分之后刷新历史评分人 - let standId = this.sarStandardsInfoEO.id - this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', {lawId:standId}, { + let standId = this.$route.params.id + const dynamicRequest = { + lawId: standId, + evaluationType: 'dynamic' + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { _this: this }, res => { this.dynamicHistoryPeopleTable = [] this.dynamicHistoryPeopleTable = res.data.records - this.firstHistoryPeopleId = res.data.records[0].userId - // for (let i = 0; i < res.data.records.length; i++) { - // this.dynamicHistoryPeopleTable.push(res.data.records[i].userName) - // } + this.dynamicFirstHistoryPeopleId = res.data.records[0].userId }, e => { }) @@ -2819,27 +2857,28 @@ export default { // } }, async mounted () { + let standId = this.$route.params.id const qualityRequest = { - lawId: this.sarStandardsInfoEO.id, + lawId: standId, evaluationType: 'quality' } this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, { _this: this }, res => { this.qualityHistoryPeopleTable = res.data.records - this.firstHistoryPeopleId = res.data.records[0].userId + this.qualityFirstHistoryPeopleId = res.data.records[0].userId }, e => { }) const dynamicRequest = { - lawId: this.sarStandardsInfoEO.id, + lawId: standId, evaluationType: 'dynamic' } this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, { _this: this }, res => { this.dynamicHistoryPeopleTable = res.data.records - this.firstHistoryPeopleId = res.data.records[0].userId + this.dynamicFirstHistoryPeopleId = res.data.records[0].userId }, e => { }) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1da2de6f6..b40fd024c 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -735,10 +735,10 @@ width="90" > - - + + + +
- + {{ standShowItemEO.itemsNum }}
- + {{ standShowItemEO.itemsName }}
- + {{ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
- + {{ @@ -982,48 +982,48 @@
- + {{ - standShowItemEO.xccssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : '' + standShowItemEO.xccssrq }}
- + {{ - standShowItemEO.zccssrq ? $moment(standShowItemEO.zccssrq).format('YYYY-MM-DD') : '' + standShowItemEO.zccssrq }}
- + {{ standShowItemEO.applyArctic }}
- + {{ standShowItemEO.responsibleUnit }}
- + {{ standShowItemEO.dutyEngineer }}
- + {{ standShowItemEO.comparedWithPrevious }}
- + {{ standShowItemEO.complianceRequire }}
- + {{ standShowItemEO.complianceState }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index df1f01387..e9fd7f355 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -564,12 +564,12 @@ export default { this.newDataList = this.fileTextList this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.fileListData.fileText = this.newDataList diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 91585107c..2790eec83 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -535,12 +535,12 @@ export default { this.newDataList = this.fillFileList this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.rh_pageData.fillFile = this.newDataList diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index eb466992d..87045d465 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -460,7 +460,7 @@ export default { display: flex; flex-direction: column; justify-content: space-between; - height: calc(~'100% - 103px'); + height: calc(~'100% - 100px'); overflow: auto; .tableTitle { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 948bbc6d6..1bb287d22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -375,12 +375,12 @@ export default { this.newDataList = this.reData this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } @@ -449,12 +449,12 @@ export default { this.newThemeFile = this.themeData this.newThemeFile.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.themeDataList.meetingFile = this.newThemeFile @@ -510,12 +510,12 @@ export default { this.newOtherFile = this.hh_pageData.otherFileList this.newOtherFile.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newOtherFile.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.hh_pageData.otherFileList = this.newOtherFile diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index c8efb7e7f..11f73fd78 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -487,12 +487,12 @@ export default { this.newDataList = this.ch_pageData.fileTextList this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.ch_pageData.fileTextList = this.newDataList diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 03b7692c2..c657cf445 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -171,7 +171,7 @@ - - + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 603982bb9..5c214377c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -392,23 +392,15 @@ > - - - - - - - - - - @@ -470,12 +462,14 @@ @@ -842,7 +836,7 @@ itemList = data.itemList } itemList.forEach(item => { - item.unitDeptName = this.$store.getters.userInfo.orgName + item.unitDeptName = this.$store.getters.userInfo.institutionName item.onlineData = item.onlineData || '' item.newData = item.newData || '' item.complianceState = item.complianceState || '' @@ -853,6 +847,8 @@ item.itemsTitle = item.itermsConditions item.applyArctic = item.applyArctic || [] }) + + this.itemList = itemList this.loading = false }).catch(e => { @@ -884,6 +880,11 @@ padding: 0 20px 0; } } + .myDataPick { + /deep/.el-form-item__content { + margin-left: 0px !important; + } + } .fileClass { cursor: pointer; } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index a2a4410af..2163d6e9d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -170,7 +170,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 903eaaa07..77990f427 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -101,25 +101,19 @@ + - -