+
{{ item.name || '-' }}
{{ item.contactNumber || '-' }}
@@ -48,7 +49,7 @@ import InputSearch from '@screen/components/InputSearch/index.vue';
import Form from '@screen/components/FormConfig';
import { loadingMessage } from '@screen/utils/common';
-
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
import request from "@/utils/request";
import { Message } from "element-ui";
@@ -111,42 +112,21 @@ export default {
set(bool) {
this.$emit('close', bool);
}
+ },
+ getActive() {
+ return data => this[this.active].findIndex(item => item.id === data.id) != -1;
}
},
watch: {
visible: {
immediate: true,
- handler(bool) {
+ async handler(bool) {
if (!bool) return;
if (!this.data) {
- // 机构
- request({
- url: `/business/employees/organization`,
- method: "POST",
- data: {}
- })
- .then((result) => {
- if (result.code != 200) return;
-
- const data = [];
-
- result.data.forEach(item => {
-
- if (item.organizationType == 2) {
- data.push({
- key: item.id,
- label: item.organizationName,
- disabled: false
- })
- }
- })
-
- this.formList[0].options.options = data;
- })
- .catch((err) => {
- });
+ const result = await getSelectOptionsStation(2);
+ this.formList[0].options.options = (result || []);
return;
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
index c280d6d3..b688d7be 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue
@@ -152,7 +152,17 @@ export default {
},
],
data: [],
- searchFormList: [],
+ searchFormList: [
+ {
+ label: "值班日期:",
+ key: "date",
+ required: true,
+ type: "datePicker",
+ options: {
+ valueFormat: "yyyy-MM-dd"
+ }
+ },
+ ],
operateRecordVisible: false,
modifyDutyInformationTableVisible: false,
dialogData: null
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
index a06e5316..e688ca9a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/components/AddNEditDialog.vue
@@ -25,6 +25,7 @@ import request from "@/utils/request";
import { CameraDirectionEnumList } from "@screen/utils/enum.js"
import { Message } from "element-ui";
import { cloneDeep, merge } from 'lodash';
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
export default {
name: 'DeviceControlDialog',
@@ -186,34 +187,11 @@ export default {
}
},
methods: {
- getOptions() {
- // 机构
- request({
- url: `/business/employees/organization`,
- method: "post",
- data: {}
- })
- .then((result) => {
- if (result.code != 200) return;
+ async getOptions() {
- const data = [];
+ const result = await getSelectOptionsStation(1);
- result.data.forEach(item => {
-
- if (item.organizationType == 1) {
- data.push({
- key: item.id,
- label: item.organizationName,
- disabled: false
- })
- }
- })
-
- this.formList[0].options.options = data;
- })
- .catch((err) => {
-
- });
+ this.formList[0].options.options = result;
},
handleSubmit() {
this.$refs.FormConfigRef.validate()
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
index ef9a2b85..572728d0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue
@@ -21,7 +21,7 @@ import Button from "@screen/components/Buttons/Button.vue"
import Form from '@screen/components/FormConfig';
import request from "@/utils/request";
-
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
import { Message } from "element-ui";
export default {
@@ -116,11 +116,8 @@ export default {
}),
// 机构
- request({
- url: `/business/employees/organization`,
- method: "post",
- data: {}
- })
+ getSelectOptionsStation()
+
])
.then(([post, organization]) => {
if (post.status === 'fulfilled' && post.value.code == 200) {
@@ -129,11 +126,9 @@ export default {
label: item.postName,
}))
}
- if (organization.status === 'fulfilled' && organization.value.code == 200) {
- this.formList[3].options.options = organization.value.data.map(item => ({
- key: item.id,
- label: item.organizationName,
- }))
+
+ if (organization.status === 'fulfilled' && Array.isArray(organization.value)) {
+ this.formList[3].options.options = organization.value;
}
})
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
index 430bed70..85108bdc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue
@@ -49,6 +49,7 @@ import { searchFormList } from "./data";
import request from "@/utils/request";
import { setLoading } from "@screen/utils/index.js"
import { delay, exportFile, confirm } from "@screen/utils/common";
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
// 应急人员
export default {
@@ -104,11 +105,7 @@ export default {
}),
// 机构
- request({
- url: `/business/employees/organization`,
- method: "post",
- data: {}
- })
+ getSelectOptionsStation()
])
.then(([post, organization]) => {
if (post.status === 'fulfilled' && post.value.code == 200) {
@@ -117,11 +114,9 @@ export default {
label: item.postName,
}))
}
- if (organization.status === 'fulfilled' && organization.value.code == 200) {
- this.searchFormList[1].options.options = organization.value.data.map(item => ({
- key: item.id,
- label: item.organizationName,
- }))
+ if (organization.status === 'fulfilled' && Array.isArray(organization.value)) {
+ console.log("%c [ organization ]-119-「index.vue」", "font-size:15px; background:#317507; color:#75b94b;", organization);
+ this.searchFormList[1].options.options = organization.value;
}
})
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddDialog.vue
index 32b0b036..ce97cabe 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/components/AddDialog.vue
@@ -25,6 +25,7 @@ import request from "@/utils/request";
import { CameraDirectionEnumList } from "@screen/utils/enum.js"
import { Message } from "element-ui";
import { cloneDeep, merge } from 'lodash';
+import { getSelectOptionsStation } from "@screen/pages/control/event/businessDataManagement/utils.js";
export default {
name: 'DeviceControlDialog',
@@ -186,34 +187,10 @@ export default {
}
},
methods: {
- getOptions() {
- // 机构
- request({
- url: `/business/employees/organization`,
- method: "post",
- data: {}
- })
- .then((result) => {
- if (result.code != 200) return;
+ async getOptions() {
+ const result = await getSelectOptionsStation(1)
- const data = [];
-
- result.data.forEach(item => {
-
- if (item.organizationType == 1) {
- data.push({
- key: item.id,
- label: item.organizationName,
- disabled: false
- })
- }
- })
-
- this.formList[0].options.options = data;
- })
- .catch((err) => {
-
- });
+ this.formList[0].options.options = result || [];
},
handleSubmit() {
this.$refs.FormConfigRef.validate()