Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/aescbc.js

src/store/modules/user.js

@@ -1,5 +1,6 @@
 import { login, logout, getInfo, refreshToken } from '@/api/login'
 import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import router, { resetRouter } from '@/router'
 import Router from '@/router'
 
@@ -80,6 +81,7 @@ const user = {
         login(username, password, code, uuid).then(res => {
           let data = res.data
           if(data.code && data.code===500){
+            Message.error(data.msg)
             reject(data);
           }else {
             setToken(data.access_token)

src/utils/aescbc.js

@@ -6,42 +6,58 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678')
  * 默认参数需要加密
  * @type {boolean}
  */
-const jia_mi = false
+const  jia_mi=false;
 /**
  * 默认后台会自动加密
  * @type {boolean}
  */
-const jie_mi = false
+const  jie_mi=false;
 /**
  * 加密
  * @param word
  * @returns {string}
  */
-export const encryptCBC = function (word) {
+export const encryptCBC = function(word) {
-  if (!jia_mi) {
+  if(!jia_mi){
-    return word
+    return  word;
   }
   const srcs = CryptoJS.enc.Utf8.parse(word)
   const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, {
     iv: cbc_iv,
     mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.Pkcs7
   })
   return encrypted.toString()
 }
+
 /**
  * 解密
  * @param word
  * @returns {*}
  */
-export const decryptCBC = function (word) {
+export const decryptCBC = function(word) {
-  if (!jie_mi) {
+  if(!jie_mi){
-    return word
+    return  word;
   }
   const encrypted = CryptoJS.AES.decrypt(word, cbc_key, {
     iv: cbc_iv,
     mode: CryptoJS.mode.CBC,
-    padding: CryptoJS.pad.Pkcs7,
+    padding: CryptoJS.pad.Pkcs7
   })
   return encrypted.toString(CryptoJS.enc.Utf8)
 }
+
+/**
+ * 文件预览专用
+ * @param word
+ * @returns {string}
+ */
+export const encryptCBCTime= function(word) {
+  const srcs = CryptoJS.enc.Utf8.parse(word)
+  const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, {
+    iv: cbc_iv,
+    mode: CryptoJS.mode.CBC,
+    padding: CryptoJS.pad.Pkcs7
+  })
+  return encrypted.toString()
+}

src/views/externalUnitManagement/supervisionUnit/index.vue

@@ -63,14 +63,15 @@
         </template>
       </el-table-column>
       <el-table-column label="社会统一征信代码" show-overflow-tooltip align="center" prop="socialUnifiedCreditCode"/>
-      <el-table-column label="总监" align="center" prop="directorsName"/>
+      <el-table-column label="总监" show-overflow-tooltip align="center" prop="userNum"/>
-      <el-table-column label="总监联系方式" width="120" align="center">
+<!--      <el-table-column label="总监" align="center" prop="directorsName"/>-->
-        <template slot-scope="scope">
+<!--      <el-table-column label="总监联系方式" width="120" align="center">-->
-          <!-- 检查是否存在身份证号 -->
+<!--        <template slot-scope="scope">-->
-          <span v-if="scope.row.directorsPhone">{{ hideSensitiveInfo(scope.row.directorsPhone) }}</span>
+<!--          &lt;!&ndash; 检查是否存在身份证号 &ndash;&gt;-->
-          <span v-else>-</span>
+<!--          <span v-if="scope.row.directorsPhone">{{ hideSensitiveInfo(scope.row.directorsPhone) }}</span>-->
-        </template>
+<!--          <span v-else>-</span>-->
-      </el-table-column>
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -143,24 +144,24 @@
                     :style="{width: '100%'}"
                     :disabled="view"></el-input>
         </el-form-item>
-        <el-form-item label="总监" prop="directorsName" label-width="140px">
+<!--        <el-form-item label="总监" prop="directorsName" label-width="140px">-->
-          <el-input v-model="unitForm.directorsName" placeholder="请输入总监姓名" show-word-limit :maxlength="20"
+<!--          <el-input v-model="unitForm.directorsName" placeholder="请输入总监姓名" show-word-limit :maxlength="20"-->
-                    clearable v-no-whitespace
+<!--                    clearable v-no-whitespace-->
-                    :style="{width: '100%'}"
+<!--                    :style="{width: '100%'}"-->
-                    :disabled="edit"></el-input>
+<!--                    :disabled="edit"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item label="总监联系方式" prop="directorsPhone" label-width="140px">
+<!--        <el-form-item label="总监联系方式" prop="directorsPhone" label-width="140px">-->
-          <el-input v-model="unitForm.directorsPhone" placeholder="请输入总监联系方式" show-word-limit :maxlength="11"
+<!--          <el-input v-model="unitForm.directorsPhone" placeholder="请输入总监联系方式" show-word-limit :maxlength="11"-->
-                    clearable v-no-whitespace
+<!--                    clearable v-no-whitespace-->
-                    :style="{width: '100%'}"
+<!--                    :style="{width: '100%'}"-->
-                    :disabled="edit"></el-input>
+<!--                    :disabled="edit"></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item v-if="unitForm.supId == undefined" label="总监身份证" prop="directorsIdCard" label-width="140px">
+<!--        <el-form-item v-if="unitForm.supId == undefined" label="总监身份证" prop="directorsIdCard" label-width="140px">-->
-          <el-input v-model="unitForm.directorsIdCard" placeholder="请输入总监总监身份证" show-word-limit :maxlength="18"
+<!--          <el-input v-model="unitForm.directorsIdCard" placeholder="请输入总监总监身份证" show-word-limit :maxlength="18"-->
-                    clearable v-no-whitespace
+<!--                    clearable v-no-whitespace-->
-                    :style="{width: '100%'}"
+<!--                    :style="{width: '100%'}"-->
-          ></el-input>
+<!--          ></el-input>-->
-        </el-form-item>
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="showOrNot">
         <el-button type="primary" @click="submitForm" v-preventReClick="5000">提 交</el-button>
@@ -171,7 +172,7 @@
 </template>
 
 <script>
-import {addSupervisoryUnit, checkIsExistUnitName} from "@/api/pro/proList";
+import { addSupervisoryUnit, addSupervisoryUnitUser, checkIsExistUnitName } from '@/api/pro/proList'
 import {
   delSupervisionUnit,
   listSupervisionUnit,
@@ -380,7 +381,7 @@ export default {
               // 如果单位名称已存在，可以做出相应的提示或处理
               return;
             }
-            addSupervisoryUnit(this.unitForm).then(response => {
+            addSupervisoryUnitUser(this.unitForm).then(response => {
               if (response.code === 200) {
                 this.$message({
                   message: '新建成功',