111

src/views/modules/communityService/fuwujilu/addForm.vue

@@ -403,6 +403,32 @@ export default {
 
       firstInitMap: true,
 
+      statusArray: [
+        {
+          value: "in_service",
+          label: "进行中",
+        },
+        {
+          value: "completed",
+          label: "已完成",
+        },
+      ],
+      satisfyArray: [
+        {
+          value: "bad",
+          label: "不满意",
+        },
+        {
+          value: "good",
+          label: "基本满意",
+        },
+        {
+          value: "perfect",
+          label: "非常满意",
+        },
+
+      ],
+
     }
   },
 
@@ -1040,18 +1066,7 @@ export default {
         return []
       }
     },
-    statusArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    satisfyArray: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
+
   }
 }
 </script>

src/views/modules/communityService/measure/info.vue

@@ -5,7 +5,7 @@
                :model="form"
                :rules="rules"
                ref="ruleForm">
-        <el-form-item v-if="formType==='add'"
+        <el-form-item v-if="formType!=='add'"
                       label="操作方式"
                       :class="{'form-item':source==='visiual'}"
                       prop="addType">
@@ -458,7 +458,7 @@ export default {
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
     disabled () {
-      return this.addType != "edit" || this.addType != "add";
+      return this.addType != "edit" && this.addType != "add";
     },
   },
 
@@ -469,7 +469,13 @@ export default {
   },
 
   async created () {
+
     this.customerId = localStorage.getItem("customerId");
+    this.getGridList();
+    this.getDemandOptions();
+    this.getDemandUserList();
+    this.getServiceuserList();
+    this.getDictOptions();
     if (this.formType === 'add') {
       this.addType = 'add'
     } else {
@@ -695,6 +701,27 @@ export default {
       });
     },
 
+    async addNew () {
+      const _form = {
+        ...this.form,
+      };
+      await this.$http
+        .post("/heart/userdemand/add", _form)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+
+            this.$emit("handleClose")
+
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
+    },
+
     handleDel () {
       let params = {
         demandRecId: this.demandRecId,
@@ -901,10 +928,7 @@ export default {
             };
 
             this.finishServiceTime = [this.form.serviceStartTime, this.form.serviceEndTime]
-            this.getGridList();
-            this.getDemandOptions();
-            this.getDemandUserList();
-            this.getServiceuserList();
+
           }
         })
         .catch(() => {

src/views/modules/visual/communityGovern/fivelayers/fuwuInfo.vue

@@ -0,0 +1,175 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>发起服务</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <add-form ref="demandEditForm"
+                  :source="'visiual'"
+                  :formType="'add'"
+                  @handleClose="handleClose"
+                  @handleOk="handleOk"
+                  @dialogOk="handleEditSuccess" />
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+
+import addForm from "@/views/modules/communityService/fuwujilu/addForm";
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    addForm
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+      eventId: '1529724450524061698',
+      eventDetailData: {},
+    };
+  },
+
+  async mounted () {
+    this.loading = false
+    await this.handleSearch()
+    this.loading = true
+  },
+
+  methods: {
+    async handleSearch () {
+
+      const url = "/gov/project/icEvent/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+      // this.eventId = ""
+    },
+    handleOk () {
+      this.pageType = "";
+      // this.eventId = ""
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.sel-service {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+</style>

src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@@ -367,7 +367,11 @@
             :uid="selUserId"
             ref="ref_people"></people>
 
-    <event-info v-if="pageType==='dispose'"
+    <!-- <event-info v-if="pageType==='dispose'"
+                ref="eleEditForm"
+                @handleClose="handleClose" /> -->
+
+    <service-info v-if="pageType==='dispose'"
                   ref="eleEditForm"
                   @handleClose="handleClose" />
 
@@ -403,6 +407,7 @@ import cptCard from "@/views/modules/visual/cpts/card";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
 import People from "../../basicinfo/people";
 import eventInfo from "./eventInfo";
+import serviceInfo from "./serviceInfo";
 
 
 
@@ -1860,7 +1865,7 @@ const vueGis = {
     ...mapGetters(["clientHeight"])
 
   },
-  components: { cptTb, cptCard, ScreenLoading, People, eventInfo },
+  components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo },
 }
 export default vueGis;
 </script>

src/views/modules/visual/communityGovern/fivelayers/serviceInfo.vue

@@ -0,0 +1,186 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>新增需求</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <!-- <event-info v-if="loading"
+                    ref="eleEditForm"
+                    :pageType="pageType"
+                    :eventId="eventId"
+                    :eventDetailData="eventDetailData"
+                    :source="'visiual'"
+                    @handleClose="handleClose"
+                    @handleOk="handleOk"
+                    @dialogOk="handleEditSuccess" /> -->
+
+        <demand-info-origin ref="demandEditForm"
+                            :source="'visiual'"
+                            :formType="'add'"
+                            @handleClose="handleClose"
+                            @handleOk="handleOk"
+                            @dialogOk="handleEditSuccess" />
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info";
+import demandInfoOrigin from "@/views/modules/communityService/measure/info";
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    eventInfo,
+    demandInfoOrigin,
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+      eventId: '1529724450524061698',
+      eventDetailData: {},
+    };
+  },
+
+  async mounted () {
+    this.loading = false
+    await this.handleSearch()
+    this.loading = true
+  },
+
+  methods: {
+    async handleSearch () {
+
+      const url = "/gov/project/icEvent/detail";
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+      // this.eventId = ""
+    },
+    handleOk () {
+      this.pageType = "";
+      // this.eventId = ""
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.sel-service {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+</style>