1

monkeyhouyi
1 parent ed244fda
Showing 7 changed files with 33 additions and 9 deletions
src/assets/images/user.png
src/store/modules/user.js
src/views/DisposalSuggestions/Form.vue
src/views/baseCaseHandling/Form.vue
src/views/baseSystemInfo/DetailForm.vue
src/views/homePage/components/Header.vue
src/views/homePage/components/UserInfoPage.vue
@@ -3,8 +3,6 @@ import { getToken, setToken, removeToken } from &#39;@/utils/auth&#39;
 import { resetRouter } from '@/router'
 import md5 from "js-md5"; // 密码加密
 const define = require('@/utils/define')
-import qs from 'qs'
-
  
 const user = {
     state: {
@@ -82,7 +80,10 @@ const user = {
             return new Promise((resolve, reject) => {
                 getInfo().then((res) => {
                     let { menuList, userInfo, permissionList } = res.data
-                    const avatar = (userInfo.headIcon == "" || userInfo.headIcon == null) || require("@/assets/images/user.jpg");
+                    const avatar = (userInfo.headIcon == '/api/File/Image/userAvatar/') ? require("@/assets/images/user.png") : userInfo.headIcon;
+                    // const avatar = (userInfo.headIcon == "" || userInfo.headIcon == null) || require("@/assets/images/user.jpg");
+                    console.log(avatar);
+                    
                     if (!menuList.length) {
                         reject('您的权限不足，请联系管理员')
                         commit('SET_LOGIN_LOADING', false)
@@ -109,7 +109,7 @@
               <div class="text">{{ dataForm.areaName || "--" }}</div>
             </div>
           </el-col>
-          <el-col :span="24" v-for="(v, i) in dataForm.judgmentOpinions" :key="i" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
+          <el-col :span="24" v-for="(v, i) in dataForm.judgmentOpinions" :key="i + 'judgmentOpinions'" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
             <div class="title">研判信息{{ i + 1 }}</div>
             <div class="form-item">
               <div class="label w-120">处置类型：</div>
@@ -120,7 +120,7 @@
               <div class="text">{{ v.judgmentOpinion }}</div>
             </div>
           </el-col>
-          <el-col :span="24" v-for="(v, index) in dataForm.disposalSuggestions" :key="index" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
+          <el-col :span="24" v-for="(v, index) in dataForm.disposalSuggestions" :key="index + 'disposalSuggestions'" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
             <div class="title">处置信息{{ index + 1 }}</div>
             <div class="form-item">
               <div class="label w-120">处置结果：</div>
@@ -620,6 +620,9 @@ export default {
             // this.companyChange(res.data.registeredEntity, 'change');
             this.dataForm = res.data;
             this.loading = false;
+            this.$nextTick(() => {
+              this.getSystemSelect(res.data.registeredEntity)
+            })
           }).catch(() => {
             this.loading = false;
           });
@@ -35,7 +35,7 @@
                     <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p>
                 </div>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" v-if="dataForm.systemType != '580634746028033285'">
                 <div class="form-item">
                     <div class="label w-120">备案号:</div>
                     <p class="text">{{ dataForm.systemRecordNumber || "--" }}</p>
@@ -299,8 +299,11 @@ import { getSystemDetail, getUpdataRecord } from &quot;@/api/baseData/info&quot;;
 import { getCompanyInfoById } from "@/api/baseData/company";
 import HandForm from '@/views/baseCaseHandling/Form.vue' // 案件处理
 import ReportForm from '@/views/baseInspectionReport/Form.vue' // 案件处理
+import infoMixin from "@/mixins/info";
+
 export default {
   components: {HandForm, ReportForm},
+  mixins: [infoMixin],
   props: ['areaOptions'],
   data() {
     return {
@@ -346,6 +349,7 @@ export default {
       stateOptions: [],
       HandFormVisible: false,
       ReportFormVisible: false,
+      specialRecordTypeOption: [],
     };
   },
   computed: {
@@ -357,9 +361,10 @@ export default {
     }
   },
   watch: {},
-  created() {
+  async created() {
     this.initStateTypeOption();
     this.initSystemTypeList();
+    await this.initSpecialRecordTypeOption();
   },
   mounted() {},
   methods: {
@@ -411,6 +416,7 @@ export default {
         await this.initSystemClassList(data.systemType);
         this.dataForm = data;
         this.dataForm.companyName = companyName;
+        this.dataForm.specialRecordType && (this.dataForm.specialRecordType = this.specialRecordTypeOption.find(v => v.id == this.dataForm.specialRecordType).fullName);
         this.loading = false;
     },
     async initSystemTypeList() {
@@ -21,7 +21,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <UserInfoPage ref="UserInfoPage" v-if="visbleUserInfo" @refresh="() => this.visbleUserInfo = false"/>
+    <UserInfoPage ref="UserInfoPage" v-if="visbleUserInfo" @refresh="visbleUserInfoRefresh"/>
   </header>
 </template>
  
@@ -39,6 +39,10 @@ export default {
   },
   mounted() {},
   methods: {
+    visbleUserInfoRefresh() {
+      this.avatar = process.env.VUE_APP_BASE_API + this.$store.state.user.avatar;
+      this.visbleUserInfo = false;
+    },
     async logout() {
       await this.$store.dispatch("LogOut");
       this.$router.push({ path: "/login" });
@@ -38,7 +38,7 @@
  
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">保存</el-button>
-      <el-button type="danger" @click="visible = false">关闭</el-button>
+      <el-button type="danger" @click="close()">关闭</el-button>
     </span>
   </el-dialog>
 </template>
@@ -95,6 +95,8 @@ export default {
     handleSuccess(res, file) {
       if (res.code == 200) {
         this.updateAvatar(res.data);
+        this.$emit('changeAvatar', res.data);
+        // this.logout();
       } else {
         this.$message({
           message: "上传失败",
@@ -103,6 +105,10 @@ export default {
         });
       }
     },
+    async logout() {
+      await this.$store.dispatch("LogOut");
+      this.$router.push({ path: "/login" });
+    },
     updateAvatar(data) {
       UpdateAvatar(data.name).then((res) => {
         this.user.avatar = data.url;
@@ -136,6 +142,10 @@ export default {
       })
  
     },
+    close() {
+      this.visible = false;
+      this.$emit("refresh");
+    }
   },
 };
 </script>