bugbug

src/i18n/zh-CN.js

@@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'
 
 t.brand = {}
-t.brand.lg = 'e联社区数智平台'
+t.brand.lg = '临沂市孤困老人志愿服务团数字化服务平台'
 t.brand.mini = '数字'
-t.brand.work = 'e联社区数智平台'
+t.brand.work = '临沂市孤困老人志愿服务团数字化服务平台'
 t.brand.workMini = '工作端'
 
 t.add = '新增'

src/views/dataBoardMain/main.vue

@@ -109,6 +109,24 @@ export default {
       this.$store.state.mainShuju.activeName = tab.menuId;
       this.$store.state.mainShuju.contentTabsActiveName = tab.name;
     },
+    		//获取团长信息
+        async	getCommanderByUserId(userId){
+			const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
+			const { data, code, msg } = await requestGet(url);
+			console.log(data,"sdfjldsflk1;");
+      if (code === 0) {
+        console.log(this.$store.state.user, "sd;klfdslk");
+        this.$store.state.user = {
+          volunteerOrgId: data.volunteerOrgId,
+          volunteerOrgName: data.volunteerOrgName,
+          commander: data.commander,
+          ...this.$store.state.user
+        };
+        console.log(this.$store.state.user, "sd;klfdslk");
+
+      }
+
+		},
     // 获取当前管理员信息
     async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
@@ -118,6 +136,7 @@ export default {
         this.$store.state.user = {
           ...data,
         };
+        this.getCommanderByUserId(data.id);
         localStorage.setItem("roleList", data.roleList);
         localStorage.setItem("customerId", data.customerId);
         localStorage.setItem("staffId", data.id);

src/views/main-shuju/main.vue

@@ -64,6 +64,7 @@ export default {
   async created() {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
+
     Promise.all([this.getWorkUserInfo()]).then(() => {
       this.loading = false;
     });
@@ -109,6 +110,24 @@ export default {
       this.$store.state.mainShuju.activeName = tab.menuId;
       this.$store.state.mainShuju.contentTabsActiveName = tab.name;
     },
+    		//获取团长信息
+		async	getCommanderByUserId(userId){
+			const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
+			const { data, code, msg } = await requestGet(url);
+			console.log(data,"sdfjldsflk1;");
+      if (code === 0) {
+        console.log(this.$store.state.user, "sd;klfdslk");
+        this.$store.state.user = {
+          volunteerOrgId: data.volunteerOrgId,
+          volunteerOrgName: data.volunteerOrgName,
+          commander: data.commander,
+          ...this.$store.state.user
+        };
+        console.log(this.$store.state.user, "sd;klfdslk");
+
+      }
+
+		},
     // 获取当前管理员信息
     async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
@@ -116,6 +135,7 @@ export default {
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.$store.state.user = { ...data };
+       await this.getCommanderByUserId(data.id);
         localStorage.setItem("roleList", data.roleList);
         localStorage.setItem("customerId", data.customerId);
         localStorage.setItem("staffId", data.id);

src/views/main.vue

@@ -138,16 +138,23 @@ export default {
 					: [];
 		},
 		//获取团长信息
-		async	getCommanderByUserId(userId){
+		//获取团长信息
-			const url = "/voluntary/volunteerOrg/getCommanderByUserId/"+userId;
+		async getCommanderByUserId(userId) {
+			const url = "/voluntary/volunteerOrg/getCommanderByUserId/" + userId;
 			const { data, code, msg } = await requestGet(url);
-			console.log(data,"sdfjldsflk;");
+			console.log(data, "sdfjldsflk1;");
-			if (code===0) {
+			if (code === 0) {
-				this.$store.state.user.volunteerOrgId=data.volunteerOrgId
+				console.log(this.$store.state.user, "sd;klfdslk");
-				this.$store.state.user.volunteerOrgName=data.volunteerOrgName
+				this.$store.state.user = {
-				this.$store.state.user.commander=data.commander
+					volunteerOrgId: data.volunteerOrgId,
+					volunteerOrgName: data.volunteerOrgName,
+					commander: data.commander,
+					...this.$store.state.user
+				};
+				console.log(this.$store.state.user, "sd;klfdslk");
+
 			}
-			
+
 		},
 		// 获取当前管理员信息
 		async getWorkUserInfo() {

src/views/modules/home/index.vue

@@ -32,8 +32,8 @@
                 <!-- <img src="@/assets/images/index/title-icon-zntb.png" /> -->
               </div>
               <div style="margin-top: 10px;">
-                <el-cascader class="u-item-width-normal" size="small" ref="myCascader" v-model.trim="formData.agencyId"
+                <el-cascader class="u-item-width-normal" size="small" ref="myCascader" 
-                  :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"
+                  :options="orgOptions" :checkStrictly="true" :emitPath="false" :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"
                   clearable></el-cascader>
               </div>
             </div>
@@ -352,15 +352,10 @@ export default {
       }
     },
     handleChangeAgency(val) {
-
+      console.log(val,"sfdsdl;ksdl;");
-      this.sarr = []
+      this.formData.agencyId=this.formData.agencyId.toString()
-      const map = new Map();
+      this.initChart()
-      this.getLastItem(
+      this.initEcharts();
-        this.orgOptions,
-        val,
-        "agencyId"
-      );
-      this.level = this.sarr[this.sarr.length - 1].level
     },
     //获取街道
     getOrgTreeList() {
@@ -391,7 +386,7 @@ export default {
     initChart() {
       const url = "/voluntary/volunteerInfo/homePage/staticAgencyVolunteerInfo";
       let params = {
-        agencyId:""
+        agencyId:this.formData.agencyId
       };
     requestGet(url,params).then(res=>{
       const chartDom = this.$refs.chart;
@@ -483,7 +478,7 @@ export default {
     initEcharts() {
       const url = "/voluntary/volunteerInfo/homePage/staticVolunteerInfoByTime";
       let params = {
-        agencyId: ""
+        agencyId: this.formData.agencyId
       };
       requestGet(url, params).then(res => {
         console.log(res, "s2342df;lsdl;");

src/views/modules/informationArchive/elderlyArchives/cpts/add-old.vue

@@ -8,7 +8,7 @@
                         <el-col :span="16">
                             <el-col :span="12">
                                 <el-form-item label="所属服务团" prop="volunteerOrgId" label-width="100px">
-                                    <el-select class="u-item-width-normal" v-model.trim="formData.volunteerOrgId"
+                                    <el-select class="u-item-width-normal" v-model.trim="formData.volunteerOrgId" :disabled="disabled"
                                         size="small" placeholder="请选择" clearable>
                                         <el-option v-for="item in typeList" :key="item.id" :label="item.orgName"
                                             :value="item.id">
@@ -364,7 +364,7 @@
             formType:"add",
             agencyIdArray: [],
             formData: {
-                volunteers:"1",
+                volunteers:1,
                 volunteerOrgId: '',
                 orgIdPath: '',
                 headImg: '',
@@ -456,14 +456,20 @@
                     label: "是"
                 },
             ],
-            ServiceGroupList:[]
+            ServiceGroupList:[],
-
+            disabled:false
         }
 
+
     },
  
     components: {Tinymce, UploadImage  },
     mounted() {
+        // const { user } = this.$store.state
+        // if (user.commander) {
+        //     this.disabled = true
+        //     this.formData.volunteerOrgId = user.volunteerOrgId
+        // }
         this.getelderlyStatus()
         this.gethealthStatus()
         this.loadNations()
@@ -558,7 +564,7 @@
             }
         },
         async initForm(row, type) {
-            this.startLoading()
+            // this.startLoading()
             this.formType = type
             if (type === 'edit') {
                 this.formData = row
@@ -578,7 +584,7 @@
                 this.formData = {
                 }
             }
-            this.endLoading()
+            // this.endLoading()
  
         },
         async handleComfirm() {
@@ -617,7 +623,7 @@
                 let url = '/voluntary/elderlyInfo/save'
                 let combinedString = this.typefatherId + "," + this.childrenId;
                 this.formData.serviceDemand=combinedString
-                this.formData.statusCategory=this.formData.statusCategory.join(",")
+                this.formData.statusCategory=this.formData.statusCategory?this.formData.statusCategory.join(","):this.formData.statusCategory
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
                     this.$message({

src/views/modules/informationArchive/elderlyArchives/index.vue

@@ -415,7 +415,6 @@
         if (code === 0) {
           this.tableData = data.list
           this.total=data.total
-   
         } else {
           this.$message.error(msg)
         }
@@ -666,7 +665,7 @@
           });
   
           // this.loadTable()
-          this.communityActivityList()
+          this.getElderlyInfo()
         } else {
           this.$message.error(msg)
         }
@@ -718,7 +717,7 @@
     computed: {
       tableHeight () {
   
-        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 470
+        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 450
   
       },
   

src/views/modules/informationArchive/volunteerProfile/index.vue

@@ -5,7 +5,7 @@
         <div>
           <el-form-item label="所属组织" prop="agencyId">
             <el-cascader ref="org" v-model.trim="formData.agencyId" :options="organizationList" :show-all-levels="false"
-              :props="{ checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
+              :props="{   label: 'objectName', value: 'objectId',children: 'children',checkStrictly: true, multiple: false, emitPath:false }" style="width: 200px" clearable
             >
             </el-cascader>
           </el-form-item>
@@ -108,7 +108,7 @@
 
     <el-dialog :visible.sync="toExamineShow" v-if="toExamineShow" :close-on-click-modal="false" :close-on-press-escape="false"
       title="审核" width="750px" top="5vh" class="dialog-h">
-      <service-team :closeExamine="closeExamine" v-if="toExamineShow" ref="ref_examine" 
+      <service-team @closeExamine="closeExamine" v-if="toExamineShow" ref="ref_examine" 
        ></service-team>
     </el-dialog>
 
@@ -235,7 +235,7 @@
       // 获取所属组织列表
       getFormInfo() {
         this.$http
-          .post(`/gov/org/agency/getOrgTreeListByCustomerId`)
+          .post(`/gov/org/userhouse/service/serviceScopeTree`)
           .then(({ data: res }) => {
             if (res.code !== 0) {
               return this.$message.error(res.msg);

src/views/pages/login.vue

@@ -6,8 +6,11 @@
         <img src="@/assets/img/login/loginLeft.png" width="720px" height="586px" class="i-left">
       </div>
         <div class="fm">
-          <img src="@/assets/images/index/logo.png" width="50px" height="50px" class="i-logo">
+          <img src="@/assets/images/index/linyi.png" width="50px" height="50px" class="i-logo">
-          <h2 class="title">{{ $t("brand.work") }}</h2>
+          <div>
+   <h2 class="title" style="max-width: 24em; word-break: break-word;">{{ $t("brand.work") }}</h2>
+          </div>
+       
           <el-form
             :model="dataForm"
             :rules="dataRule"