diff --git a/jero-web/src/components/SelectedBy/index.vue b/jero-web/src/components/SelectedBy/index.vue
index 05d2381f5..66886395e 100644
--- a/jero-web/src/components/SelectedBy/index.vue
+++ b/jero-web/src/components/SelectedBy/index.vue
@@ -51,7 +51,11 @@
isSingleChoice: {
type: Boolean,
default: false
- }
+ },
+ flag:{
+ type: Number,
+ default: 0
+ },
},
data() {
return {
@@ -109,6 +113,7 @@
return
}
}
+ this.confirmLoading = true
if (this.userIds && this.userIds.length > 0) {
this.submitLoading = true
this.$emit('SelectedByForm', this.userIds.join(','),this.userName.join(','))
@@ -143,12 +148,21 @@
} else {
gData = ''
}
+ let query = {}
+ if (this.flag == 1){
+ query = {
+ departId: this.departId,
+ json: gData,
+ }
+ }else{
+ query = {
+ departId: this.departId,
+ json: gData,
+ flag: '1'
+ }
+ }
this.confirmLoading = true
- postAction('sys/user/queryDepartUserTreeList', {
- departId: this.departId,
- json: gData,
- flag: '1'
- }).then((res) => {
+ postAction('sys/user/queryDepartUserTreeList', query).then((res) => {
this.confirmLoading = false
if (res.success) {
this.gData = res.result
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
index 4e946c1bf..4b67739c8 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
@@ -129,11 +129,11 @@
*
{{$t('authorizedUser')}}
-
-
+
+ v-model="formInline.studioEngineerIdName"/>
@@ -209,7 +209,7 @@
+
+
\ 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 5bfb4bdad..387241d51 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -341,24 +341,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{ $t('deleteLib') }}
+
{{ $t('resultReported') }}
@@ -2383,31 +2370,35 @@
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let _this = this
let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ let selectedRowKeysList = []
let isTrue = false
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
- if (
- (this.dataSource[i].verifyFlowStatus == 'List to be released' ||
- this.dataSource[i].verifyFlowStatus == 'Compliance' ||
- this.dataSource[i].verifyFlowStatus == 'Non-Compliance' ||
- this.dataSource[i].verifyFlowStatus == 'To be tracked' ||
- this.dataSource[i].verifyFlowStatus == 'NA')
- &&
- (this.dataSource[i].designFlowStatus == 'List to be released' ||
- this.dataSource[i].designFlowStatus == 'Compliance' ||
- this.dataSource[i].designFlowStatus == 'Non-Compliance' ||
- this.dataSource[i].designFlowStatus == 'To be tracked' ||
- this.dataSource[i].designFlowStatus == 'NA')) {
- isTrue = true
- } else {
- isTrue = false
- this.$message.warning(this.$t('onlyDeleted'))
- return
- }
+ selectedRowKeysList.push(this.dataSource[i])
}
}
}
+ for (let i = 0; i < selectedRowKeysList.length; i++) {
+ if (
+ (selectedRowKeysList[i].verifyFlowStatus == 'List to be released' ||
+ selectedRowKeysList[i].verifyFlowStatus == 'Compliance' ||
+ selectedRowKeysList[i].verifyFlowStatus == 'Non-Compliance' ||
+ selectedRowKeysList[i].verifyFlowStatus == 'To be tracked' ||
+ selectedRowKeysList[i].verifyFlowStatus == 'NA')
+ &&
+ (selectedRowKeysList[i].designFlowStatus == 'List to be released' ||
+ selectedRowKeysList[i].designFlowStatus == 'Compliance' ||
+ selectedRowKeysList[i].designFlowStatus == 'Non-Compliance' ||
+ selectedRowKeysList[i].designFlowStatus == 'To be tracked' ||
+ selectedRowKeysList[i].designFlowStatus == 'NA')) {
+ isTrue = true
+ } else {
+ isTrue = false
+ // this.$message.warning(this.$t('onlyDeleted'))
+ break
+ }
+ }
if (isTrue) {
this.$confirm({
content: _this.$t('ConfirmBatchDeletion'),
@@ -2427,6 +2418,25 @@
})
}
})
+ }else{
+ this.$confirm({
+ content: _this.$t('thereProcessInProgressDeletion')+'?',
+ onOk() {
+ let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ postAction(_this.url.deleteBatch, {
+ ids: idList.join(','),
+ projectLibraryId: _this.$route.query.id
+ }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ _this.getList()
+ } else {
+ _this.$message.warning(res.message)
+ }
+ })
+ }
+ })
}
} else {
this.$message.warning(this.$t('selectLeastOne'))
@@ -2445,19 +2455,44 @@
//删除
deleteLib(val) {
let _this = this
- this.$confirm({
- content: _this.$t('ConfirmDelete'),
- onOk() {
- deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
- if (res.success) {
- _this.$message.success(_this.$t('OperationSuccessful'))
- _this.getList()
- } else {
- _this.$message.warning(_this.$t('operationFailed'))
- }
- })
- }
- })
+ if ((val.verifyFlowStatus == 'List to be released' ||
+ val.verifyFlowStatus == 'Compliance' ||
+ val.verifyFlowStatus == 'Non-Compliance' ||
+ val.verifyFlowStatus == 'To be tracked' ||
+ val.verifyFlowStatus == 'NA')&&
+ (val.designFlowStatus == 'List to be released' ||
+ val.designFlowStatus == 'Compliance' ||
+ val.designFlowStatus == 'Non-Compliance' ||
+ val.designFlowStatus == 'To be tracked' ||
+ val.designFlowStatus == 'NA')){
+ this.$confirm({
+ content: _this.$t('ConfirmDelete'),
+ onOk() {
+ deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
+ }else{
+ this.$confirm({
+ content: _this.$t('thereProcessInProgressDeletion')+'?',
+ onOk() {
+ deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
+ }
},
//选择数据
onSelectChange(value, rows) {
@@ -2674,7 +2709,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
- width: long == 'zh-cn' ? 140 : 186,
+ width: long == 'zh-cn' ? 180 : 226,
scopedSlots: { customRender: 'operation' }
})
this.columnsAll.forEach((item) => {