人民建议bug的修改

package.json

@@ -7,8 +7,9 @@
     "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "build:sit": "vue-cli-service build --mode production.sit",
+    "build:sit": " set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode production.sit",
     "build:uat": "vue-cli-service build --mode production.uat",
+    "build:development": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode development",
     "build:preview": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode preview",
     "build:prod": "vue-cli-service build --mode production",
     "build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test",

src/views/modules/base/orgUnitManger/add.vue

@@ -6,25 +6,22 @@
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
                 <el-row>
                     <el-col :span="8">
-                        <el-form-item label="所属区域" prop="typeName" label-width="120px">
+                        <el-form-item label="所属区域" prop="agencyId" label-width="120px">
-                            <el-select v-model="formData.positionId" placeholder="请选择" clearable
+                            <el-cascader class="u-item-width-normal" ref="myCascader" clearable 
-                                class="u-item-width-normal">
+                                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
-                                <el-option v-for="item in orgOptions" :props="orgOptionProps" :key="item.id"
+                                @change="handleChangeAgency1"></el-cascader>
-                                    :label="item.name" :value="item.id">
-                                </el-option>
-                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="组织类型" prop="ownerPhone">
-                            <el-select class="u-item-width-normal-left"  v-model="formData.classKey" placeholder="请选择"
+                            <el-select class="u-item-width-normal-left" v-model="formData.type" placeholder="请选择"
                                 clearable>
                                 <el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
                                     :value="item.value">
                                 </el-option>
                             </el-select>
-                            <el-select class="u-item-width-normal-left" style="margin-left: 8px;" v-model="formData.classKey" placeholder="请选择"
+                            <el-select class="u-item-width-normal-left" style="margin-left: 8px;"
-                                clearable>
+                                v-model="formData.classKey" placeholder="请选择" clearable>
                                 <el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
                                     :value="item.value">
                                 </el-option>
@@ -69,19 +66,19 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="法人证件号码" prop="linkPhone" label-width="120px">
                             <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="法人联系方式" label-width="120px" prop="name">
                             <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <el-form-item label="是否重点单位" prop="linkPhone" label-width="120px">
                             <el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
                                 clearable>
@@ -90,7 +87,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="8">
                         <el-form-item label="重点单位类型" prop="linkPhone" label-width="120px">
                             <el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
@@ -111,7 +108,7 @@
                         <el-form-item label="九小场所类型" prop="linkPhone" label-width="120px">
                             <el-select class="u-item-width-normal" v-model="formData.classKey" placeholder="请选择"
                                 clearable>
-                                <el-option v-for="item in optionsStatus" :key="item.value" :label="item.lable"
+                                <el-option v-for="item in placeTypeList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
                             </el-select>
@@ -130,10 +127,12 @@
                     <el-col :span="24">
                         <el-form-item label="活动地点" prop="searchValue" label-width="120px">
                             <div style="width: 940px;">
-                <el-select  v-model.trim="searchValue" filterable style="width: 940px;" remote :reserve-keyword="true"
+                                <el-select v-model.trim="searchValue" filterable style="width: 940px;" remote
-                  placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+                                    :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :loading="loading">
-                    style="width: 400px;" :key="item.value || index" :label="item.label" :value="item.value">
+                                    <el-option v-for="(item, index) in searchOptions"
+                                        @click.native="handleClickKey(index)" style="width: 400px;"
+                                        :key="item.value || index" :label="item.label" :value="item.value">
                                     </el-option>
                                 </el-select>
                                 <div id="app_activity" class="div_map"></div>
@@ -170,7 +169,16 @@
    export default {
       data() {
           return {
-
+            placeTypeList:[],//九小场所
+              orgOptions: [],//所属组织
+              orgOptionProps: {
+                  value: 'agencyId',
+                  label: 'agencyName',
+                  children: 'subAgencyList',
+                  emitPath: false,
+                  multiple: false,
+                  checkStrictly: true
+              },//所
             showdisabled:false,
             searchOptions:[],
               fileList:[],
@@ -210,9 +218,23 @@
           this.formData.latitude = latitude;
           this.formData.longitude = longitude;
           this.activityType()
+          this.loadplaceType()
       },
    
       methods: {
+              //场所类型
+              async loadplaceType() {
+			const url = '/sys/dict/data/dictlist';
+			let params = {
+				dictType: "nine_small_places"
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.placeTypeList = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
         async handleMoveCenter(e) {
       //修改地图中心点
       // const { lat, lng } = map.getCenter();

src/views/modules/base/orgUnitManger/index.vue

@@ -546,7 +546,7 @@
         //获取当前组织
      getOrgTreeList() {
         this.$http
-          .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
+          .post("/gov/org/customerAgencyUnit/page", {page:"",limit:""})
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);

src/views/modules/communityService/ninePlaces/places/places.vue

@@ -66,7 +66,7 @@
                      v-model.trim="formData.ninePlaceVal"
                      placeholder="请选择"
                      clearable>
-            <el-option v-for="item in placeTypeList"
+            <el-option v-for="item in placeyTpeList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">

src/views/modules/home/index.vue

@@ -855,7 +855,7 @@ this.getStatistics()
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
-        categoryCode: this.currentCategoryCode,
+        categoryCode:"IS_YLFN",
       });
       if (code === 0) {
 

src/views/modules/shequ/index.vue

@@ -1123,9 +1123,7 @@ export default {
     async getWarningList() {
       const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie";
       let params = {};
-
       const { data, code, msg } = await requestPost(url, params);
-
       if (code === 0) {
         this.warningChart.loading = true;
         this.warningChart.total = data.total;

src/views/modules/solicitationSpecial/cpts/add.vue

@@ -47,7 +47,7 @@
                     <el-col :span="24">
                         <el-form-item label="开始征集
           " style="display: block" prop="peopleCount" label-width="150px">
-                            <el-switch v-model="formData.status" :active-value="0" :inactive-value="1"
+                            <el-switch v-model="formData.status" :active-value="1" :inactive-value="0"
                                 @change="handleSwitchChange"></el-switch>
                         </el-form-item>
                     </el-col>
@@ -63,7 +63,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
- import { requestPost } from '@/js/dai/request'
+import { requestPost,requestGet } from '@/js/dai/request'
 import Tinymce from '@c/tinymce2/index.vue'
 import daiMap from "@/utils/dai-map";
 import util from '@js/util.js';
@@ -92,7 +92,7 @@
                 subjectTitle: '',
                 subjectContent: "",
                 typeCode: "",
-                status:"0",
+                status: 1,
                 id: "",
                 attachmentList: []
             },
@@ -197,10 +197,29 @@
             this.formType = type
             if (type === 'edit') {
                 this.formData = activityId
+               this.getDetail(activityId)
             }
 
 
 
+        },
+        getDetail(activityId){
+            
+            const url = '/governance/icEventSpecialSubject/getDetail'
+            let params = {
+                id: activityId.id
+            }
+            
+        requestGet(url, params).then(res=>{
+            console.log(res,"sdkljklsdf");
+            this.formData=res.data
+            this.formData.status=Number(this.formData.status)
+            console.log(this.formData,"dsfgjsldg");
+            
+            
+        })
+            
+
         },
         //加载组织
         async loadFormData() {
@@ -245,7 +264,6 @@
             //       this.$message.error('请选择状态');
             //       return;
             //    }
- 
             console.log(this.formData, "this.formData");
             this.addSpecial()
         },
@@ -289,14 +307,14 @@
     computed: {
         dataRule() {
             return {
-                columnId: [
+                subjectTitle: [
-                    { required: true, message: '请选择所属栏目', trigger: 'blur' }
+                    { required: true, message: '所属专题不能为空', trigger: 'blur' }
                 ],
-                content: [
+                typeCode: [
-                    { required: true, message: '活动详情不能为空', trigger: 'blur' }
+                    { required: true, message: '征集领域不能为空', trigger: 'blur' }
                 ],
-                title: [
+                subjectContent: [
-                    { required: true, message: '文章标题不能为空', trigger: 'blur' }
+                    { required: true, message: '征集内容不能为空', trigger: 'blur' }
                 ],
                 fileList: [
                     { required: true, message: '请选择活动照片', trigger: 'blur' }
@@ -326,14 +344,17 @@
     height: 60px;
     line-height: 70px;
 }
+
 /deep/ .el-upload-list--picture-card .el-upload-list__item {
     width: 60px;
     height: 60px;
 }
+
 /deep/ .el-upload-dragger {
     width: 60px;
     height: 60px;
 }
+
 .item_width_1 {
     width: 634px;
 
@@ -341,6 +362,7 @@
         z-index: 20000;
     }
 }
+
 .u-item-width-normal {
     width: 222px;
 }

src/views/modules/solicitationSpecial/index.vue

@@ -485,6 +485,7 @@ export default {
         },
         showAddClose(){
             this.showSupervise=false
+            this.getTableData()
         },
         handleEventType(val) {
             const nodes = this.$refs.cascaderEvent.getCheckedNodes();

src/views/modules/volunteer/activityArchive/add.vue

@@ -5,7 +5,7 @@
       <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="120px" :rules="rules">
         <el-row>
           <el-col :span="12"> <el-form-item label="主办方" prop="agencyId" required>
-              <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
+              <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px"
                 v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                 @change="handleChangeAgency"></el-cascader>
             </el-form-item>

src/views/modules/workPc/guidance/add.vue

@@ -121,7 +121,7 @@ export default {
           keyWords: '',
           activityId: '',
           formData: {   
-            orgId: "",//发布组织
+            orgId: this.$store.state.user.agencyId,//发布组织
             categoryCode: "",//栏目分类
             title: "",//文章标题
             coverPic: "",//封面图