事件管理样式修改,

src/App.vue

@@ -155,7 +155,7 @@ export default {
     position: relative;
     max-height: 83vh;
     box-sizing: border-box;
-    padding: 0 0 20px !important;
+    padding: 0 0 16px !important;
     .dialog-h-content {
       max-height: calc(83vh - 80px);
       box-sizing: border-box;

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

@@ -108,7 +108,12 @@
           </el-button>
         </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
-          <el-switch v-model="formData.assignFlag"> </el-switch>
+          <el-switch
+            v-model="formData.assignFlag"
+            :active-value="1"
+            :inactive-value="0"
+          >
+          </el-switch>
         </el-form-item>
       </el-form>
       <el-form :model="newFormData" :rules="newDataRule" ref="ref_gxxq_form1">
@@ -334,7 +339,7 @@ export default {
       formData: {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         commonServiceTypeId: "", // 公共服务（政策级别）二级分类id
-        assignFlag: false,
+        assignFlag: 0,
         resiSearchTagId: "", //查找享受服务人员
         resiSearchTagName: "", //享受服务人员名称
         title: "", //服务名称
@@ -362,7 +367,7 @@ export default {
         ],
         content: [
           { required: true, message: "详细说明不能为空", trigger: "bulr" },
-          { max: 1000, message: "不能超出1000个字符" , trigger: 'blur'},
+          { max: 1000, message: "不能超出1000个字符", trigger: "blur" },
         ],
       },
       newDataRule: {
@@ -437,17 +442,14 @@ export default {
         this.formData.commonServiceTypeId = data.commonServiceTypeId;
         this.formData.title = data.title;
         this.formData.content = data.content;
+        this.formData.assignFlag = data.assignFlag
         this.formData.resiSearchTagId = data.resiSearchTagId;
         this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart;
         this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd;
         this.newFormData.serverOrgType = data.assignInfo.serverOrgType;
         this.newFormData.serverOrgId = data.assignInfo.serverOrgId;
         this.newFormData.noticeApproches = data.assignInfo.noticeApproches;
-        if (data.assignFlag == 1) {
-          this.formData.assignFlag = true;
-        } else {
-          this.formData.assignFlag = false;
-        }
+
         for (let i in data.assignInfo.serviceScopeList) {
           this.newFormData.serviceScopeList.push(
             data.assignInfo.serviceScopeList[i].objectId
@@ -628,7 +630,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);
@@ -673,12 +674,6 @@ export default {
     },
 
     async addFuwu() {
-      // 指派服务绑定0或1
-      if (this.formData.assignFlag) {
-        this.formData.assignFlag = 1;
-      } else {
-        this.formData.assignFlag = 0;
-      }
       //   通知服务方方式,如果都没有选中传数组字符串'0'
       if (this.newFormData.noticeApproches.length == 0) {
         this.newFormData.noticeApproches.push(0);
@@ -706,9 +701,27 @@ export default {
       this.newFormData.serviceScopeList.forEach((item) => {
         if (typeof item != "string") {
           arr.push(item);
-        };
+        }
+      });
+      //   选中的数据中有不是网格或者社区或者楼栋的就停止它
+      let isOk = false;
+      arr.findIndex((item) => {
+        if (
+          item.objectType == "neighborhood" ||
+          item.objectType == "agency" ||
+          item.objectType == "grid"
+        ) {
+          isOk = true;
+        } else {
+          return (isOk = false);
+        }
       });
-       //只有网格社区楼栋才可以,其他不行
+      console.log(isOk);
+      if (!isOk) {
+        this.newArr = [];
+        this.$message.error("请选择正确的网格,社区,楼栋!");
+        return;
+      }
       this.newFormData.serviceScopeList = arr;
       var url = "";
       var params = {};
@@ -736,15 +749,15 @@ export default {
       }
       //   const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate'
       console.log(params);
-      const { data, code, msg } = await requestPost(url, params);
+      //   const { data, code, msg } = await requestPost(url, params);
 
-      if (code === 0) {
-        this.$message.success("添加成功");
-        this.resetData();
-        this.$emit("handleComfirm");
-      } else if(code>=8000){
-        this.$message.error(msg);
-      }
+      //   if (code === 0) {
+      //     this.$message.success("添加成功");
+      //     this.resetData();
+      //     this.$emit("handleComfirm");
+      //   } else if(code>=8000){
+      //     this.$message.error(msg);
+      //   }
     },
 
     handleCancle() {
@@ -756,7 +769,7 @@ export default {
       this.formData = {
         serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
         commonServiceTypeId: "", // 公共服务（政策级别）二级分类id
-        assignFlag: false,
+        assignFlag: 0,
         resiSearchTagId: "", //查找享受服务人员
         resiSearchTagName: "", //享受服务人员名称
         title: "", //服务名称
@@ -770,7 +783,7 @@ export default {
         serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
         serverOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
         serverOrgId: "", //服务组织Id
-      }
+      };
     },
     // 开启加载动画
     startLoading() {

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

@@ -61,7 +61,7 @@
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
             <span class="u-info-title-2">痛点难点：</span>
-            <span>{{ info.difficultPointName }}</span>
+            <span>{{ info.markTypeName|| '--' }}</span>
           </div>
           <div v-if="info.operationType==='1'"
                :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">

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

@@ -501,26 +501,33 @@ export default {
       }
     },
 
-    handleServiceChange (type, val) {
-      if (val === "social_org") {
-        if (type === "add") {
-          this.getServiceuserList(val, "add_demand");
-        } else {
-          this.getServiceuserList(val, "query_demand");
+    async handleServiceChange(serverOrgType,val) {
+      if (!val) return false;
+      if (this.formData.categoryCode == "") {
+        this.$message.error("请先选择服务类型!");
+        return;
       }
-      } else {
-        this.getServiceuserList(val, "");
+      const url = "/actual/base/serviceitem/listServerOrg";
+      let params = {
+        serviceTypeId: this.formData.categoryCode,
+        serverOrgType: val,
+        businessType: "common_service",
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.serviceOptiondList = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
       }
     },
-
-    async getServiceuserList (serviceType, query) {
+    async getServiceuserList (serviceType) {
 
       if (!serviceType) return false;
       const { demandUserId } = this.formData;
       const params = {
-        serviceName: "",
+        serviceName: this.formData.categoryCode,
         serviceType: serviceType,
-        queryPurpose: query,
+        queryPurpose: 'query',
       };
 
 

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

@@ -120,7 +120,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="图片/附件："
+      <el-form-item label="图片/附件"
                     label-width="150px"
                     :class="{'form-item':source==='visiual'}"
                     prop="internalFile">

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

@@ -767,7 +767,7 @@ export default {
 
 <style lang="scss">
 .el-dialog__body {
-  padding: 0 10px 20px !important;
+  padding: 0 10px 16px !important;
 }
 
 .hide {

src/views/modules/shequzhili/issue/cpts/eventDetail.vue

@@ -81,15 +81,12 @@
 
     </div>
 
-    <div class="div-btn">
-      <el-button size="small"
+    <el-row>
+        <el-col :span="24" align="right">
+          <el-button size="small" style="margin-right:16px"
                  @click="handleCancle">关 闭</el-button>
-      <!-- <el-button v-if="formType != 'detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button> -->
-    </div>
+        </el-col>
+    </el-row>
 
   </div>
 </template>

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

@@ -325,6 +325,6 @@ export default {
 
 <style>
 .el-dialog__body {
-  padding: 0 10px 20px !important;
+  padding: 0 10px 16px !important;
 }
 </style>

src/views/modules/shequzhili/issue/cpts/suggestDetail.vue

@@ -1,80 +1,85 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
-      <el-table :data="suggestionList"
+      <el-table
+        :data="suggestionList"
         border
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
         class="table"
         style="width: 100%"
-                :height="maxTableHeight">
-
-        <el-table-column label="序号"
+        :height="maxTableHeight"
+      >
+        <el-table-column
+          label="序号"
           fixed="left"
           type="index"
           align="center"
-                         width="50" />
+          width="50"
+        />
 
-        <el-table-column prop="userShowName"
+        <el-table-column
+          prop="userShowName"
           align="center"
           width="80"
           label="姓名"
-                         :show-overflow-tooltip="true">
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="aititudeShow"
+        <el-table-column
+          prop="aititudeShow"
           label="投票"
           width="80"
           align="center"
-                         :show-overflow-tooltip="true">
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="timeShow"
+        <el-table-column
+          prop="timeShow"
           align="center"
           width="150"
           label="时间"
-                         :show-overflow-tooltip="true">
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="suggestion"
+        <el-table-column
+          prop="suggestion"
           align="center"
           min-width="180"
           :show-overflow-tooltip="true"
-                         label="建议">
+          label="建议"
+        >
         </el-table-column>
-
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
+        <el-pagination
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page.sync="pageNo"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next">
+          layout="sizes, prev, pager, next"
+        >
         </el-pagination>
       </div>
     </div>
 
-    <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
-      <!-- <el-button v-if="formType != 'detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button> -->
-    </div>
-
+    <el-row>
+      <el-col :span="24" align="right">
+        <el-button size="small" @click="handleCancle" style="margin-left:16px;">关 闭</el-button></el-col
+      >
+    </el-row>
   </div>
 </template>
 
 <script>
-
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 import dateFormat from "dai-js/tools/dateFormat";
 import { mapGetters } from "vuex";
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
   data() {
     return {
@@ -84,69 +89,60 @@ export default {
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
-
-    }
+    };
   },
   components: {},
   async mounted() {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
   },
 
   methods: {
-
-
     async initForm() {
-      this.startLoading()
-
-      await this.getSuggestion()
-      this.initLoading = true
-      this.endLoading()
-
+      this.startLoading();
 
+      await this.getSuggestion();
+      this.initLoading = true;
+      this.endLoading();
     },
     async getSuggestion() {
-      const url = "/governance/issuesuggestion/list"
+      const url = "/governance/issuesuggestion/list";
 
       let params = {
         issueId: this.issueId,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-      }
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        data.forEach(element => {
-          element.userShowName = element.userShowName || '匿名'
-          element.aititudeShow = element.aititude === 'opposition' ? '反对' : '支持'
+        data.forEach((element) => {
+          element.userShowName = element.userShowName || "匿名";
+          element.aititudeShow =
+            element.aititude === "opposition" ? "反对" : "支持";
           element.timeShow = dateFormat(
             new Date(element.publishTime * 1000),
             "yyyy-MM-dd hh:mm"
           );
         });
-        this.suggestionList = data
-
+        this.suggestionList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     handleSizeChange(val) {
-
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSuggestion();
     },
     handleCurrentChange(val) {
-
       this.pageNo = val;
       this.getSuggestion();
     },
     handleCancle() {
       // this.resetData()
-      this.$emit('diaDetailClose')
-
+      this.$emit("diaDetailClose");
     },
 
     watchImg(src) {
@@ -154,25 +150,24 @@ export default {
     },
 
     resetData() {
-
-      this.topicInfo = {}
+      this.topicInfo = {};
     },
     // 开启加载动画
     startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
     endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
-      }
+        loading.close();
       }
     },
+  },
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
@@ -180,15 +175,14 @@ export default {
         : this.clientHeight - 410;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
-
   },
   props: {
     issueId: {
       type: String,
-      default: ''
+      default: "",
     },
-  }
-}
+  },
+};
 </script>