elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

活动签到范围，人员组织，系统高级配置

chengyang
是小王呀\24601 9 months ago
parent
c9144876f1
commit
c748187b43
7 changed files with 187 additions and 162 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      src/views/modules/base/orgUnitManger/add.vue
  2. 176
      src/views/modules/base/orgUnitManger/index.vue
  3. 72
      src/views/modules/home/index.vue
  4. 42
      src/views/modules/volunteer/activityArchive/add.vue
  5. 9
      src/views/modules/volunteer/activityArchive/realselect.vue
  6. 10
      src/views/modules/volunteer/activityArchive/select.vue
  7. 12
      src/views/modules/workSys/sysConfigure/index.vue

28
src/views/modules/base/orgUnitManger/add.vue
View File

@ -83,8 +83,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="重点单位类型" prop="keyUnitFlag" label-width="120px">
<el-select class="u-item-width-normal" v-model="formData.keyUnitFlag" placeholder="请选择"
<el-form-item label="重点单位类型" prop="keyUnitType" label-width="120px">
<el-select class="u-item-width-normal" v-model="formData.keyUnitType" placeholder="请选择"
clearable>
<el-option v-for="item in placetList" :key="item.value" :label="item.label"
:value="item.value">
@ -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()
},
//增加

176
src/views/modules/base/orgUnitManger/index.vue
View File

@ -4,51 +4,51 @@
<div class="m-search" style="flex-direction: column">
<section :class="boxHeight ? 'm-form-box-height' : 'm-form-box-height-auto'">
<el-form :inline="true" class="communityHeight" ref="ref_searchform" :label-width="'110px'">
<el-form-item label="所属区划" prop="ownerName">
<el-form-item label="所属区划" prop="agencyId">
<el-cascader class="u-item-width-normal" ref="myCascader" clearable size="small"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="组织类型" prop="ownerPhone">
<el-select class="u-item-width-normal" v-model="formData.type" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable" :value="item.value">
<el-option v-for="item in orgTypeList" :key="item.value" :label="item.lable" :value="item.value">
</el-option>
</el-select>
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择" clearable>
<!-- <el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable" :value="item.value">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
<el-form-item label="企业性质" prop="ownerPhone">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable" :value="item.value">
<el-form-item label="企业性质" prop="property">
<el-select class="u-item-width-normal" v-model="formData.property" placeholder="请选择" clearable>
<el-option v-for="item in companyList" :key="item.value" :label="item.lable" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="组织名称" prop="ownerPhone">
<el-input v-model.trim="ownerPhone" class="u-item-width-normal" size="small" clearable
<el-form-item label="组织名称" prop="name">
<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="ownerPhone" :label-width="'150px'">
<el-input v-model.trim="ownerPhone" class="u-item-width-normal" size="small" clearable
<el-form-item label="统一社会信用代码" prop="socialCreditCode" :label-width="'150px'">
<el-input v-model.trim="formData.socialCreditCode" class="u-item-width-normal" size="small" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="法人姓名" prop="ownerPhone">
<el-input v-model.trim="ownerPhone" class="u-item-width-normal" size="small" clearable
<el-form-item label="法人姓名" prop="legalUserName">
<el-input v-model.trim="formData.legalUserName" class="u-item-width-normal" size="small" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="是否九小场所" prop="ownerPhone">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable" :value="item.value">
<el-form-item label="是否九小场所" prop="ninePlaceFlag">
<el-select class="u-item-width-normal" v-model="formData.ninePlaceFlag" placeholder="请选择" clearable>
<el-option v-for="item in SmallPlaces" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否重点单位" prop="ownerPhone">
<el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable" :value="item.value">
<el-form-item label="是否重点单位" prop="keyUnitFlag">
<el-select class="u-item-width-normal" v-model="formData.keyUnitFlag" placeholder="请选择" clearable>
<el-option v-for="item in keyUnitList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@ -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)

72
src/views/modules/home/index.vue
View File

@ -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);

42
src/views/modules/volunteer/activityArchive/add.vue
View File

@ -163,15 +163,19 @@
</el-col>
<el-col :span="12">
<!-- <el-col :span="12"> -->
<el-form-item v-if="formType !== 'records'" label="签到范围" style="display: block" prop="peopleCount">
<el-input-number v-model.trim="formData.signInRadius" :min="0" :max="5000"
label="描述文字" type="number"></el-input-number> 米以内
</el-form-item>
<el-form-item v-if="formType !== 'records'" label="报名须审核" style="display: block" prop="peopleCount">
<el-switch v-model="formData.auditVolunteerFlag" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
<el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
<el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
<!-- </el-col> -->
<!-- <el-form-item label="活动积分" prop="integral" >
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item> -->
<!-- <el-col :span="12"> -->
<el-form-item label="照片" prop="activityImgs" required>
<div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl" :accept="'.jpg,.jpeg,.bmp,.git,.png'"
@ -180,20 +184,8 @@
:on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
<i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i> </el-upload>
</div>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="24"> -->
<!-- </el-col> -->
</el-col>
<el-col :span="12">
<div v-if="formData.sponsors" style="display: flex;">
<div style="">
@ -209,20 +201,6 @@
</div>
</el-col>
</el-row>
</el-form>
<!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px;"></i> -->
@ -273,6 +251,8 @@ export default {
btnDisable: false,
searchValue:"",
formData: {
signInRadius:200,
auditVolunteerFlag:1,
projectId:"",
projectTitle:"",
district:"",

9
src/views/modules/volunteer/activityArchive/realselect.vue
View File

@ -54,6 +54,7 @@
<template slot-scope="scope">{{ scope.row.strTime }}至{{ scope.row.endTime}}
</template>
</el-form-item> -->
<el-form-item label=" 联系人" prop="linkman" required>
{{ formData.linkman }}
</el-form-item>
@ -96,6 +97,14 @@
<el-switch disabled=fasle v-model="formData.online" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
<el-form-item v-if="formType !== 'records'" label="签到范围" style="display: block" prop="signInRadius">
<el-input-number disabled=fasle v-model.trim="formData.signInRadius" :min="0" :max="5000"
label="描述文字" type="number"></el-input-number> 米以内
</el-form-item>
<el-form-item v-if="formType !== 'records'" label="报名须审核" style="display: block" prop="auditVolunteerFlag">
<el-switch disabled=fasle v-model="formData.auditVolunteerFlag" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
</div>
<div v-if="formData.sponsors" v-for="(item, index) in formData.sponsors" :label="index" :key="item.name"
:prop=index>

10
src/views/modules/volunteer/activityArchive/select.vue
View File

@ -162,6 +162,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="formType !== 'records'" label="签到范围" style="display: block" prop="peopleCount">
<el-input-number v-model.trim="formData.signInRadius" :min="0" :max="5000"
label="描述文字" type="number"></el-input-number> 米以内
</el-form-item>
<el-form-item v-if="formType !== 'records'" label="报名须审核" style="display: block" prop="peopleCount">
<el-switch v-model="formData.auditVolunteerFlag" :active-value='1' :inactive-value='0'
></el-switch>
</el-form-item>
<!-- <el-col :span="12"> -->
<el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
<el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
@ -271,6 +279,8 @@ export default {
btnDisable: false,
searchValue: "",
formData: {
signInRadius:200,
auditVolunteerFlag:1,
typeName:"",
serviceLevel: '',
projectTitle: "",

12
src/views/modules/workSys/sysConfigure/index.vue
View File

@ -5,17 +5,17 @@
<div class="m-table">
<h2>系统高级配置</h2>
<div style="width: 100%; display: flex; align-items: center;">
<div class="" style="width: 100%; display: flex; flex-direction: column">
<div class="" style="width: 100%; display: flex; flex-direction: column;margin-left: 30px;">
<h3>12345政务热线</h3>
<div class="m-table"
style=" width: 100%; display: flex; flex-direction:column;align-items: center;justify-content: space-between;">
<div style=" border-bottom: 1px dotted #000;width: 100%; display: flex; flex-direction: row;align-items: center;justify-content: space-between;">
<div style="display: flex; flex-direction: column;" v-for="(item,index) in sysAdvancedList ">
<h3>{{ item.advancedName }}</h3>
<h3 v-if="item.remark">{{ item.remark }}
<div v-for="(item,index) in sysAdvancedList " style=" border-bottom: 1px dotted #000;width: 100%; display: flex; flex-direction: row;align-items: center;justify-content: space-between;">
<div style="display: flex; flex-direction: column;" >
<div>{{ item.advancedName }}</div>
<div v-if="item.remark">{{ item.remark }}
<!-- <el-input-number v-model="num" @change="handleChange" style="width: 150px;"
:min="1" :max="10" label="描述文字"></el-input-number> -->
</h3>
</div>
</div>
<div>
<el-switch :v-model="item.openFlag" active-color="#13ce66" inactive-color="#eaecf0">

Write Preview
Loading…
Cancel
Save