@@ -164,11 +210,13 @@
formInline: {},
rules: {},
ids: [],
+ firstLevelDutyTerritoryList: [],
configurationItemList: [],
engineeringInterfacePersonList: [],
typeOfDeliverablesList: [],
name: '',
- DeliverableTreeList: []
+ DeliverableTreeList: [],
+ dutyTerritoryList:[],
}
},
mounted() {
@@ -177,7 +225,32 @@
disabledDate(current) {
return current && current < moment().subtract(1, 'day')
},
-
+ getFirstLevelDutyTerritory() {
+ getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+ if (res.success) {
+ this.firstLevelDutyTerritoryList = res.result
+ } else {
+ this.firstLevelDutyTerritoryList = []
+ }
+ })
+ },
+ DutyDepartChange(event) {
+ this.formInline.dutyTerritory = []
+ this.formInline = { ...this.formInline }
+ this.getDutyTerritory(event.join(','))
+ },
+ getDutyTerritory(row) {
+ let query = {
+ dutyDepart: row
+ }
+ getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+ if (res.success) {
+ this.dutyTerritoryList = res.result || []
+ } else {
+ this.dutyTerritoryList = []
+ }
+ })
+ },
getDeliverableTree() {
getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
if (res.success) {
@@ -187,16 +260,17 @@
}
})
},
- edit(data, name,content) {
+ edit(data, name, content) {
this.visible = true
this.getDeliverableTree()
+ this.getFirstLevelDutyTerritory()
this.$nextTick(() => {
this.ids = data || []
this.formInline = {}
this.name = name
if (content && name == this.$t('BatchSetting')) {
- this.formInline.dutyTerritory = content.dutyTerritory
- this.queryPersonByProject(content.dutyTerritory)
+ // this.formInline.dutyTerritory = content.dutyTerritory
+ // this.queryPersonByProject(content.dutyTerritory)
}
this.formInline = { ...this.formInline }
})
@@ -231,7 +305,7 @@
} else {
url = this.url.setBatch
}
- if (!query.configItem){
+ if (!query.configItem) {
query.configItem = undefined
}
postAction(url, query).then((res) => {
@@ -286,7 +360,7 @@
},
handleChange(value) {
this.formInline.sdt = undefined
- this.queryPersonByProject(this.formInline.dutyTerritory)
+ this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
},
queryPersonByProject(row) {
let query = {
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index e144def4d..0d5eb5cf4 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -739,6 +739,13 @@
sorter: true,
scopedSlots: { customRender: 'serialNumber' }
},
+ {
+ title: this.$t('statisticalNodes'),
+ align: 'left',
+ dataIndex: 'dutyDepart',
+ width: 100,
+ ellipsis: true
+ },
{
title: this.$t('areaOfResponsibility'),
align: 'left',
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d90b4bf48..a5077dd18 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -858,6 +858,13 @@
width: 180,
sorter: true
},
+ {
+ title: this.$t('statisticalNodes'),
+ align: 'left',
+ ellipsis: true,
+ dataIndex: 'dutyDepart',
+ width: 120
+ },
{
title: this.$t('areaOfResponsibility'),
align: 'left',
@@ -1126,6 +1133,15 @@
key: 6,
moduleFlag: '法规清单'
},
+ {
+ sort: '',
+ name: this.$t('statisticalNodes'),
+ headFieldCn: '责任部门',
+ headFieldEn: 'Duty Department',
+ field: 'dutyDepart',
+ key: 8,
+ moduleFlag: '法规清单'
+ },
{
sort: '',
name: this.$t('areaOfResponsibility'),
diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
index 6b86102b9..eec6af2c4 100644
--- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
+++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue
@@ -10,17 +10,57 @@
>
+
+
+
+ {{$t('statisticalNodes')}}
+
+
+
+
+
+ {{ item.key }}
+
+
+
+
+
{{$t('areaOfResponsibility')}}
-
+
+
+
+ {{ item.itemText }}
+
+
+
+
+
+
+
+
@@ -29,6 +69,9 @@
+
+
+
@@ -67,14 +110,43 @@ export default {
rules: {},
ids: [],
DeliverableTreeList: [],
+ firstLevelDutyTerritoryList:[],
+ dutyTerritoryList:[],
}
},
mounted() {
this.getDeliverableTree()
},
methods: {
+ getFirstLevelDutyTerritory() {
+ getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+ if (res.success) {
+ this.firstLevelDutyTerritoryList = res.result
+ } else {
+ this.firstLevelDutyTerritoryList = []
+ }
+ })
+ },
+ DutyDepartChange(event) {
+ this.formInline.dutyTerritory = []
+ this.formInline = { ...this.formInline }
+ this.getDutyTerritory(event.join(','))
+ },
+ getDutyTerritory(row) {
+ let query = {
+ dutyDepart: row
+ }
+ getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+ if (res.success) {
+ this.dutyTerritoryList = res.result || []
+ } else {
+ this.dutyTerritoryList = []
+ }
+ })
+ },
edit(data) {
this.visible = true
+ this.getFirstLevelDutyTerritory()
this.$nextTick(() => {
this.ids = data || []
this.formInline = {}
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
index 7144a6cfe..e647ce260 100644
--- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
@@ -373,6 +373,13 @@
ellipsis: true,
scopedSlots: { customRender: 'serialNumber' }
},
+ {
+ title: this.$t('statisticalNodes'),
+ align: 'left',
+ dataIndex: 'dutyDepart',
+ width: 100,
+ ellipsis: true
+ },
{
title: this.$t('areaOfResponsibility'),
align: 'left',