Merge branch 'dev_shequzhili' into dev

src/views/modules/communityService/sqzzz/cpts/edit.vue

@@ -30,12 +30,17 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select v-model="dataForm.categoryCode" placeholder="请选择" clearable>
+          <el-select
+            v-model="dataForm.categoryCode"
+            placeholder="请选择"
+            clearable
+          >
             <el-option
               v-for="item in categoryList"
               :key="item.value"
               :label="item.label"
-              :value="item.value">
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -259,7 +264,7 @@ export default {
       orgId: "",
       dataForm: {
         organizationName: "",
-        categoryCode: '',
+        categoryCode: "",
         serviceItem: "",
         organizationPersonCount: "",
         principalName: "",
@@ -271,8 +276,8 @@ export default {
         latitude: "",
         organizationPersonnel: [],
       },
-      categoryList: []
-    }
+      categoryList: [],
+    };
   },
   components: {},
   computed: {
@@ -312,23 +317,23 @@ export default {
   watch: {},
 
   async created() {
-    this.getCategoryList()
+    this.getCategoryList();
   },
   async mounted() {
-    this.initMap()
+    this.initMap();
   },
 
   methods: {
     async getCategoryList() {
-      const url = '/sys/dict/data/dictlist'
+      const url = "/sys/dict/data/dictlist";
       const params = {
-        dictType: 'self_org_category'
-      }
-      const { data, code, msg } = await requestPost(url, params)
+        dictType: "self_org_category",
+      };
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.categoryList = data
+        this.categoryList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     handleAddStaff() {
@@ -449,6 +454,22 @@ export default {
               message: "手机号格式有误",
             });
           }
+          const {
+            dataForm: { organizationPersonnel },
+          } = this;
+          let vlt = organizationPersonnel.every((item) => {
+            return (
+              item.personName &&
+              item.personPhone &&
+              formVltHelper.userOrMobile(item.personPhone)
+            );
+          });
+          if (!vlt) {
+            return this.$message({
+              type: "error",
+              message: "成员姓名/手机号为空或格式有误",
+            });
+          }
           this.submit();
         }
       });

src/views/modules/shequzhili/event/cpts/add.vue

@@ -201,11 +201,11 @@
           <el-form-item label="所属网格"
                         label-width="150px">
             <el-select class="cell-width-1"
-                       disabled
-                       v-model.trim="formData.gridId"
+                       v-model.trim="selGridId"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in gridList"
+                         @click.native="handleChangeGrid"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -307,21 +307,7 @@ export default {
       ],
 
       formData: iniFmData(),
-      formDataTemp: {
-        address: "山东省青岛市市南区徐州路21号戊",
-        // categoryList: ["1015", "1016"],
-        eventContent: "asdfasdfasdfasdf",
-        gridId: "63d5ff92ea981b1c58e4914ac894c610",
-        happenTime: "2022-05-05 12:00:00",
-        idCard: "211103190909090909",
-        imageList: ["https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20220518/0818246db4cc4ac7bcd84bea69a8b38c.png"],
-        latitude: 36.07120507831775,
-        longitude: 120.38806572319174,
-        mobile: "15111111111",
-        name: "张三",
-        reportUserId: "",
-        sourceType: "1",
-      },
+
 
 
       //地图相关
@@ -406,6 +392,10 @@ export default {
     "formData.reportUserId": function (val) {
       this.$emit("changeUserId", val)
     },
+    "formData.gridId": function (val) {
+      this.selGridId = val
+      this.$emit("changeGridId", val)
+    }
   },
 
   async mounted () {
@@ -415,9 +405,7 @@ export default {
     this.getCategoryList()
 
     this.initMap()
-    // this.formData = {
-    //   ...this.formDataTemp
-    // }
+
   },
 
   methods: {
@@ -442,7 +430,6 @@ export default {
         this.formData.mobile = selPerson.demandUserMobile
         this.formData.reportUserId = selPerson.demandUserId
         this.formData.idCard = selPerson.idCard
-        console.log(selPerson)
 
         this.personTableShow = false;
 
@@ -460,7 +447,7 @@ export default {
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         agencyId: '',
-        gridId: this.formData.gridId,
+        gridId: this.selGridId,
         name: "",
       }
 

src/views/modules/shequzhili/event/cpts/event-detail.vue

@@ -70,18 +70,29 @@
             <div class="line"
                  @click="handleToDemand">查看需求</div>
           </div>
+          <div v-if="info.satisfactionName"
+               class="info-prop">
+            <span class="info-title-2">满意度：</span>
+            <div @click="handleToDemand">{{info.satisfactionName}}</div>
+          </div>
 
         </div>
       </div>
 
-      <div v-if="info.operationId&&info.status!=='closed_case'"
+      <div v-if="info.operationId||!(info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId)"
            class="div-btn ">
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
 
       </div>
+      <!-- <div class="div-btn ">
+        <el-button size="small"
+                   @click="handleCloseEvent">关闭</el-button>
+
+      </div> -->
     </el-card>
-    <el-card v-if=" info.status==='closed_case'">
+
+    <el-card v-if="info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId">
       <h3>满意度评价</h3>
       <div class="m-row">
         <div class="m-info">
@@ -106,13 +117,11 @@
         </div>
 
       </div>
-      <div v-if="info.operationId||info.status==='closed_case'"
-           class="div-btn ">
+      <div class="div-btn ">
 
         <el-button size="small"
                    @click="handleCloseEvent">关闭</el-button>
-        <el-button v-if="info.status==='closed_case'&&!info.satisfactionName && user.id===info.createdUserId"
-                   size="small"
+        <el-button size="small"
                    type="primary"
                    @click="handleComfirmSatisfy">确定</el-button>
 
@@ -225,9 +234,9 @@ export default {
       this.info = JSON.parse(JSON.stringify(this.eventDetailData));
 
       //如果已经评价过，进行回显
-      if (this.info.status === 'closed_case' && this.info.satisfactionName) {
-        this.changeSatisfyType(this.info.satisfaction)
-      }
+      // if (this.info.status === 'closed_case' && this.info.satisfactionName) {
+      //   this.changeSatisfyType(this.info.satisfaction)
+      // }
     }
     // this.getApiData();
 

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -6,7 +6,8 @@
         <event-add ref="ref_add"
                    @changeName="changeName"
                    @changeMobile="changeMobile"
-                   @changeUserId="changeUserId"></event-add>
+                   @changeUserId="changeUserId"
+                   @changeGridId="changeGridId"></event-add>
       </el-card>
 
       <div class="process-form">
@@ -15,7 +16,8 @@
           <process-form ref="ref_processinfo_add"
                         :demandUserId="demandUserId"
                         :demandUserName="demandUserName"
-                        :demandUserMobile="demandUserMobile"></process-form>
+                        :demandUserMobile="demandUserMobile"
+                        :gridId="gridId"></process-form>
 
           <div class="div-btn ">
             <el-button size="small"
@@ -228,6 +230,7 @@ function iniData () {
     demandUserId: '',
     demandUserName: '',
     demandUserMobile: '',
+    gridId: '',
 
     eventDetailCopy: {},
 
@@ -306,6 +309,10 @@ export default {
 
       this.demandUserId = val
     },
+    changeGridId (val) {
+
+      this.gridId = val
+    },
 
     //加载组织数据
     async getProjectProcess () {

src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@@ -207,22 +207,6 @@ export default {
       customerId: localStorage.getItem("customerId"),
       demandOptions: [],
       serviceOptions: [
-        {
-          label: "志愿者",
-          value: "volunteer",
-        },
-        //  {
-        //   label: '社会组织',
-        //   value: 'social_org'
-        // },
-        {
-          label: "社区自组织",
-          value: "community_org",
-        },
-        {
-          label: "区域党建单位",
-          value: "party_unit",
-        },
       ],
       serviceOptiondList: [],
 
@@ -331,6 +315,7 @@ export default {
     this.agencyId = user.agencyId
     this.getCategoryList();
     this.getDemandOptions();
+    this.getServiceOption()
     // this.formData = { ...this.formDataTemp }
     this.initMap()
 
@@ -428,6 +413,20 @@ export default {
 
     },
 
+    async getServiceOption () {
+      const url = "/sys/dict/data/dictlist"
+      let params = { dictType: "user_demand_service_type", }
+
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.serviceOptions = data;
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
     getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {

src/views/modules/shequzhili/event/cpts/process-form-project.vue

@@ -128,14 +128,15 @@
           </div>
         </fold-text>
 
-        <el-popover placement="bottom"
-                    width="400"
-                    height="400"
+        <el-popover placement="top"
+                    width="450"
+                    height="450"
                     v-model="visibleTagPanel">
           <div class="f"
                style="min-height: 120px">
             <h2>选择标签</h2>
-            <el-select v-model="selectedTagData"
+            <el-select style="width: 350px"
+                       v-model="selectedTagData"
                        multiple
                        allow-create
                        filterable
@@ -298,6 +299,10 @@ export default {
 
   },
   props: {
+    gridId: {//新增是选择的网格id
+      type: String,
+      default: "",
+    },
     eventId: {
       type: String,
       default: "",
@@ -310,6 +315,11 @@ export default {
     },
   },
   watch: {
+    gridId: function (val) {
+
+      this.formData.gridId = val
+
+    },
     "formData.assistanceUnitIndex": function (val) {
 
       if (val === "" || this.assistanceUnitList.length === 0) {
@@ -365,6 +375,7 @@ export default {
     // this.formData = { ...this.formDataTemp }
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
+      this.formData.gridId = this.eventDetailCopy.gridId
 
       if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
         this.selCategoryArray = []
@@ -380,6 +391,7 @@ export default {
         this.formData.categoryList.push(this.selCateObj)
       }
     } else {
+      this.formData.gridId = this.gridId
 
     }
   },

src/views/modules/shequzhili/event/cpts/process-form.vue

@@ -32,6 +32,7 @@
       <div v-if="operationType==='1'">
         <process-form-project ref="ref_process_form_project"
                               :eventDetailData="eventDetailData"
+                              :gridId="gridId"
                               :eventId="eventId"></process-form-project>
       </div>
 
@@ -118,6 +119,10 @@ export default {
       type: String,
       default: "",
     },
+    gridId: {
+      type: String,
+      default: "",
+    },
     eventId: {
       type: String,
       default: "",

src/views/modules/shequzhili/event/eventList.vue

@@ -254,11 +254,11 @@
                          size="small"
                          class="div-table-button--edit">处理</el-button>
 
-              <!-- <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
-                         @click="handleSatisfy(scope.row)"
+              <el-button v-else-if="scope.row.status==='closed_case' && !scope.row.satisfactionName && user.id===scope.row.createdUserId"
+                         @click="handleWatch(scope.row)"
                          type="text"
                          size="small"
-                         class="div-table-button--edit">评价</el-button> -->
+                         class="div-table-button--edit">去评价</el-button>
               <el-button v-else
                          @click="handleWatch(scope.row)"
                          type="text"

src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@@ -113,7 +113,7 @@
               <el-popover
                 v-if="projectInfo.projectStatus == 'pending'"
                 placement="bottom"
-                width="400"
+                width="450"
                 height="400"
                 v-model="visibleTagPanel"
               >
@@ -126,6 +126,8 @@
                     filterable
                     placeholder="请选择"
                     @change="handleTagChange"
+                    size="medium"
+                    style="width: 350px;"
                   >
                     <el-option-group label="自定义标签">
                       <el-option

src/views/modules/visual/communityGovern/shijianchuli/event-info.vue

@@ -19,7 +19,7 @@
             </div>
             <div class="info-prop">
               <span>上报时间：</span>
-              <span>{{ eventInfo.createdTime }}</span>
+              <span>{{ eventInfo.happenTime }}</span>
             </div>
 
             <div class="info-prop">

src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@@ -299,6 +299,7 @@ export default {
 
     this.dataLoading = false
 
+
     // this.assignData()
 
   },
@@ -423,11 +424,11 @@ export default {
 
           {
             name: "已完成",
-            value: data.closedRatio * 100
+            value: Math.floor(data.closedRatio * 10000) / 100
           },
           {
             name: "处理中",
-            value: data.processingRatio * 100
+            value: Math.floor(data.processingRatio * 10000) / 100
           },
         ]
 

src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@@ -104,6 +104,8 @@
     </div>
     <event-info v-if="showProject"
                 :eventId="eventId"
+                :orgId="tableOrgId ? tableOrgId : orgId"
+                :orgType="tableOrgType ? tableOrgType : orgType"
                 @close="showProject = false" />
   </cpt-card>
 </template>
@@ -239,6 +241,7 @@ export default {
       queryEndTime: '',
       categoryCode: '',
       tableOrgId: '',
+      tableOrgType: '',
       eventId: '',
       processStatus: ''
     }
@@ -400,6 +403,7 @@ export default {
             value: item.total,
             name: item.orgName,
             orgId: item.orgId,
+            orgType: item.orgType,
             color: colorArray[colIndex],
             selected: index == 0 ? true : false
           }
@@ -416,7 +420,7 @@ export default {
       const url = '/gov/project/icEvent/processAnalysis/eventList'
       let params = {
         orgId: this.tableOrgId ? this.tableOrgId : this.orgId,
-        orgType: this.orgType,
+        orgType: this.tableOrgType ? this.tableOrgType : this.orgType,
         queryStartTime: this.queryStartTime,
         queryEndTime: this.queryEndTime,
         processStatus: this.processStatus, // 处理状态，processing,closed_case。可为空，为空查询所有状态的事件列表
@@ -538,6 +542,7 @@ export default {
       // this.$refs.pieChart.hideLoading()
       this.$refs.pieChart.setOption(this.pieOption)
       this.tableOrgId = ''
+      this.tableOrgType = ''
       this.demand.pageNo = 1
       this.getGridPieData()
     },
@@ -603,6 +608,8 @@ export default {
             }
           }
           this.tableOrgId = element.orgId
+          this.tableOrgType = element.orgType
+          console.log(element)
         } else {
           element.label = {
             show: false,