政策找人,房屋管理默认打开一层菜单,政策新增差文件上传

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,

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);
 		},
 
 		// 开启加载动画

src/views/modules/communityService/policy/addPolicy.vue

@@ -242,6 +242,7 @@
         :disabled="formType === 'detail'"
         :rules="newDataRule"
         ref="ref_policy_form1"
+        v-if="newFormData"
       >
         <el-form-item
           v-if="formData.assignFlag"
@@ -578,6 +579,15 @@ export default {
               data.assignInfo.serviceScopeList[i].objectId
             );
           }
+        } else {
+          this.newFormData = {
+            noticeApproches: [],
+            serviceScopeList: [], //
+            serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+            serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+            serverOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+            serverOrgId: "", //服务组织Id
+          };
         }
         if (data.attachmentList) {
           this.fileList = data.attachmentList;
@@ -750,7 +760,6 @@ export default {
       // // this.formData.ruleList = this.ruleList
 
       // // return false
-
       // this.btnDisable = true;
       // setTimeout(() => {
       //   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 = {

src/views/modules/communityService/policy/policyList.vue

@@ -35,8 +35,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员标签" prop="expiredFlag">
+        <el-form-item label="人员标签" prop="resiSearchTagName">
           <el-input
+          v-model="formData.resiSearchTagName"
             placeholder="请输入"
             size="small"
             class="u-item-width-normal"
@@ -59,25 +60,25 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布日期" prop="timeStart">
+        <el-form-item label="发布日期" prop="createdTimeStart">
           <el-date-picker
-            v-model="formData.timeStart"
+            v-model="formData.createdTimeStart"
             class="u-item-width-daterange"
             size="small"
             type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="开始时间"
           >
           </el-date-picker>
           <span class="u-data-tag">至</span>
           <el-date-picker
-            v-model="formData.timeEnd"
+            v-model="formData.createdTimeEnd"
             class="u-item-width-daterange u-data-tag"
             size="small"
             type="date"
-            value-format="yyyy-MM-dd"
-            value="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd HH:mm:ss"
             placeholder="结束时间"
           >
           </el-date-picker>
@@ -185,7 +186,7 @@
         >
           <template slot-scope="scope">
             <span>{{
-              scope.row.expiredFlag === "1" ? "已过期" : "未过期"
+              scope.row.expiredFlag ? "已过期" : "未过期"
             }}</span>
           </template>
         </el-table-column>
@@ -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;

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();
 			}