diff --git a/packages/party/AppPartyScore/AppPartyScore.vue b/packages/party/AppPartyScore/AppPartyScore.vue new file mode 100644 index 00000000..cddd8663 --- /dev/null +++ b/packages/party/AppPartyScore/AppPartyScore.vue @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/packages/party/AppPartyScore/psDetail.vue b/packages/party/AppPartyScore/psDetail.vue new file mode 100644 index 00000000..43ab4d33 --- /dev/null +++ b/packages/party/AppPartyScore/psDetail.vue @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/party/AppPartyScore/psList.vue b/packages/party/AppPartyScore/psList.vue new file mode 100644 index 00000000..c26dd67b --- /dev/null +++ b/packages/party/AppPartyScore/psList.vue @@ -0,0 +1,103 @@ + + + + + + + + + 家庭成员 + 详情 + + + + + + + + + + + + + + + diff --git a/packages/party/partyMember/AppPartyMember.vue b/packages/party/partyMember/AppPartyMember.vue index d241cc7a..b3c7ee17 100644 --- a/packages/party/partyMember/AppPartyMember.vue +++ b/packages/party/partyMember/AppPartyMember.vue @@ -9,11 +9,13 @@ import List from './components/List' import Add from './components/Add' import Detail from './components/Detail' import {mapState} from "vuex"; +import NeighbourSetting from "./components/neighbourSetting"; export default { name: 'AppPartyMember', label: '党员管理', components: { + NeighbourSetting, Add, List, Detail @@ -32,6 +34,8 @@ export default { component() { if (this.$route.hash == "#add") { return Add + } else if (this.$route.hash == "#ns") { + return NeighbourSetting } else if (this.$route.query.id) { return Detail } else return List diff --git a/packages/party/partyMember/components/Add.vue b/packages/party/partyMember/components/Add.vue index 40bfad70..f5e145e3 100644 --- a/packages/party/partyMember/components/Add.vue +++ b/packages/party/partyMember/components/Add.vue @@ -2,12 +2,7 @@ - + - + + + + + + + + + + + + { if (res?.data) { this.info = res.data - if(this.info.birthday) { + if (this.info.birthday) { this.info.birthday = this.info.birthday.substring(0, 10) } } diff --git a/packages/party/partyMember/components/List.vue b/packages/party/partyMember/components/List.vue index 1a8e6c42..41867c96 100644 --- a/packages/party/partyMember/components/List.vue +++ b/packages/party/partyMember/components/List.vue @@ -114,12 +114,13 @@ :size.sync="search.size" @handleSelectionChange="handleSelectionChange" @getList="getList"> - + 详情 编辑 删除 + 四邻设置 @@ -204,6 +205,9 @@ export default { this.getList() }, methods: { + showNeighbourSetting(id) { + this.$router.push({query: {id}, hash: "#ns"}) + }, onTreeChange(e) { this.$emit("update:selected", e) this.getList(e.id) diff --git a/packages/party/partyMember/components/neighbourSetting.vue b/packages/party/partyMember/components/neighbourSetting.vue new file mode 100644 index 00000000..8054a96d --- /dev/null +++ b/packages/party/partyMember/components/neighbourSetting.vue @@ -0,0 +1,219 @@ + + + + + + + + 添加 + 删除 + + + + + + + search.ids=v.map(e=>e.pfrId).toString()"> + + + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + 清空 + + + + + 删除 + + + + + + + + + + + + diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue index 12b306bb..12c806a2 100644 --- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue +++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue @@ -56,12 +56,13 @@ - + - - + + {{ val.dictName }} @@ -148,11 +149,9 @@ - {{ m.fieldName }}{{ m.fieldNameSuffix }}:{{ - m.dictionaryCode - ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue - }} + {{ m.fieldName }} + + :{{m.dictionaryCode ? dict.getLabel(m.dictionaryCode, m.fieldValue) : m.fieldValue }} @@ -237,28 +236,15 @@ - - - - - + @@ -404,7 +390,7 @@ export default { return e.dictionaryCode && this.dict.getLabel(e.dictionaryCode, val) }, getFieldValue(e) { - return e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue + return !!e.dictionaryCode ? this.dict.getLabel(e.dictionaryCode, e.fieldValue) : e.fieldValue }, getAreaName(e) { return e.areaValue @@ -949,6 +935,8 @@ export default { .desc_div { flex: 1; + min-width: 0; + margin-bottom: 8px; display: flex; flex-wrap: wrap; diff --git a/project/xiushan/components/personCreditReport.vue b/project/xiushan/components/personCreditReport.vue index 3f0782a6..ffeffa59 100644 --- a/project/xiushan/components/personCreditReport.vue +++ b/project/xiushan/components/personCreditReport.vue @@ -92,13 +92,13 @@ export default { {prop: 'landOutflowName', label: '土地流出方'}, {prop: 'landArea', align: 'center', label: '土地面积/㎡'}, {prop: 'landUndertakeName', align: 'center', label: '土地承接方'}, - {prop: 'circulateType', align: 'center', label: '流转形式'}, + {prop: 'circulateType', align: 'center', label: '流转形式', dict: "landCirculateType"}, {prop: 'startDate', align: 'center', label: '开始日期'}, ], } }, created() { - this.dict.load("enterpriseType") + this.dict.load("enterpriseType", "landCirculateType") }, methods: { getPCR() { @@ -116,7 +116,7 @@ export default { }) }, handleShow() { - this.getPCR().then(() => this.dialog = true) + this.getPCR().then(() => this.dialog = true).catch(() => this.dialog = true) } }, props: {