From b390da4448f1f30ef287b4b06b69c2d17660cfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 6 Dec 2024 10:44:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=8D=95=E4=BD=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/home/1/1.png                | Bin 0 -> 903 bytes
 src/assets/images/home/1/2.png                | Bin 0 -> 2077 bytes
 src/assets/images/home/1/3.png                | Bin 0 -> 1792 bytes
 src/assets/images/home/1/4.png                | Bin 0 -> 1804 bytes
 src/assets/scss/modules/index.scss            |  11 +-
 src/views/modules/base/orgUnitManger/add.vue  |  23 +-
 .../modules/base/orgUnitManger/index.vue      | 319 ++++++++++--------
 src/views/modules/home/index.vue              |  67 ++++
 .../shequzhili/eventOld/cpts/event-detail.vue |   8 +
 .../volunteer/LifeCircleManagement/add.vue    |   6 +-
 .../modules/workSys/sysConfigure/index.vue    |  33 +-
 11 files changed, 300 insertions(+), 167 deletions(-)
 create mode 100644 src/assets/images/home/1/1.png
 create mode 100644 src/assets/images/home/1/2.png
 create mode 100644 src/assets/images/home/1/3.png
 create mode 100644 src/assets/images/home/1/4.png

diff --git a/src/assets/images/home/1/1.png b/src/assets/images/home/1/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..304e81da1620b43036638303524bf3ecefe5c049
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&0009{Nkl<ZXo2mT
z%S%*I9LGO1qoX2Gib!gUO3N_l-69teM7tIiRz#crfC?%oTt`LOvKIXbJuF>?J&+JG
z$Q}qSDpRv&G)lu9$LHLMpZAP&H6Pb|tb1qh3kPP-J@?%2$MZXnx&D0LBXMR?5U5gR
z4^XV?+)xDg2D}9x0u8{}Odqp>90INbWiA<CNbSHy;DNQB-|{&CTvH9a3W4%gr@RId
zl^K=>SAYxdcypwLR~enD(5eRRr4WQwM}YeRB9r(tu*N&y7Nrod-mi#K6+%=39QCUu
zHq})nAiL85WS4-f_J9#x6$waIYBNkK=(o`*CA19UHD&1dX$rxUuMjijjNrT<`D<<~
zfMXk+_n`%H_Y;i9bb3gtvD-xuxp~-_UKb3&m;<<Az(%8aq%}wUJ}?Z3$IY^@1kP^<
z;%3Kk&2C}V-*^8BMCOJRUmQ-9!^sLL&x6aAP?(dvZnwAw5|4oqgVAw#+Lf#iMWB1Y
zyk@t=HRqbv9EruuA{ritmM}!dpnn)9CKlP3#;S)lh>-*d|ArecHTrTB#84w59(EK#
zel`UB=BkygdhU(Do8E={a(6@&h^$`6E1)d@?>4PrconkImlr}yqU+2fJtHyA!_tz3
zmMAY9a)V%4_5=Bt6@cK3rv!ZPV+ejmlXb3wSVQaT0a%x3|K8_aaH%Qz-Eb8|g_i7P
zHI3#3pKF7boj)^R9z_JaFPa=pycAmD0X-wGgGiAj_x54fR5*Q(SS6#-+zB;vEDElM
z)`U7kN!T>Jhn6o8n+K$;f9^BYT=&_P7Rb<u8Wnl--KJ+GI-+;K7Dz!Z3~CyflIDge
z?|vN*YWFX=^A4IjoKN;uIZ(M4s<*<HVy8|tL9BZG0iJy{p+;?-e8v3UQaHF7ax(Rw
zzhoc@^+(}FC)Bk;N8j{StZ0R4eE&u$S-F%?{Rbd!Y54`6*OXQugC6jqt1$uTNo|Hn
z^$3XO;ldMY6_ENg0I5%xe@~bCRf5Vn4;XT)v%qL#`IW4PTDKiJP;DY(!@7^u05?;G
z0Jx<*Ps$1+zrIhayp(o#yxEd?lWdJs%JZb=OFWatlDoB2rAaKoVcU_$)r5Yn63--*
drYD{Oe*glcTm2w8=K}x$002ovPDHLkV1iqgnkfJP

literal 0
HcmV?d00001

diff --git a/src/assets/images/home/1/2.png b/src/assets/images/home/1/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..39071b330181522d35d144fe401ddbc6d5eaf11f
GIT binary patch
literal 2077
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/home/1/3.png b/src/assets/images/home/1/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..140e60a4c0ba90df0433ae74b2f5f0ed9a501ff0
GIT binary patch
literal 1792
zcmaJ?X;2eq7>)vpk;B9*BI3Fro@A3i0*Q$n*~CN)G8l`EqZpEf1lVj$786pBOg$!1
z)Z$ewlom!s42n997B8$tz$%Iea#X2j>wO@H3Q9Ltus=$7X7@Yhd7k%q-|ziq?eTGQ
zyvcrK5{cw3mB0za$a1}&Lx^ucr0pm%jKf8X@C8^3Zc-W$QnVUNMgS?QOhpn9r8;Z*
zMTAcxxdm$Fi||FVc{~+{(v>a@-Hhr9Hi^WKH0zbBbOZ;IkyNct0KPa?4gy-W08C`d
z7&5&O(P$+W1G2ypCs$e0Ra`X~IUC@cd4vFp;7Y)ZX6TGOvjF_4%OmElZ3qNDLhy6}
z_>ZYYvUos<84!R?=Y*)3VG%$$m(JvbF+w>r0TzSFg%}YKGc<(3<S{rrb~y0q0f}e^
zbqX&57JrIGtOTG2$Mrl2GMP+tQz#uXq(V$Cm(XBAELI4C2r*{qaHTm!XAJC9fDxn0
zpw;7AOb56WmC0BpE&vIq|D=HG`(<^;Ph}zs2AP$5h)HL-QtAWBWd9FE(SEcMPe4BV
z{ZC<|JWG#235XHPG^mJ!O9^y^(({A{M2TYtIfiBQRWV+J;h0f_=>ZmD37DFw)u}O)
zaoR_MOvaPyjJQ&#LZq+&BqZost(wQ;io#>y=&%@;h{a@z#1SkQhQ&gm7-q1;*b$;W
zE{v%%QACILan+x>>;bv1UO@FkWEe4MS0HM!0Yib0IrFpwdtnWz_lc_>*h}buT!=6O
zxlZ<9C*8M2w2y1r-?zk~zw;3t(e4JKuXAW!3yJGul)}++bIVOdtY&01?L)BidOJE%
z^Gt{?wA4;d@VKxRAd|rk`vDIKJkZdxR`haaeE@vKHU$bGqt3@ttkpdUuq~T$ymJ`3
z&s&@ueCkPf^P#;QIhB(;Z}pp$?addT_tr%A_VmsZ_xNN7ZZO-$!%x}B4*KY}?X*d=
zN6fbsRrHi^hP}W!w%;p;>@D&dfmYmmI5)9AHT;^6ElH#v!JjzsOh|4i^t%Zj7EbuG
z))`{aOqg=AV1FK938FlzNU~2C*|Vum`lg(NL3`!YDNAmQa-0mC3(jI$t5-<(^4)AD
zyWnG?R$JqGFG{yv6B=dC-tC^ftf#!IE4W>;Rq$IcX>jQQch%#bu~EK^dKSNoJSa&J
zucuYt`t=3(5?|%FTZ3$TL!HVWbArqQ{Fc8@em-&&WAsh(x((LiSwZL8FMGbP>I~Xh
zK6Wb4<G#KSM{?Iac-<p7H&e+d9$iv89=A#&zlz{rSgL}$f0!Kc<LhA)51sS6wR^Fp
z^l;?c*<f2|G;MHlXIYlaT|olFybFe^T1^$rn~$Z8k<k73I8Qs<x1!^s;IrvSYzsx2
z@h+svH)ml@@rtGo)hR)hlkZqHJM!+ePuu1;$G#&UnN;6NF**vZzdRdJ6yG$w%3ghC
zaptvS8*B7=lGZVQ#(Q@v;NeBV-3^zZBi2=(SN8>Xv*-HMC2c%lUGu1>ghe~+HzT^o
zgOYc9hv4|is`}$a(>IUx`bMVTjEkF_hoZM+iYHzew0gbg$_+2eQ;zdInN?4@5i#d4
z`0ww?SmP&-OU})Em0Er@fa<^gubQ~)F=yGe9Mdbsp;q#>>ci`nt^}x;+YdUnY(J7&
z>?lR;6{N10ZqCN1;t%_6s!dUmt8SlZ$@Nt<yp?Rc6L7MWLpjr<S!YXc^Jsh>O2&qk
z84D7_M7tdMn5m()u`X?K%^h}|Em5`v+;C#lJ96bHG~oF)`g)UJ;1^}dTYh@sJ0b9{
zv{Kly?N)6Xo%yWkA&s)9usWlZly>Q~zv5neQsv~Ft>dEZ9}24bb`boI_29*$jykZ-
zI@fXj#?NB+v3G6!j@kmi?i1T38uV(&^7)gf-|xB-3!a*n{hcyDcAP{tI3YYsaqrl^
z*MC@Pj-!ofGq38{=lH=nJHZRWUBdFUSuab*Gkx;kQ<jm=G+mjr(@8CJ{gb4kIQVeP
HvakOJz+=7T

literal 0
HcmV?d00001

diff --git a/src/assets/images/home/1/4.png b/src/assets/images/home/1/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cecaa591ba0cc6da94ebb012f026b8b0aef4456
GIT binary patch
literal 1804
zcmaJ?Yfuws6pb)a5JW(r6&06_D30W@;bF28C}D|-5Fkh;qP1+21!71xW*4)dRTKl!
z0mK)I0*a48t)kXwL0g$3;JYdm2NAWUP#?4+!e~1_=mtgmqjYC>zsH<&?z#87-|U8j
zxOwBp`HW*Q7~`c9B#|C@w%5^t{`y8(PSV39GFm|{z|%+*YQz|kYFvo{QXQI(C1R*L
zd--K7jKQ#HYLXPBLKX|Fa2*@9Vc3+;K(iT)un5Y4s<aphD6w>nUI_M`s|Nv%S_meG
z$ha~?6qccp<QTC9IdMs<9IZ;A1|!0OFbbvxbQp;OlrB?Gz?2Xi)`jW0ZJPrE!w^y{
z1mBrb$P$1k+=u}o>`;~p3g!cI1Z*fYm>U!t2=KU&fWzf;pdc0(g1Mn^$Q<DP1Jcoq
z>NGeJ5x<W`uY_O*Ng7}d$7C|GO+jqjn9hL&0$PK|;qh2Bf<<KONt9yg3Fe3bf)OgC
z#z1OtJz!Hrm3S5@1Zk)5QqUPb$m)srWugnlp-=+{VsmXNjR0k`|A*>yAJ7Duh<)_?
zpTa~^wgKZLVg#OLRM7{Q#<Ybpz)?mFC2?aCj%SWkF(CsdaUugZ06f|f5Rk0Vt8o)C
zYnULD!BRazqIwl3MT8(N!PaQhFi#K~B!+?_MZ9Pp1VxMaqNq@QhyX$mK?pB0L^Q%h
za8;HL(~~1y^+&E~RIaTTbOt&yf*Ca{Ftyl->ww{$Va@1X_@nB*=c-5dA{dp+q0Mk?
zC;P9H9@(PX$2R@YxAfve=VN-h-Hmi#D~}eW(br{-6p2itIyzHg;wQ>I!-HB&_eBSc
z>G5Abuk(>>EMj-|W`$1@m+ho2x@BJf10+B5q}dGBxX5o!OWn6_ooJV&NSf_zX{r*<
zl2i{o>*V=I&1JIu>w<_~$7i(?@XOr;6-1xQjxw)?y(%{H%|<a&mQ$D??M66G>+<Rf
z5lL1kNy`$XbKcKu1-dD>%+z7wrDfrSW#y5)MbcdO%%@Kjb&Zh)&A+m{LKPQ1RDZUl
z9k{NXZdG@9gorj$cJeW|t=Y)<%aU_usoU&%OVBoNZI;#_DZZO4vG+?<+JgtzONz%^
zY859o+{w2vcc(7eT(xJ-gdpt#;0nlf+230Yj4K~&sQJTgRre=dt65Fe*Q3-V=K1>S
zTkEQ!jrG9v^}m?56*LtA{Lf~V2QK3kSWC@bZvDn;=OvQdi_3wx+5GOj_}3)@UIXM>
z;_08~=<ufJ*v=mh-T*GymBa0^bz--ZE*7_V_cy1ZsGXC%ITB(yQwX+{s$1G1=iV(P
z9s_HK?BoK6bl1~2pQKP(J%eSnbyE&?Bs;BbE8EuRKuzm5zN$KWs4`B>^J|$i<jqbl
zZ_>1zpEs;Hc10#XxUg3cD^20M_~rTZ7tBQAXD-FvU!eO_e@l$HChYE;f3R?Ak)tsU
z@<XSdYct*JE8XY*=x8|ZtJz-b?DydDtuLJlqknf<!zmzIuSkwqi+hqU6rGL9htBsv
zRB(Uu-fV_Uql<VI*L1^fhsRc~Tpo}%U6a6EGo$M6kmvW(7UeVleb)2lbeCj%k7I=;
z8)V0|W5LK(6P|Xx48R&QM1ff={cfNMwe5OUZTFs(#li97!45p{JBO!JbPu2xe|G|5
zWvkOYz`X|oeY{dzmO9P6IDhbf`E1;lg%J@BQ!i|)y4eF2-Yroo1_#bw&)a2H!Vg^$
zYSly2W^~z0=KO^f&A}5v!AYwr?2-GOlE$NCMW#ISYLahwx8UB19nA;s^}paVlV?9!
z?*5nk>)8>fX2>gh&BaG1o~w5}B~px;yz^M)o0^W?g3m31?YWoi{GPWtAo)(4!za5v
zK6SOeS}PS_a@fAu`=@5vw*eCCgQdu(vC_dqst2K)NT#pC(ioL>ZPrAvZfdRT?v-<!
zWwE)1MV&EUwcc;w4&9-|<(KcXo>S$STMdamR4nU}dwVB!+ZmpG<E;~y@%7XE%EB1W
Q65Ibt8Xbq!h*H=61B6YtkN^Mx

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss
index ddb65000d..a7daf3666 100644
--- a/src/assets/scss/modules/index.scss
+++ b/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 {
diff --git a/src/views/modules/base/orgUnitManger/add.vue b/src/views/modules/base/orgUnitManger/add.vue
index 65bbd741e..bf7f8aaa4 100644
--- a/src/views/modules/base/orgUnitManger/add.vue
+++ b/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-select  style="width: 100px;" v-model="formData.type" placeholder="请选择"
+                        <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-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) {
diff --git a/src/views/modules/base/orgUnitManger/index.vue b/src/views/modules/base/orgUnitManger/index.vue
index f03e20e0d..4c9932c48 100644
--- a/src/views/modules/base/orgUnitManger/index.vue
+++ b/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="type" label="组织类别" header-align="left" align="left">
+              <el-table-column prop="agencyName" fixed="left" label="所属区划" header-align="left" align="left"></el-table-column>
+              <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: "",
-                  customerId: "",
-                  delFlag: "",
-                  revision: "",
-                  createdBy: "",
-                  createdTime: "",
-                  updatedBy: "",
-                  updatedTime: "",
-                  agencyId: "",
-                  type: "",
-                  property: "",
-                  name: "",
-                  socialCreditCode: "",
-                  legalUserName: "",
-                  legalUserIdCardType: "",
-                  legalUserIdCard: "",
-                  legalUserPhone: "",
-                  keyUnitFlag: "",
-                  keyUnitType: "",
-                  ninePlaceFlag: "",
-                  ninePlaceType: "",
-                  dangerCompanyFlag: "",
-                  registerAddress: "",
-                  longitude: "",
-                  latitude: ""
+                  id: null,
+                  customerId: null,
+                  delFlag:null,
+                  revision:null,
+                  createdBy:null,
+                  createdTime:null,
+                  updatedBy:null,
+                  updatedTime:null,
+                  agencyId:null,
+                  type:null,
+                  property:null,
+                  name:null,
+                  socialCreditCode:null,
+                  legalUserName:null,
+                  legalUserIdCardType:null,
+                  legalUserIdCard:null,
+                  legalUserPhone:null,
+                  keyUnitFlag:null,
+                  keyUnitType:null,
+                  ninePlaceFlag:null,
+                  ninePlaceType:null,
+                  dangerCompanyFlag:null,
+                  registerAddress:null,
+                  longitude:null,
+                  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.longitude = "";
-          this.formData.registerAddress = "";
-          this.formData.dangerCompanyFlag = "";
-          this.formData.ninePlaceType = "";
-          this.formData.ninePlaceFlag = "";
-          this.formData.keyUnitFlag = "";
-          this.formData.legalUserPhone = "";
-          this.formData.legalUserIdCard = "";
-          this.formData.legalUserIdCardType = "";
-          this.formData.legalUserName = "";
+          this.formData.latitude =null;
+          this.formData.longitude =null;
+          this.formData.registerAddress =null;
+          this.formData.dangerCompanyFlag =null;
+          this.formData.ninePlaceType =null;
+          this.formData.ninePlaceFlag =null;
+          this.formData.keyUnitFlag =null;
+          this.formData.legalUserPhone =null;
+          this.formData.legalUserIdCard =null;
+          this.formData.legalUserIdCardType =null;
+          this.formData.legalUserName =null;
           this.formData.socialCreditCode ="";
-          this.formData.name = "";
-          this.formData.property = "";
-          this.formData.type = "";
+          this.formData.name =null;
+          this.formData.property =null;
+          this.formData.type =null;
           this.formData.agencyId ="";
-          this.formData.updatedTime = "";
-          this.formData.updatedBy = "";
-          this.formData.delFlag = "";
+          this.formData.updatedTime =null;
+          this.formData.updatedBy =null;
+          this.formData.delFlag =null;
           this.formData.revision ="";
-          this.formData.createdBy = "";
-          this.formData.createdTime = "";
-          this.formData.customerId = "";
+          this.formData.createdBy =null;
+          this.formData.createdTime =null;
+          this.formData.customerId =null;
         },
   
   
@@ -720,7 +747,7 @@
           // display: none;
           // background: none !important;
           // border: 0px;
-          // content: "";
+          // content:null;
           // width: 18px;
           // height: 18px;
         }
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index caee50d3d..335c324b8 100644
--- a/src/views/modules/home/index.vue
+++ b/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>
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
index 803884c68..cd3cb24df 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
+++ b/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',
diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index 39db4f339..6817321a4 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/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,
-                multiple: false, }"></el-cascader>
+                                :disabled="showdisabled" :props="{
+                emitPath: false,
+                multiple: false,
+            }"></el-cascader>
                         </el-form-item>
 
 
diff --git a/src/views/modules/workSys/sysConfigure/index.vue b/src/views/modules/workSys/sysConfigure/index.vue
index c815139ef..b32071aff 100644
--- a/src/views/modules/workSys/sysConfigure/index.vue
+++ b/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 style="display: flex; flex-direction: column;" >
-                                    <h4>{{ item.advancedName  }}</h4>
-                                    <h4 v-if="item.remark">{{ item.remark.slice(0, 7) }}
-                                         <el-input-number v-model="item.timeInterval" @change="handleChange(item)"  style="width: 150px;"
-                                            :min="1"  label="描述文字"></el-input-number>{{ item.remark.slice(-2) }}
-                                        </h4>
-                                    
+                            <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 style="display: flex; flex-direction: column;">
+                                    <h4 v-if="item.advancedName=='联系当事人时限'">设置“联系当事人时限”默认值:</h4>
+                                    <h4 v-if="item.advancedName=='办结时限'">设置“(部门)办结时限”默认值:</h4>
+                                    <h4 v-if="item.advancedName=='短信通知'">派件是否默认开启短信通知部门负责人:</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
-                                    :inactive-value=0 @change="handleSwitch(item)">
+                                    <el-switch v-model="item.openFlag" active-color="#13ce66" inactive-color="#eaecf0"
+                                        :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;"
-                                        :max="10" label="描述文字"></el-input-number>（个月）
+                                        <el-input-number v-model="num" @change="handleChange" :min="1"
+                                            style="width: 150px;" :max="10" label="描述文字"></el-input-number>（个月）
                                     </el-radio>
                                 </template>
                             </div>