组织单位，系统管理等等

src/assets/scss/modules/index.scss

@@ -164,8 +164,15 @@
     position: relative;
 
     .wrap {
-       
+        width: 100%;    
-        width: 100%;
+        .warp_list{
+            display: flex;
+            width: 100%;
+            flex-direction: row;
+            .item{
+                width: 25%;
+            }
+        }
     }
 
     .mewq {

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

@@ -13,13 +13,19 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="组织类型" prop="ownerPhone">
+                        <el-form-item label="组织类型" prop="ownerPhone"> 
-                            <el-select  style="width: 100px;" v-model="formData.type" placeholder="请选择"
+                            <el-select  style="width: 120px;" v-model="formData.type1" placeholder="请选择"   @change="changeType"
                                 clearable>
                                 <el-option v-for="item in orgTypeList" :key="item.value" :label="item.label"
                                     :value="item.value">
                                 </el-option>
                             </el-select>
+                            <el-select  style="width: 120px;" v-model="formData.type" placeholder="请选择"
+                                clearable>
+                                <el-option v-for="item in orgTypeChiderList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -218,10 +224,12 @@
                   { label: "企业", value: 2 },
                   { label: "学校", value: 3 },
               ],
+              orgTypeChiderList:[],
               SiteData:[],
               idCardtypeList:[],
               tableDate:{},
               formData: {
+                type1:"",
                   id: "",
                   customerId: "",
                   delFlag: "",
@@ -301,6 +309,13 @@
           this.formData.createdBy = "";
           this.formData.createdTime = "";
           this.formData.customerId = "";
+        },
+        changeType(value){
+            const selectedItem = this.orgTypeList.find(item => item.value === value);
+            this.orgTypeChiderList=selectedItem.children
+            console.log('Selected Item:', selectedItem.children);
+            // console.log(value,"DSKLJFSKLDG");
+            
         },
           //重点场所类别
           async placetype() {
@@ -332,7 +347,7 @@
              async orgtype() {
               const url = '/sys/dict/data/dictTree';
               let params = {
-                  dictType: "org_type"
+                  dictType: "org_unit_category"
               };
               const { data, code, msg } = await requestPost(url, params);
               if (code === 0) {
@@ -347,7 +362,7 @@
           async companynature() {
               const url = '/sys/dict/data/dictlist';
               let params = {
-                  dictType: "company_nature"
+                  dictType: "org_unit_nature"
               };
               const { data, code, msg } = await requestPost(url, params);
               if (code === 0) {

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

@@ -9,19 +9,33 @@
                   v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
                   @change="handleChangeAgency"></el-cascader>
               </el-form-item>
-              <el-form-item label="组织类型" prop="ownerPhone">
+              <!-- <el-form-item label="组织类型" prop="ownerPhone">
                 <el-select class="u-item-width-normal" v-model="formData.type" placeholder="请选择" clearable>
                   <el-option v-for="item in orgTypeList" :key="item.value" :label="item.lable" :value="item.value">
                   </el-option>
-                </el-select>
+                </el-select> -->
                 <!-- <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" :value="item.value">
                   </el-option>
                 </el-select> -->
-              </el-form-item>
+              <!-- </el-form-item> -->
+              <el-form-item label="组织类型" prop="ownerPhone"> 
+                            <el-select  style="width: 120px;" v-model="formData.type1" placeholder="请选择"   @change="changeType"
+                                clearable>
+                                <el-option v-for="item in orgTypeList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <el-select  style="width: 120px;" v-model="formData.type" placeholder="请选择"
+                                clearable>
+                                <el-option v-for="item in orgTypeChiderList" :key="item.value" :label="item.label"
+                                    :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
               <el-form-item label="企业性质" prop="property">
                 <el-select class="u-item-width-normal" v-model="formData.property" placeholder="请选择" clearable>
-                  <el-option v-for="item in companyList" :key="item.value" :label="item.lable" :value="item.value">
+                  <el-option v-for="item in companyList" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -79,10 +93,10 @@
               </el-table-column> -->
               <el-table-column fixed="left" width="70" type="index" label="序号" header-align="center" align="center">
               </el-table-column>
-              <el-table-column prop="agencyId" fixed="left" label="所属区划" header-align="left" align="left"></el-table-column>
+              <el-table-column prop="agencyName" fixed="left" label="所属区划" header-align="left" align="left"></el-table-column>
-              <el-table-column prop="type" label="组织类别" header-align="left" align="left">
+              <el-table-column prop="keyUnitName" label="组织类别" header-align="left" align="left">
               </el-table-column>
-              <el-table-column prop="buildingType" label="企业性质" header-align="left" align="left" >
+              <el-table-column prop="propertyName" label="企业性质" header-align="left" align="left" >
               </el-table-column>
               <el-table-column prop="name" label="组织名称" header-align="left" align="left" >
               </el-table-column>
@@ -95,8 +109,14 @@
               <el-table-column prop="legalUserPhone" header-align="left" align="left"  label="法人电话">
               </el-table-column>
               <el-table-column prop="ninePlaceFlag" header-align="left" align="left"  label="是否九小场所">
+                <template slot-scope="scope"> 
+                  <span >{{ scope.row.ninePlaceFlag?"是":"否" }}</span>
+                </template>
               </el-table-column>
               <el-table-column prop="keyUnitType" header-align="left" align="left"  label="是否重点单位">
+                <template slot-scope="scope"> 
+                  <span >{{ scope.row.keyUnitType?"是":"否" }}</span>
+                </template>
               </el-table-column>
               <el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
                 <template slot-scope="scope">
@@ -148,6 +168,7 @@
     export default {
       data() {
         return {
+          orgTypeChiderList:[],
           //是否危化企业
           keyUnitList: [
             {
@@ -173,31 +194,31 @@
           companyList:[],//企业性质
           orgTypeList: [],//组织类型
           formData: {
-                  id: "",
+                  id: null,
-                  customerId: "",
+                  customerId: null,
-                  delFlag: "",
+                  delFlag:null,
-                  revision: "",
+                  revision:null,
-                  createdBy: "",
+                  createdBy:null,
-                  createdTime: "",
+                  createdTime:null,
-                  updatedBy: "",
+                  updatedBy:null,
-                  updatedTime: "",
+                  updatedTime:null,
-                  agencyId: "",
+                  agencyId:null,
-                  type: "",
+                  type:null,
-                  property: "",
+                  property:null,
-                  name: "",
+                  name:null,
-                  socialCreditCode: "",
+                  socialCreditCode:null,
-                  legalUserName: "",
+                  legalUserName:null,
-                  legalUserIdCardType: "",
+                  legalUserIdCardType:null,
-                  legalUserIdCard: "",
+                  legalUserIdCard:null,
-                  legalUserPhone: "",
+                  legalUserPhone:null,
-                  keyUnitFlag: "",
+                  keyUnitFlag:null,
-                  keyUnitType: "",
+                  keyUnitType:null,
-                  ninePlaceFlag: "",
+                  ninePlaceFlag:null,
-                  ninePlaceType: "",
+                  ninePlaceType:null,
-                  dangerCompanyFlag: "",
+                  dangerCompanyFlag:null,
-                  registerAddress: "",
+                  registerAddress:null,
-                  longitude: "",
+                  longitude:null,
-                  latitude: ""
+                  latitude:null
               },
           showinfo:false,
           pageSize:20,
@@ -271,11 +292,76 @@
   
       },
       methods: {
+                //获取当前列表
+                async getTableData() {
+              // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+              const url = "/gov/org/customerAgencyUnit/page";
+              let params = {
+                page:this.pageNo,
+                limit:this.pageSize,
+                ...this.formData
+  
+              }
+              const { data, code, msg } = await requestPost(url, params)
+              if (code === 0) {
+                console.log("列表请求成功！！！！！！！！！！！！！！");
+                this.total = data.total || 0;
+                data.list
+                this.tableData = data.list
+                this.tableData.forEach(item => {
+                //  let arr1=this.orgTypeList.forEach(item1 => {
+                //   const user=item1.children.filter(item2=>
+                //     item2.value==item.type,
+                //     )
+                //     console.log(user,"skjdgls");
+                    
+                //     return user
+                //   })
+            let arr1 =this.companyList.find(item1=>item1.value==item.property)
+            console.log(arr1,"sdlkjgflksdjg");
+                  item.propertyName=arr1.label
+                })
+          
+                
+              } else {
+              }
+            },
+        //获取当前组织
+        getOrgTreeList() {
+          this.$http
+            .post("/gov/org/customeragency/agencygridtree", { orgTypeFilter: this.orgTypeFilter })
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                return this.$message.error(res.msg);
+              } else {
+                this.orgOptions = [];
+                this.orgOptions.forEach(item => {
+                  item.subAgencyList.forEach(item2 => {
+
+                  })
+                })
+                this.orgOptions.push(res.data);
+                console.log(this.orgOptions, "this.orgOptions");
+
+              }
+            })
+            .catch(() => {
+              return this.$message.error("网络错误");
+            });
+        },
+        //组织类型的二级选择
+        changeType(value){
+            const selectedItem = this.orgTypeList.find(item => item.value === value);
+            this.orgTypeChiderList=selectedItem.children
+            console.log('Selected Item:', selectedItem.children);
+            // console.log(value,"DSKLJFSKLDG");
+            
+        },
         //企业性质
         async companynature() {
           const url = '/sys/dict/data/dictlist';
           let params = {
-            dictType: "company_nature"
+            dictType: "org_unit_nature"
           };
           const { data, code, msg } = await requestPost(url, params);
           if (code === 0) {
@@ -301,7 +387,7 @@
         async orgtype() {
           const url = '/sys/dict/data/dictTree';
           let params = {
-            dictType: "org_type"
+            dictType: "org_unit_category"
           };
           const { data, code, msg } = await requestPost(url, params);
           if (code === 0) {
@@ -312,8 +398,8 @@
             this.$message.error(msg);
           }
         },
-           //分页查询
+        //分页查询
-           handleSizeChange(val) {
+        handleSizeChange(val) {
           this.pageSize = val;
           window.localStorage.setItem("pageSize", val);
           this.getTableData();
@@ -361,9 +447,33 @@
             return this.$message.error("网络错误");
           });
       },
-        handleProgress(event, file, fileList) {
+                  //删除
-  
+        handleDel(row) {
-  },
+          this.$confirm("删除之后无法回复，确认删除?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+            .then(() => {
+              let url = "/gov/org/customerAgencyUnit/delete"
+              let params = {
+                id: [row.id]
+              }
+              requestPost(url, [row.id]).then((res) => {
+                console.log(res, "res");
+                this.getTableData()
+
+              })
+            })
+            .catch(err => {
+              if (err == "cancel") {
+
+              }
+
+            });
+
+        },
+
         async uploadHttpRequest(file) {
               this.importLoading = true;
               this.importBtnTitle = '正在上传中...';
@@ -476,98 +586,15 @@
             });
         },
   
-                //删除
+    
-        handleDel(row) {
-          this.$confirm("删除之后无法回复，确认删除?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-            .then(() => {
-              let url = "/gov/org/customerAgencyUnit/delete"
-              let params = {
-                id: [row.id]
-              }
-              requestPost(url, [row.id]).then((res) => {
-                console.log(res, "res");
-                this.getTableData()
-
-              })
-            })
-            .catch(err => {
-              if (err == "cancel") {
-
-              }
-
-            });
 
-        },
-        //获取当前列表
-        async getTableData() {
-              // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-              const url = "/gov/org/customerAgencyUnit/page";
-              let params = {
-                page:this.pageNo,
-                limit:this.pageSize,
-                ...this.formData
-  
-              }
-              const { data, code, msg } = await requestPost(url, params)
-              if (code === 0) {
-                console.log("列表请求成功！！！！！！！！！！！！！！");
-                this.total = data.total || 0;
-                this.tableData = data.list
-                // console.log(this.tableData, "this.tableData");
-                // this.tableData.forEach(item => {
-                //   console.log(item,"item");
-                //   this.starList.forEach(item2 => {
-                //     console.log(item2,"item2");
-                //     if (item.starLevel == item2.id) {
-                //       console.log(item.starId,item2.id, "item2.name");
-                //       item.starName = item2.name
-                //       console.log(item2.name, "item2.name");
-                      
-                //     }
-                //   })
-             
-                // })
-                console.log(this.tableData, "this.tableData1");
-                
-  
-              } else {
-              }
-            },
         //选择当前组织
         handleChangeAgency(val) {
               console.log(val);
               this.redeemerOrgId = val
   
             },
-        //获取当前组织
+
-        getOrgTreeList() {
-          console.log("ds;lfjksdl;");
-          
-        this.$http
-          .post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            } else {
-              this.orgOptions = [];
-              this.orgOptions.forEach(item => {
-                item.subAgencyList.forEach(item2 => {
-                  
-                })
-              })
-              this.orgOptions.push(res.data);
-              console.log(this.orgOptions,"this.orgOptions");
-              
-            }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
-      },
           handleDetail(row){
               this.formTitle = '查看'
               this.showinfo = true
@@ -583,7 +610,7 @@
               this.formTitle ='新增'
               this.showAdd = true
               this.$nextTick(() => {
-          this.$refs.ref_form.initForm("add", "");
+          this.$refs.ref_form.initForm("add",null);
         });
       },
         handleEdit(row) {
@@ -615,29 +642,29 @@
         },
         //重置搜索条件
         resetSearch() {
-          this.formData.latitude = "";
+          this.formData.latitude =null;
-          this.formData.longitude = "";
+          this.formData.longitude =null;
-          this.formData.registerAddress = "";
+          this.formData.registerAddress =null;
-          this.formData.dangerCompanyFlag = "";
+          this.formData.dangerCompanyFlag =null;
-          this.formData.ninePlaceType = "";
+          this.formData.ninePlaceType =null;
-          this.formData.ninePlaceFlag = "";
+          this.formData.ninePlaceFlag =null;
-          this.formData.keyUnitFlag = "";
+          this.formData.keyUnitFlag =null;
-          this.formData.legalUserPhone = "";
+          this.formData.legalUserPhone =null;
-          this.formData.legalUserIdCard = "";
+          this.formData.legalUserIdCard =null;
-          this.formData.legalUserIdCardType = "";
+          this.formData.legalUserIdCardType =null;
-          this.formData.legalUserName = "";
+          this.formData.legalUserName =null;
           this.formData.socialCreditCode ="";
-          this.formData.name = "";
+          this.formData.name =null;
-          this.formData.property = "";
+          this.formData.property =null;
-          this.formData.type = "";
+          this.formData.type =null;
           this.formData.agencyId ="";
-          this.formData.updatedTime = "";
+          this.formData.updatedTime =null;
-          this.formData.updatedBy = "";
+          this.formData.updatedBy =null;
-          this.formData.delFlag = "";
+          this.formData.delFlag =null;
           this.formData.revision ="";
-          this.formData.createdBy = "";
+          this.formData.createdBy =null;
-          this.formData.createdTime = "";
+          this.formData.createdTime =null;
-          this.formData.customerId = "";
+          this.formData.customerId =null;
         },
   
   
@@ -720,7 +747,7 @@
           // display: none;
           // background: none !important;
           // border: 0px;
-          // content: "";
+          // content:null;
           // width: 18px;
           // height: 18px;
         }

src/views/modules/home/index.vue

@@ -90,6 +90,41 @@
             <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
           </div>
           <div class="wrap" style="padding: 10px;">
+            <div class="warp_list" >
+              <div class="item"   @click="goToPage('one')">
+                <div>
+                  <img src="@/assets/images/home/1/1.png" class="img" />
+                </div>
+                <div style="margin-left: 5px">党建引领基层治理政权平台</div>
+              </div>
+              <div  class="item" @click="goToPage('two')">
+                <div >
+                  <img src="@/assets/images/home/1/2.png" class="img" />
+                </div>
+                <div style="margin-left: 5px">志愿服务平台</div>
+              </div>
+              <div  class="item" @click="goToPage('three')" >
+                <div>
+                  <img src="@/assets/images/home/1/3.png" class="img" />
+                </div>
+                <div style="margin-left: 5px">新新向党-两企三新平台</div>
+          
+              </div>
+              <div  class="item" @click="goToPage('five')" >
+                <div>
+                  <img src="@/assets/images/category/welfare.png" class="img" />
+                </div>
+                <div style="margin-left: 5px">中国社会工作网</div>
+                
+              </div>
+              <div  class="item" @click="goToPage('four')" >
+                <div>
+                  <img src="@/assets/images/category/welfare.png" class="img" />
+                </div>
+                <div style="margin-left: 5px">市社工部一张表平台</div>
+                
+              </div>
+            </div>
             <div class="m-list" v-if="searchStatus == 'ini'">
               <div class="list">
                 <div class="item" :key="item.menuId" @click="handleClickFunc(item)" v-for="item in funcList">
@@ -735,6 +770,17 @@ this.getActiveUsers()
     );
   },
   methods: {
+    goToPage(item){
+      if(item==="one"){
+        window.location.href = 'https://zqsq.mca.gov.cn/CAFP/LEAP/Login/00/CAFP/Login.html';
+      }else if(item=="two"){
+        window.location.href = 'https://chinavolunteer.mca.gov.cn/site/home';
+      }else if(item=="three"){
+        window.location.href = 'https://chinavolunteer.mca.gov.cn/site/home';
+      }else if(item=="five"){
+        window.location.href = 'https://shgz.mca.gov.cn/SWMS/LEAP/swmss/index.html#/web';
+      }
+    },
     getStatisticsList1(value){
       this.initChart1()
       this.initChart2()
@@ -2138,5 +2184,26 @@ this.getStatistics()
   .operate {
     text-align: right;
   }
+  
 }
+.warp_list{
+            display: flex;
+            width: 100%;
+            flex-direction: row;
+            .item{
+              display: flex;
+              align-items: center;
+              justify-content: space-around;
+                margin: 0 10px;
+                padding: 10px;
+                width: 20%;
+                height: 70px;
+                background-color: #f7faff;
+                font-size: 16px;
+                img{
+                  width: 45px;
+                  height: 45px;
+                }
+            }
+        }
 </style>

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

@@ -106,6 +106,14 @@
                     ]">
                         <span class="u-info-title-2">证件号：</span>
                         <span>{{ info.idCard ? info.idCard : "--" }}</span>
+                    </div>
+                                        <div :class="[
+                        'm-info-prop',
+                        { 'm-info-prop-vis': source === 'visiual' },
+                    ]" v-if="info.openFlag">
+                        <span class="u-info-title-2">开启表决：</span>
+                        <span>支持： {{ info.supportNum }}</span>
+                        <span style="margin-left: 20px;">反对： {{ info.opposeNum }}</span>
                     </div>
                     <div :class="[
                         'm-info-prop',

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

@@ -16,8 +16,10 @@
                             <!-- <el-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
               <el-form-item label="类型" prop="type" label-width="100px"> -->
                             <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options"
-                                :disabled="showdisabled" :props="{emitPath: false,
+                                :disabled="showdisabled" :props="{
-                multiple: false, }"></el-cascader>
+                emitPath: false,
+                multiple: false,
+            }"></el-cascader>
                         </el-form-item>
 
 

src/views/modules/workSys/sysConfigure/index.vue

@@ -9,18 +9,25 @@
                         <h3>12345政务热线</h3>
                         <div class="m-table"
                             style=" width: 100%; display: flex; flex-direction:column;align-items: center;justify-content: space-between;">
-                            <div v-for="(item,index) in sysAdvancedList "  style=" border-bottom: 1px dotted #000;width: 100%; display: flex; flex-direction: row;align-items: center;justify-content: space-between;">
+                            <div v-for="(item,index) in sysAdvancedList "
-                                <div style="display: flex; flex-direction: column;" >
+                                style=" border-bottom: 1px dotted #000;width: 100%; display: flex; flex-direction: row;align-items: center;justify-content: space-between;">
-                                    <h4>{{ item.advancedName  }}</h4>
+                                <div style="display: flex; flex-direction: column;">
-                                    <h4 v-if="item.remark">{{ item.remark.slice(0, 7) }}
+                                    <h4 v-if="item.advancedName=='联系当事人时限'">设置“联系当事人时限”默认值:</h4>
-                                         <el-input-number v-model="item.timeInterval" @change="handleChange(item)"  style="width: 150px;"
+                                    <h4 v-if="item.advancedName=='办结时限'">设置“(部门)办结时限”默认值:</h4>
-                                            :min="1"  label="描述文字"></el-input-number>{{ item.remark.slice(-2) }}
+                                    <h4 v-if="item.advancedName=='短信通知'">派件是否默认开启短信通知部门负责人:</h4>
-                                        </h4>
+                                    <h4 v-if="item.advancedName == '联系当事人时限'">“联系当事人时限”设置为“派件时间”之后的
-                                    
+                                        <el-input-number v-model="item.timeInterval" @change="handleChange(item)"
+                                            style="width: 150px;" :min="1" label="描述文字"></el-input-number>小时
+                                    </h4>
+                                    <h4 v-if="item.advancedName == '办结时限'">(部门)办结时限”设置为“(上级)办结时限”的前
+                                        <el-input-number v-model="item.timeInterval" @change="handleChange(item)"
+                                            style="width: 150px;" :min="1" label="描述文字"></el-input-number>小时
+                                    </h4>
+                    
                                 </div>
                                 <div>
-                                    <el-switch   v-model="item.openFlag" active-color="#13ce66" inactive-color="#eaecf0"  :active-value=1
+                                    <el-switch v-model="item.openFlag" active-color="#13ce66" inactive-color="#eaecf0"
-                                    :inactive-value=0 @change="handleSwitch(item)">
+                                        :active-value=1 :inactive-value=0 @change="handleSwitch(item)">
                                     </el-switch>
                                 </div>
                             </div>
@@ -70,12 +77,12 @@
                             <div style="display: flex; flex-direction: column;">
                                 <h3>文明币有效期设置：</h3>
                             </div>
-                            <div style="margin-left: 20px;margin-top: 12px; display: flex; flex-direction: column;" >
+                            <div style="margin-left: 20px;margin-top: 12px; display: flex; flex-direction: column;">
                                 <template>
                                     <el-radio v-model="radio" label="1">永久有效</el-radio>
                                     <el-radio v-model="radio" label="2" style="margin-top: 10px;">
-                                        <el-input-number v-model="num" @change="handleChange" :min="1"  style="width: 150px;"
+                                        <el-input-number v-model="num" @change="handleChange" :min="1"
-                                        :max="10" label="描述文字"></el-input-number>（个月）
+                                            style="width: 150px;" :max="10" label="描述文字"></el-input-number>（个月）
                                     </el-radio>
                                 </template>
                             </div>