diff --git a/src/views/dataBoard/sida/zy/placeResList.vue b/src/views/dataBoard/sida/zy/placeResList.vue
index 9cbab8ef3..dbb076e2e 100644
--- a/src/views/dataBoard/sida/zy/placeResList.vue
+++ b/src/views/dataBoard/sida/zy/placeResList.vue
@@ -254,7 +254,7 @@ export default {
width: '10%'
}
]),
- (this.header = ['序号', '场所名称', '场所类型', '场所规模', '负责人', '手机号', '最新检查时间', '最新检查结果', '故障次数', '操作']);
+ (this.header = ['序号', '场所名称', '场所类型', '场所规模', '负责人', '联系电话', '最新检查时间', '最新检查结果', '故障次数', '操作']);
this.list = data.map((item, index) => {
return [
index + 1,
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 8b24bca15..b37725b32 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -504,7 +504,7 @@ export default {
xcxmLoading: false,
agencyObj: {}, //树所选的组织对象
-
+ treeObj:{},
tableData: [],
validTableDataNum: 0, //有效的数据数量,即有权限操作的数据数量
selection: [],
@@ -636,7 +636,7 @@ export default {
});
},
async loadTable(fromTree, treeObj) {
- console.log(111, treeObj);
+ this.treeObj = {... treeObj}
// 是否显示补全一房一码信息按钮
this.roleList = localStorage.getItem("roleList");
let conditions = [];
@@ -1337,11 +1337,11 @@ export default {
handleSizeChange(val) {
this.pageSize = val;
this.pageNo = 1;
- this.loadTable();
+ this.loadTable(this.treeObj);
},
handleCurrentChange(val) {
this.pageNo = val;
- this.loadTable();
+ this.loadTable(this.treeObj);
},
// 开启加载动画
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 5522eee4b..fcbf35091 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -242,6 +242,7 @@
:disabled="formType === 'detail'"
:rules="newDataRule"
ref="ref_policy_form1"
+ v-if="newFormData"
>
{
// this.btnDisable = false;
@@ -763,7 +772,7 @@ export default {
// this.addFuwu();
// }
// });
- this.addFuwu();
+ await this.addFuwu();
},
getLastItem(list, vals, key) {
let LIST = list || [];
@@ -771,7 +780,6 @@ export default {
// console.log(item[key]);
for (let i of vals) {
if (item[key] === i) {
- console.log(item[key]);
this.sarr.push(item);
} else if (item["objectType"] == "district") {
this.getLastItem(item.children, vals, key);
@@ -814,6 +822,7 @@ export default {
async addFuwu() {
// 处理服务范围数据
await this.operationOption();
+ // 文件上传新增没问题,编辑执行这一步会多多一个文件对象
// this.formData.attachmentList = [...this.fileList];
// this.fileList.forEach(item=>{
// this.formData.attachmentList.push({
@@ -835,7 +844,7 @@ export default {
this.formData.policyId = this.policyId;
}
//为什么不能传null还要返回null呢?
- if (this.formType == "copy"&& this.formData.assignFlag == 0) {
+ if (this.formType == "copy" && this.formData.assignFlag == 0) {
this.formData.assignInfo = {
noticeApproches: [],
serverOrgId: "",
@@ -844,7 +853,7 @@ export default {
serviceTimeEnd: "",
serviceTimeStart: "",
};
- this.formData.attachmentList = []
+ this.formData.attachmentList = [];
}
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
let params = {
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 01a58dec3..685f9dca0 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -35,8 +35,9 @@
-
+
-
+
至
@@ -185,7 +186,7 @@
>
{{
- scope.row.expiredFlag === "1" ? "已过期" : "未过期"
+ scope.row.expiredFlag ? "已过期" : "未过期"
}}
@@ -287,27 +288,31 @@ export default {
user: {},
agencyId: "",
policyLevelArray: [
- { value: "0", label: "市级" },
- { value: "1", label: "区级" },
- { value: "2", label: "街道级" },
+ { value: 0, label: "市级" },
+ { value: 1, label: "区级" },
+ { value: 2, label: "街道级" },
], //政策级别下拉
tableData: [],
statusArray: [
{
- value: "1",
+ value: true,
label: "是",
},
{
- value: "0",
+ value: false,
label: "否",
},
],
formData: {
title: "", // 政策标题
- content: "", //政策内容
- expiredFlag: "", //是否过期;1:已过期;0:未过期
+ // content: "", //政策内容
+ expiredFlag: null, //是否过期;1:已过期;0:未过期
+ policyLevel:null,//政策级别。0市级;1区级;2街道级
+ resiSearchTagName:"",//人员标签搜索关键词
+ createdTimeStart:"",//yyyy-MM-dd 发布时间,起始
+ createdTimeEnd:"",//yyyy-MM-dd 发布时间,结束
},
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -478,7 +483,7 @@ export default {
pageNo,
...formData,
});
-
+ console.log(this.formData);
this.tableLoading = false;
if (code === 0) {
this.total = data.total || 0;
@@ -552,8 +557,11 @@ export default {
resetSearch() {
this.formData = {
title: "", // 政策标题
- content: "", //政策内容
- expiredFlag: "", //是否过期;1:已过期;0:未过期
+ expiredFlag: null, //是否过期;1:已过期;0:未过期
+ policyLevel:null,//政策级别。0市级;1区级;2街道级
+ resiSearchTagName:"",//人员标签搜索关键词
+ createdTimeStart:"",//yyyy-MM-dd 发布时间,起始
+ createdTimeEnd:"",//yyyy-MM-dd 发布时间,结束
};
this.pageNo = 1;
diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
index 248e74f72..1133dd632 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue
@@ -137,10 +137,10 @@ export default {
data() {
let checkMObile = (rule, value, callback) => {
if (value === '') {
- callback(new Error('请输入手机号'));
+ callback(new Error('请输入联系电话'));
} else {
if (!isMobile(value)) {
- callback(new Error('手机号格式不正确'));
+ callback(new Error('联系电话格式不正确'));
}
callback();
}