diff --git a/src/views/modules/base/orgUnitManger/add.vue b/src/views/modules/base/orgUnitManger/add.vue index 465bfd90b..65bbd741e 100644 --- a/src/views/modules/base/orgUnitManger/add.vue +++ b/src/views/modules/base/orgUnitManger/add.vue @@ -83,8 +83,8 @@ - - + @@ -636,30 +636,6 @@ }, async handleComfirm() { console.log(this.formData," this.formData"); - - // if (!this.formData.address) { - // this.$message.error('请输入具体位置'); - // return; - // } - - - - // if (!this.formData.attrs ) { - // this.$message.error('请上传图片'); - // return; - // } - - // if (!this.formData.linkPhone) { - // this.$message.error('请填写联系电话'); - // return; - // } - - // if (!this.formData.positionId) { - // this.$message.error('请选择挂靠阵地'); - // return; - // } - - this.addActivity() }, //增加 diff --git a/src/views/modules/base/orgUnitManger/index.vue b/src/views/modules/base/orgUnitManger/index.vue index 7ee6a267c..6e7a5e28a 100644 --- a/src/views/modules/base/orgUnitManger/index.vue +++ b/src/views/modules/base/orgUnitManger/index.vue @@ -4,51 +4,51 @@
- + - + - + - - - + + + - - + - - + - - + - - - + + + - - - + + + @@ -161,52 +161,57 @@ export default { data() { return { - //车辆类型 - optionsStatus:[ + //是否危化企业 + keyUnitList: [ { - value: '1', - label: '自有' + value: "0", + label: '否', }, { - value: '2', - label: '租赁' + value: "1", + label: '是', }, + ], + //是否九小场所 + SmallPlaces: [ { - value: '3', - label: '挂靠' + value: "0", + label: '否', }, { - value: '4', - label: '其他' - } - ], - formData:{ - id: "", - customerId: "", - delFlag: "", - revision: "", - createdBy: "", - createdTime: "", - updatedBy: "", - updatedTime: "", - agencyId: "", - type: "", - property: "", - name: "", - socialCreditCode: "", - legalUserName: "", - legalUserIdCardType: "", - legalUserIdCard: "", - legalUserPhone: "", - keyUnitFlag: "", - keyUnitType: "", - ninePlaceFlag: "", - ninePlaceType: "", - dangerCompanyFlag: "", - registerAddress: "", - longitude: "", - latitude: "" - }, + value: "1", + label: '是', + }, + ], + companyList:[],//企业性质 + orgTypeList: [],//组织类型 + formData: { + id: "", + customerId: "", + delFlag: "", + revision: "", + createdBy: "", + createdTime: "", + updatedBy: "", + updatedTime: "", + agencyId: "", + type: "", + property: "", + name: "", + socialCreditCode: "", + legalUserName: "", + legalUserIdCardType: "", + legalUserIdCard: "", + legalUserPhone: "", + keyUnitFlag: "", + keyUnitType: "", + ninePlaceFlag: "", + ninePlaceType: "", + dangerCompanyFlag: "", + registerAddress: "", + longitude: "", + latitude: "" + }, showinfo:false, pageSize:20, pageNo:1, @@ -245,6 +250,9 @@ async mounted() { this.getTableData() this.getOrgTreeList() + this.orgtype() + this.companynature() + this.loadplaceType() await this.loadOrgData(); }, computed: { @@ -276,6 +284,47 @@ }, methods: { + //企业性质 + async companynature() { + const url = '/sys/dict/data/dictlist'; + let params = { + dictType: "company_nature" + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.companyList = data; + } else { + this.$message.error(msg); + } + }, + //场所类型 + async loadplaceType() { + const url = '/sys/dict/data/dictlist'; + let params = { + dictType: "nine_small_places" + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.placeTypeList = data; + } else { + this.$message.error(msg); + } + }, + //组织类型 + async orgtype() { + const url = '/sys/dict/data/dictTree'; + let params = { + dictType: "org_type" + }; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + console.log(data, "dsfl;jsdkl;"); + this.orgTypeList = data + + } else { + this.$message.error(msg); + } + }, //分页查询 handleSizeChange(val) { this.pageSize = val; @@ -416,7 +465,7 @@ data: { pageSize, pageNo, - ...formData, + ...this.formData, }, responseType: "blob", }) @@ -473,10 +522,11 @@ let params = { page:this.pageNo, limit:this.pageSize, - shelveOnTimeFrom: this.formData.shelveOnTimeFrom, - redeemOrgId: this.formData.redeemOrgId, - classKey: this.formData.classKey, - shelveOnTimeTo: this.formData.shelveOnTimeTo + ...this.formData + // shelveOnTimeFrom: this.formData.shelveOnTimeFrom, + // redeemOrgId: this.formData.redeemOrgId, + // classKey: this.formData.classKey, + // shelveOnTimeTo: this.formData.shelveOnTimeTo } const { data, code, msg } = await requestPost(url, params) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index dc1be3b58..caee50d3d 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -1787,18 +1787,18 @@ this.getStatistics() } ], // 在中心添加显示总数的文本 - graphic: { - type: 'text', - left: 'center', - top: '45%', - style: { - text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 - textAlign: 'center', - fill: '#333', - fontSize: 24, - fontWeight: 'bold' - } - } + // graphic: { + // type: 'text', + // left: 'center', + // top: '45%', + // style: { + // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 + // textAlign: 'center', + // fill: '#333', + // fontSize: 24, + // fontWeight: 'bold' + // } + // } }; myChart.setOption(option); @@ -1870,18 +1870,18 @@ this.getStatistics() } ], // 在中心添加显示总数的文本 - graphic: { - type: 'text', - left: 'center', - top: '45%', - style: { - text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 - textAlign: 'center', - fill: '#333', - fontSize: 24, - fontWeight: 'bold' - } - } + // graphic: { + // type: 'text', + // left: 'center', + // top: '45%', + // style: { + // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 + // textAlign: 'center', + // fill: '#333', + // fontSize: 24, + // fontWeight: 'bold' + // } + // } }; myChart.setOption(option); @@ -1954,18 +1954,18 @@ this.getStatistics() } ], // 在中心添加显示总数的文本 - graphic: { - type: 'text', - left: 'center', - top: '45%', - style: { - text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 - textAlign: 'center', - fill: '#333', - fontSize: 24, - fontWeight: 'bold' - } - } + // graphic: { + // type: 'text', + // left: 'center', + // top: '45%', + // style: { + // text: `${data.reduce((total, item) => total + item.count, 0)}`, // 动态计算总数 + // textAlign: 'center', + // fill: '#333', + // fontSize: 24, + // fontWeight: 'bold' + // } + // } }; myChart.setOption(option); diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue index b8a5b5cf4..b3f50c563 100644 --- a/src/views/modules/volunteer/activityArchive/add.vue +++ b/src/views/modules/volunteer/activityArchive/add.vue @@ -163,15 +163,19 @@ + + + 米以内 + + + + - - -
- - - - - - - - - - - -
@@ -209,20 +201,6 @@
- - - - - - - - - - - - - - @@ -273,6 +251,8 @@ export default { btnDisable: false, searchValue:"", formData: { + signInRadius:200, + auditVolunteerFlag:1, projectId:"", projectTitle:"", district:"", diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue index c76937208..b7a293ae4 100644 --- a/src/views/modules/volunteer/activityArchive/realselect.vue +++ b/src/views/modules/volunteer/activityArchive/realselect.vue @@ -54,6 +54,7 @@ --> + {{ formData.linkman }} @@ -96,6 +97,14 @@ + + 米以内 + + + +
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue index 5fab32b58..6170c519e 100644 --- a/src/views/modules/volunteer/activityArchive/select.vue +++ b/src/views/modules/volunteer/activityArchive/select.vue @@ -162,6 +162,14 @@ + + 米以内 + + + +

系统高级配置

-
+

12345政务热线

-
-
-

{{ item.advancedName }}

-

{{ item.remark }} +
+
+
{{ item.advancedName }}
+
{{ item.remark }} -

+