diff --git a/src/assets/images/home/gridGreen.png b/src/assets/images/home/gridGreen.png
index bd0089d35..08762a914 100644
Binary files a/src/assets/images/home/gridGreen.png and b/src/assets/images/home/gridGreen.png differ
diff --git a/src/assets/images/home/gridRed.png b/src/assets/images/home/gridRed.png
index 86bff43c6..32a731d58 100644
Binary files a/src/assets/images/home/gridRed.png and b/src/assets/images/home/gridRed.png differ
diff --git a/src/assets/images/home/gridYellow.png b/src/assets/images/home/gridYellow.png
index 0e8b94604..48e6e2b23 100644
Binary files a/src/assets/images/home/gridYellow.png and b/src/assets/images/home/gridYellow.png differ
diff --git a/src/assets/scss/pages/resiAdd.scss b/src/assets/scss/pages/resiAdd.scss
index 5b97e2246..a93875839 100644
--- a/src/assets/scss/pages/resiAdd.scss
+++ b/src/assets/scss/pages/resiAdd.scss
@@ -52,18 +52,18 @@ h5 {
color:#ff5107 ;
}
}
-.font-color-blue{
- ::v-deep .el-form-item__label{
- color:#3876f2;
- position: relative;
- &::before{
- content: '*';
- position: absolute;
- top: 0px;
- left: 16px;
- }
- }
-}
+// .font-color-blue{
+// ::v-deep .el-form-item__label{
+// color:#3876f2;
+// position: relative;
+// &::before{
+// content: '*';
+// position: absolute;
+// top: 0px;
+// left: 16px;
+// }
+// }
+// }
.font-color-blue2{
::v-deep .el-form-item__label{
&::before{
diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue
index 2032ddd83..24f2c1332 100644
--- a/src/components/GridTree/nodeWrap.vue
+++ b/src/components/GridTree/nodeWrap.vue
@@ -263,16 +263,19 @@ export default {
@include lastLevel;
background-image: url(~@/assets/images/home/gridGreen.png);
background-repeat: no-repeat;
+ background-size: 100% 100%;
}
.dyzxhRed {
@include lastLevel;
background-image: url(~@/assets/images/home/gridRed.png);
background-repeat: no-repeat;
+ background-size: 100% 100%;
}
.dyzxhYellow {
@include lastLevel;
background-image: url(~@/assets/images/home/gridYellow.png);
background-repeat: no-repeat;
+ background-size: 100% 100%;
}
.lxjt {
@include spanLevel;
diff --git a/src/utils/desensitization.js b/src/utils/desensitization.js
index acc5b952d..aa619ae1a 100644
--- a/src/utils/desensitization.js
+++ b/src/utils/desensitization.js
@@ -1,6 +1,6 @@
export default function desensitizeSubstring(inputString, start, end) {
- if (!inputString) {
- return ''
+ if (!inputString||inputString.length<11) {
+ return '--'
}
if (end >= inputString.length) {
end = inputString.length - 1
diff --git a/src/views/components/addResi.vue b/src/views/components/addResi.vue
index d51d3f3d4..3ca535131 100644
--- a/src/views/components/addResi.vue
+++ b/src/views/components/addResi.vue
@@ -162,7 +162,6 @@
-
+ class="list_item_width_1" @change="handelChangeSelsect(itemj.id,itemk.formName)">
@@ -206,6 +206,15 @@ export default {
mounted() {
},
methods: {
+ handelChangeSelsect(pname,cname){
+ if(pname === 'specialSupportDto' && cname === 'specialSupportType'){
+ if(this.form.specialSupportDto.specialSupportType === '2'){
+ this.formList[0].children[4].check = 'sixFont'
+ }else{
+ this.formList[0].children[4].check = null;
+ }
+ }
+ },
checkNumberInput(itemj, itemk) {
if (this.form[itemj][itemk]) {
if (isNaN(this.form[itemj][itemk])) {
@@ -256,7 +265,20 @@ export default {
this.$emit('hideExpand', this.formType)
},
handleClickSUbmitExpand() {
- this.$emit('submitExpand', this.form, this.formType)
+ console.log(this.formList);
+ console.log(this.form);
+ this.formList.forEach((group) => {
+ group.children.forEach((item) => {
+ if (item.check && !this.form[group.id][item.formName]) {
+ this.$message.error(`${item.label}不能为空`);
+ throw new Error(`${item.label}不能为空`);
+ }
+ });
+ });
+ if (this.formType === 'add') {
+ this.form.id = this.form.partyOrgId;
+ }
+ // this.$emit('submitExpand', this.form, this.formType)
},
handlePartyOrgCascadarChange(selectedNode) {
this.form.parymemberInfoDto.partyOrgId = selectedNode[selectedNode.length - 1];
diff --git a/src/views/dataBoard/overview/components/ResourceScheduling.vue b/src/views/dataBoard/overview/components/ResourceScheduling.vue
index 070b97bfb..f8390f357 100644
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@@ -1,74 +1,73 @@
-
+
-
+
-
+
-
+ max-height="600px">
+
{{
- (row.personnelType ?
- data[0].children.filter(item => item.value === row.personnelType)[0].label : '') || peopleTypeLabel
+ (row.personnelType ?
+ data[0].children.filter(item => item.value === row.personnelType)[0].label : '') ||
+ peopleTypeLabel
}}
-
-
-
-
+
+
+
+
{{ $sensitive(scope.row.mobile, 3, 7) }}
+
+
+
+ {{ $sensitive(scope.row.contactMobile, 3, 7) }}
+
+
+
-
-
-
+
+
+
+
{{ $sensitive(scope.row.principalPhone, 3, 7) }}
-
+
- {{this.$store.state.user.agencyName}}
+ {{this.$store.state.user.agencyName}}
-
-
+
+
{{ $sensitive(scope.row.mobile, 3, 7) }}
@@ -76,27 +75,22 @@
-
+
处理
查看
-
+
-
+
diff --git a/src/views/dataBoard/renfang/house/list.vue b/src/views/dataBoard/renfang/house/list.vue
index 07579979b..b0b2502ca 100644
--- a/src/views/dataBoard/renfang/house/list.vue
+++ b/src/views/dataBoard/renfang/house/list.vue
@@ -178,7 +178,7 @@ export default {
// this.displayedHouseId = item.houseId;
// this.$router.push(`/homeDetails/index?id=${item.neighborHoodId}&buildingId=${item.buildingId}&unitId=${item.unitNumKey}`)
console.log(item);
- this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }`)
+ this.$router.push(`/dataBoard/overview/familyPortrait/?name=${item.neighborHoodName}-${item.houseName}&buId=${item.buildingId}&type=renfang&orgId=${this.org_id}&type_name=${this.typeName}&name2=${ this.tableTitle }&houseId=${item.houseId}`)
},
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index a4dd01b13..00b7c09cd 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1655,6 +1655,16 @@ export default {
// 添加人员
async submitPeoDo () {
+ const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]);
+
+ // 用于存储提取结果的 Set 对象
+ const result = new Set();
+
+ // 调用递归函数提取 level 与 agencyId 组合成的字符串
+ this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result);
+
+ // 将 Set 对象转换为数组
+ const manageScopeArray = Array.from(result);
const url = "/gov/org/staff/addstaffv2";
const {
peoForm: { orgType },
@@ -1674,7 +1684,7 @@ export default {
: orgType == "dept"
? this.currentDepartmentId
: this.currentGridOrgId,
- manageScopes:this.peoForm.manageScopes
+ manageScopes:manageScopeArray
};
const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 9ee821e20..e5b8a9d58 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -48,7 +48,7 @@
-
-
+
item.staffId === val)[0].mobile
+ this.formData.contactMobile = this.dicts.stafflist.filter(item=>item.staffId === val)[0].mobile;
+ this.formData.contact = val;
}else{
- this.formData.contactMobile = ''
+ this.formData.contactMobile = '';
+ this.formData.contact = '';
}
},
getStafflist() {
@@ -510,7 +511,7 @@ export default {
unitName: "",
serviceMatterList: [],
type: "",
- contact: "",
+ principalId: "",
contactMobile: "",
memberCount: 0,
remark: "", //备注【最大500字】
@@ -543,7 +544,7 @@ export default {
],
type: [{ required: true, message: "分类不能为空", trigger: "blur" }],
- contact: [
+ principalId: [
{ required: true, message: "联系人不能为空", trigger: "blur" },
],
contactMobile: [
diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue
index 99c1fdca6..bd2bdf122 100644
--- a/src/views/modules/communityService/gxxq/addForm.vue
+++ b/src/views/modules/communityService/gxxq/addForm.vue
@@ -339,7 +339,7 @@ export default {
{ max: 1000, message: "不能超出1000个字符", trigger: "blur" },
],
resiSearchTagId: [
- { required: false, message: "指派人员不能为空", trigger: "bulr" },
+ { required: true, message: "指派人员不能为空", trigger: "bulr" },
],
categoryCode: [
{ required: true, message: "需求分类不能为空", trigger: "bulr" },
@@ -383,13 +383,6 @@ export default {
this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
}
},
- "formData.assignFlag"(newValue) {
- if (newValue === 1) {
- this.dataRule.resiSearchTagId[0].required = true;
- } else {
- this.dataRule.resiSearchTagId[0].required = false;
- }
- },
},
components: { labelForm },
created() {},
@@ -431,7 +424,7 @@ export default {
this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
- this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
+ this.newFormData.noticeApproches = data.assignInfo.noticeApproches || [];
for (let i in data.assignInfo.serviceScopeList) {
this.newFormData.serviceScopeList.push(
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 3adc2d98b..844f56cc4 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -503,7 +503,16 @@ export default {
this.$router.push({
path: obj[item.category],
});
- }
+ } else if(item.msgType == "sys_version_upgrade_publish"){
+ let { targetId } = item
+ this.$router.push({ path: `notice-version`, query: { version_id: targetId } });
+ this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+ if (item.name === "notice-version") {
+ return { ...item };
+ }
+ return item;
+ });
+ }
this.getNoticeData()
},
diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue
index fcbd35342..133ec9172 100644
--- a/src/views/modules/portrayal/jumin/index.vue
+++ b/src/views/modules/portrayal/jumin/index.vue
@@ -26,7 +26,7 @@
>
{{ item.name }}
-
人房关系:
-
+ 人房关系:
+
{{
item.resiHouseRel != null
? item.resiHouseRel === 0
@@ -264,7 +264,7 @@
-
人户状况:
+
人户状况:
{{
householdSituationText(indexK)
}}
@@ -276,7 +276,7 @@
-
与户主关系:
+
与户主关系:
{{
houseHolderRelText(indexK)
}}
@@ -296,7 +296,7 @@
-
就业状态:
+
就业状态:
{{ careerStatusText() }}