diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1f2e1fe4c..c0af73ec7 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -808,4 +808,5 @@ module.exports = {
pleaseConformityVerification:'Please complete the data of Conformity verification',
virtualListDetails:'Virtual list details',
maintainVirtualList:'Maintain virtual list',
+ reasonsForRejection:'Reasons for rejection',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 121b22236..10d3a802f 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -813,4 +813,5 @@ module.exports = {
pleaseConformityVerification: '请补全验证符合性确认的数据',
virtualListDetails:'虚拟清单详情',
maintainVirtualList:'维护虚拟清单',
+ reasonsForRejection:'驳回原因',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 763af7cf3..69c087292 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -266,6 +266,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -555,9 +584,21 @@
}
],
visibleFile: false,
+ formInlineComment: {},
+ rulesComment: {
+ commentContent: [
+ {
+ required: true,
+ message: this.$t('reasonsForRejection') + this.$t('cannotEmpty'),
+ trigger: 'blur'
+ }
+ ]
+ },
timeName: '',
+ visibleComment: false,
dataSourceFile: [],
confirmLoading: false,
+ confirmLoadingComment: false,
queryParamQuery: {},
isDisplay: true,
selectedRowKeys: [],
@@ -1063,17 +1104,48 @@
this.$confirm({
content: num == 0 ? _this.$t('confirmSubmit') : _this.$t('confirmOverrule'),
onOk() {
- let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
- _this.getRowKeys(selectedRowKeys, function() {
- _this.updateStatusBatch(num, selectedRowKeys)
- })
+ if (num == 0) {
+ let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ _this.getRowKeys(selectedRowKeys, function() {
+ _this.updateStatusBatch(num, selectedRowKeys)
+ })
+ } else {
+ let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ _this.getRowKeys(selectedRowKeys, function() {
+ _this.visibleComment = true
+ })
+ }
}
})
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
-
+ handleOkComment() {
+ this.$refs.ruleFormComment.validate(valid => {
+ if (valid) {
+ let url = '/project/projectCommentEO/add'
+ let query = {
+ commentContent: this.formInlineComment.commentContent,
+ projectLibraryId: this.$route.query.id
+ }
+ this.confirmLoadingComment = true
+ let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+ this.updateStatusBatch(1, selectedRowKeys)
+ postAction(url, query).then((res) => {
+ if (res.success) {
+ this.visibleComment = false
+ this.confirmLoadingComment = false
+ } else {
+ this.confirmLoadingComment = false
+ }
+ })
+ }
+ })
+ },
+ handleCancelComment() {
+ this.visibleComment = false
+ },
handleCancel() {
this.formInline = {}
this.visible = false
@@ -1385,6 +1457,24 @@
color: #040B29;
margin-bottom: 22px;
}
+ .itemModelComment{
+ width: calc(100% - 64px);
+ display: inline-block;
+ margin-top: 2px;
+ }
+ .title-text-Comment{
+ width: 74px;
+ text-align: right;
+ display: inline-block;
+ font-weight: 500;
+ font-size: 14px;
+ margin-right: 16px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ height: 42px;
+ line-height: 48px;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index fb2985fb8..3e6aef24a 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -150,10 +150,8 @@
this.getList()
},
handleExport() {
- let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
let query = {
...this.queryParam,
- ids: selectedRowKeys.join(','),
projectLibraryId: this.$route.query.id
}
downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)