elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

111

master
jiangyy 3 years ago
parent
4f3999ddb4
commit
b693d443a7
4 changed files with 161 additions and 103 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. BIN
      src/assets/img/icon-del.png
  2. 9
      src/views/modules/communityService/policy/addPolicy.vue
  3. 87
      src/views/modules/communityService/policy/personListItem.vue
  4. 168
      src/views/modules/communityService/policy/rule.vue

BIN
src/assets/img/icon-del.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

9
src/views/modules/communityService/policy/addPolicy.vue
View File

@ -289,6 +289,10 @@ export default {
this.formData = data
if (data.attachmentList) {
this.fileList = data.attachmentList
}
this.$nextTick(() => {
data.ruleList.forEach((element, index) => {
@ -375,7 +379,7 @@ export default {
// }
let refObj = this.$refs['ref_rule' + index][0]
refObj.getRule()
refObj.getRule(true, true, true)
if (refObj.okflag) {
oneRule.resiRuleList = refObj.resiRuleList
oneRule.resiRuleList.forEach(element => {
@ -464,6 +468,7 @@ export default {
async addFuwu () {
console.log(this.formData)
this.formData.attachmentList = [...this.fileList]
let url = '/heart/policy/add'
if (this.formType === 'add') {
@ -663,7 +668,7 @@ export default {
@import "@/assets/scss/modules/management/form-main.scss";
.btn-add-rule {
margin-left: 70px;
margin-left: 150px;
display: flex;
justify-content: flex-start;
margin-bottom: 20px;

87
src/views/modules/communityService/policy/personListItem.vue
View File

@ -7,20 +7,15 @@
ref="ref_searchform"
:label-width="'90px'">
<div>
<el-form-item label="所属网格"
<el-form-item label="所属组织"
prop="orgId">
<el-select v-model.trim="formData.orgId"
placeholder="请选择"
size="small"
clearable
class="item_width_2"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-cascader class="customer_cascader"
ref="myCascader"
v-model="agencyIdArray"
:options="orgOptions"
:props="orgOptionProps"
:show-all-levels="false"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
@ -226,13 +221,16 @@ export default {
],
formData: {
gridId: '',
agencyId: '',
orgId: '',
orgType: '',
ruleId: '',
ruleList: {},
name: '',
mobile: '',
idCard: '',
remark: '',
reason: '',
neighborHoodId: '',
buildingId: '',
unitId: '',
@ -243,9 +241,18 @@ export default {
optionsH: [],
optionsD: [],
optionsG: [],
orgOptions: [],
agencyIdArray: [],
tableData: [],
orgOptionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
}
}
},
components: {
@ -259,7 +266,7 @@ export default {
},
async mounted () {
this.getGridList()
this.getOrgTreeList()
await this.loadTable()
@ -296,14 +303,38 @@ export default {
this.tableLoading = false
},
handleChangeGrid (val) {
console.log('val', val)
handleChangeAgency (val) {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) {
if (obj.level === 'grid') {
this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.orgType = 'grid'
this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.agencyId = ''
} else {
this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.orgType = 'agency'
this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
this.formData.gridId = ''
}
} else {
this.formData.orgId = ''
this.formData.orgType = ''
this.formData.agencyId = ''
this.formData.gridId = ''
}
this.formData.neighborHoodId = ''
this.formData.buildingId = ''
this.formData.unitId = ''
this.formData.houseId = ''
this.getValiheList()
},
handleChangeV (val) {
console.log('val', val)
this.formData.buildingId = ''
@ -324,16 +355,17 @@ export default {
this.formData.houseId = ''
this.getHouseList()
},
getGridList () {
getOrgTreeList () {
const { user } = this.$store.state
this.$http
.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
.post('/gov/org/customeragency/agencygridtree', {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data
console.log('获取组织树成功', res.data)
this.orgOptions = []
this.orgOptions.push(res.data)
}
})
.catch(() => {
@ -343,7 +375,7 @@ export default {
getValiheList () {
const { user } = this.$store.state
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', { orgId: this.formData.GRID_ID, agencyId: user.agencyId })
.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: this.formData.agencyId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
@ -405,15 +437,16 @@ export default {
//重置搜索条件
resetSearch () {
this.agencyIdArray = []
this.formData = {
orgId: '',
orgType: '',
ruleId: '',
ruleList: {},
name: '',
mobile: '',
idCard: '',
remark: '',
reason: '',
neighborHoodId: '',
buildingId: '',
unitId: '',

168
src/views/modules/communityService/policy/rule.vue
View File

@ -107,10 +107,9 @@
</el-option>
</el-select>
<el-button icon="el-icon-remove-outline"
circle
@click="delPerson(personIndex)"
type="danger"></el-button>
<img class="img_del"
src="@/assets/img/icon-del.png"
@click="delPerson(personIndex)">
</div>
@ -198,10 +197,13 @@
</el-option>
</el-select>
<el-button icon="el-icon-remove-outline"
<img class="img_del"
src="@/assets/img/icon-del.png"
@click="delHouse(houseIndex)">
<!-- <el-button icon="el-icon-remove-outline"
circle
@click="delHouse(houseIndex)"
type="danger"></el-button>
type="danger"></el-button> -->
</div>
@ -288,10 +290,9 @@
</el-option>
</el-select>
<el-button icon="el-icon-remove-outline"
circle
@click="delStatic(staticIndex)"
type="danger"></el-button>
<img class="img_del"
src="@/assets/img/icon-del.png"
@click="delStatic(staticIndex)">
</div>
</div>
@ -502,10 +503,10 @@ export default {
},
getRule () {
getRule (valPerson, valHouse, valStatic) {
this.okflag = false
let messageObj = this.validateRule()
let messageObj = this.validateRule(valPerson, valHouse, valStatic)
// console.log('resiRuleList', this.resiRuleList)
// console.log('houseRuleList', this.houseRuleList)
@ -533,87 +534,99 @@ export default {
},
validateRule () {
validateRule (valPerson, valHouse, valStatic) {
let message = ''
this.resiRuleList.forEach((item, index) => {
if (index === this.resiRuleList.length - 1) {
if (item.itemGroupId === '' ||
item.itemId === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '人员信息不完整，请填写完整！'
return message
}
} else {
if (item.nextLogicalRel === '' ||
item.itemGroupId === '' ||
item.itemId === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '人员信息不完整，请填写完整！'
return message
if (valPerson) {
this.resiRuleList.forEach((item, index) => {
if (index === this.resiRuleList.length - 1) {
if (item.itemGroupId === '' ||
item.itemId === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '人员信息不完整，请填写完整！'
return message
}
} else {
if (item.nextLogicalRel === '' ||
item.itemGroupId === '' ||
item.itemId === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '人员信息不完整，请填写完整！'
return message
}
}
}
});
this.houseRuleList.forEach((item, index) => {
});
}
if (index === this.houseRuleList.length - 1) {
if (valHouse) {
if (item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '房屋信息不完整，请填写完整！'
return message
}
} else {
if (item.nextLogicalRel === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
this.houseRuleList.forEach((item, index) => {
message = '房屋信息不完整，请填写完整！'
return message
}
}
});
if (index === this.houseRuleList.length - 1) {
this.statRuleList.forEach((item, index) => {
if (index === this.statRuleList.length - 1) {
if (item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
if (item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '统计信息不完整，请填写完整！'
return message
message = '房屋信息不完整，请填写完整！'
return message
}
} else {
if (item.nextLogicalRel === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '房屋信息不完整，请填写完整！'
return message
}
}
} else {
if (item.nextLogicalRel === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
});
}
message = '统计信息不完整，请填写完整！'
return message
if (valStatic) {
this.statRuleList.forEach((item, index) => {
if (index === this.statRuleList.length - 1) {
if (item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '统计信息不完整，请填写完整！'
return message
}
} else {
if (item.nextLogicalRel === '' ||
item.queryType === '' ||
item.colKey === '' ||
item.colVal === '') {
message = '统计信息不完整，请填写完整！'
return message
}
}
}
});
});
}
return message
},
handlePreview () {
this.getRule()
if (!this.personChecked && !this.houseChecked && !this.staticChecked) {
this.$message.info('请勾选要预览的规则')
return false
}
this.getRule(this.personChecked, this.houseChecked, this.staticChecked)
if (!this.okflag) {
return false
}
@ -1148,4 +1161,11 @@ export default {
/deep/.el-checkbox:last-of-type {
margin-right: 10px;
}
.img_del {
width: 25px;
height: 25px;
margin-top: 6px;
cursor: pointer;
}
</style>

Write Preview
Loading…
Cancel
Save