n20-common-lib 1.3.49 → 1.3.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.49",
+  "version": "1.3.52",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-form-item.scss

@@ -106,11 +106,15 @@ $--input-max: 304px;
 
 .el-input__inner {
   padding-left: 10px;
-
+  padding-right: 10px;
   &[oreadonly] {
     border-color: $--border-color-base;
   }
 }
+.el-input-number.is-without-controls .el-input__inner {
+  padding-left: 10px;
+  padding-right: 10px;
+}
 
 .w-224 {
   width: $--input-width !important;
@@ -510,7 +514,7 @@ $--input-max: 304px;
   }
 }
 
-.el-select .el-input__inner{
+.el-select .el-input__inner {
   text-overflow: ellipsis;
 }
 
@@ -679,6 +683,10 @@ $--input-max: 304px;
   .el-input__suffix {
     font-size: 14px;
   }
+  .el-icon-circle-close {
+    pointer-events: all;
+    cursor: pointer;
+  }
 }
 
 /* 多选搜索框 */
@@ -693,10 +701,19 @@ $--input-max: 304px;
     .el-select__input {
       margin-left: 10px;
     }
+    .el-input__suffix {
+      display: none;
+    }
   }
-
-  .el-select .el-input__suffix {
-    display: none;
+  &.is-clearable {
+    .el-select {
+      .el-input__inner {
+        padding-right: 50px;
+      }
+    }
+  }
+  .el-input__suffix {
+    z-index: 1;
   }
 }
 

package/src/components/FileUploadTable/index.vue

@@ -22,7 +22,7 @@
         <template v-if="dataPorp.slotHeader">
           <el-table-column
             v-for="item in dataPorp.slotHeader"
-            :key="item"
+            :key="item.prop"
             :label="item.label"
             :prop="item.prop"
             :align="item.align || 'center'"
@@ -85,7 +85,7 @@
               <el-button
                 type="text"
                 icon="el-icon-download"
-                :disabled="!row[keys.url] || row.url"
+                :disabled="!row[keys.url]"
                 @click="downFile(row)"
               />
             </slot>
@@ -172,7 +172,7 @@
                 :ref="'upload' + $index"
                 class="n20-upload-table-up"
                 :file-name="row['_name'] || row[keys.name]"
-                :data="row['_fileData']"
+                :data="row['_fileData'] || fileData"
                 :msg-type="null"
                 :show-clear="false"
                 :action="action"
@@ -330,6 +330,7 @@
         :auto-upload="false"
         :multiple="true"
         :action="action"
+        :data="fileData"
         :headers="headers"
         :accept="fileAccept"
         :http-request="uploadHttpRequest"
@@ -339,9 +340,7 @@
         <template slot="trigger">
           <i class="drag-icon n20-icon-shangchuan"></i>
           <span class="drag-text">点击或将文件拖拽到这里上传</span>
-          <span class="drag-tip">
-            <slot>支持扩展名：.rar .zip .doc .docx .pdf .jpg...</slot>
-          </span>
+          <span class="drag-tip">{{ fileAcceptTip }}</span>
         </template>
       </clUpload>
       <div class="dialog-footer">
@@ -420,30 +419,6 @@ export default {
     return {
       imgType: /\.jpg|\.png|\.gif|\.svg$/i,
       selectionList: [],
-      fileAccept: this.dataPorp.fileAccept || undefined,
-      fileSize: this.dataPorp.fileSize || undefined,
-      typeOptions: this.dataPorp.typeOptions || [
-        {
-          type: '001',
-          label: '信贷合同'
-        },
-        {
-          type: '002',
-          label: '贴现合同'
-        },
-        {
-          type: '003',
-          label: '其他合同'
-        }
-      ],
-      keys: this.dataPorp.keys || {
-        rowKey: 'id',
-        type: 'type',
-        name: 'name',
-        url: 'url',
-        time: 'time',
-        user: 'user'
-      },
       currFileList: [],
       visibleP: false,
       visibleBatch: false,
@@ -452,6 +427,29 @@ export default {
       previewSameOrg: false
     }
   },
+  computed: {
+    fileAccept() {
+      return this.dataPorp.fileAccept || undefined
+    },
+    fileSize() {
+      return this.dataPorp.fileSize || undefined
+    },
+    fileAcceptTip() {
+      return (
+        this.dataPorp.fileAcceptTip ||
+        '支持扩展名：.rar .zip .doc .docx .pdf .jpg...'
+      )
+    },
+    fileData() {
+      return this.dataPorp.fileData || undefined
+    },
+    typeOptions() {
+      return this.dataPorp.typeOptions || typeOptionsD
+    },
+    keys() {
+      return this.dataPorp.keys || keysD
+    }
+  },
   methods: {
     batchUploadFn() {
       let $uploadwrap = this.$refs['upload-batch']
@@ -580,4 +578,18 @@ export default {
     }
   }
 }
+
+const keysD = {
+  rowKey: 'id',
+  type: 'type',
+  name: 'name',
+  url: 'url',
+  time: 'time',
+  user: 'user'
+}
+const typeOptionsD = [
+  { type: '001', label: '信贷合同' },
+  { type: '002', label: '贴现合同' },
+  { type: '003', label: '其他合同' }
+]
 </script>

package/src/components/Filters/index.vue

@@ -205,7 +205,7 @@ export default {
     },
     getRemote() {
       this.$refs['setRemote'].getColumns().then((list) => {
-        this.remoteList = list || this.filterList
+        this.remoteList = list || this.filterList.slice(0, this.defaultShow)
       })
     },
     setRemoteChange(list) {

package/src/components/InputNumber/index.vue

@@ -1,9 +1,13 @@
 <template>
-  <div class="n20-num-w">
+  <div
+    class="n20-num-w"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-input
       v-if="showStr"
       class="n20-stc"
-      :class="{ 'n20-num--rate': type === 'rate' }"
+      :class="{ 'n20-num--rate': type === 'rate' || isClearable }"
       :value="valueStr"
       :disabled="disabled"
       :placeholder="phd"
@@ -14,7 +18,7 @@
       v-else
       ref="input-number"
       class="n20-num"
-      :class="{ 'n20-num--rate': type === 'rate' }"
+      :class="{ 'n20-num--rate': type === 'rate' || isClearable }"
       :controls="false"
       v-bind="$attrs"
       :value="valueNum"
@@ -24,11 +28,14 @@
       @blur="blurFn"
       @change="changeFn"
     />
-    <span v-if="type === 'rate'" class="el-input__suffix">
-      <span class="el-input__icon" style="display: inline-block">{{
+    <span v-if="isClearable && isHove && value" class="el-input__suffix"
+      ><i class="el-input__icon el-icon-circle-close" @click="closeFn"></i
+    ></span>
+    <span v-else-if="type === 'rate'" class="el-input__suffix"
+      ><span class="el-input__icon" style="display: inline-block">{{
         suffix
-      }}</span>
-    </span>
+      }}</span></span
+    >
   </div>
 </template>
 
@@ -52,7 +59,7 @@ export default {
       type: Boolean,
       default: undefined
     },
-    clearable: {
+    isClearable: {
       type: Boolean,
       default: false
     },
@@ -78,7 +85,8 @@ export default {
     return {
       valueStr: '',
       valueNum: undefined,
-      showStr: true
+      showStr: true,
+      isHove: false
     }
   },
   computed: {
@@ -178,6 +186,10 @@ export default {
       } else {
         this.preValue = target.value
       }
+    },
+    closeFn() {
+      this.$emit('input', undefined)
+      this.$emit('change', undefined)
     }
   }
 }

package/src/components/InputSearch/index.vue

@@ -3,6 +3,7 @@
     v-if="!select"
     v-bind="$attrs"
     :value="value"
+    :clearable="clearable"
     v-on="$listeners"
     @change="searchFn"
   >
@@ -12,7 +13,13 @@
       @click.stop="searchFn"
     ></i>
   </el-input>
-  <div v-else class="n20-input-search">
+  <div
+    v-else
+    class="n20-input-search"
+    :class="{ 'is-clearable': clearable }"
+    @mouseenter="isHove = true"
+    @mouseleave="isHove = false"
+  >
     <el-select
       ref="input-search"
       v-bind="$attrs"
@@ -26,12 +33,17 @@
     >
       <slot></slot>
     </el-select>
-    <span class="el-input__suffix">
-      <span
+    <span class="el-input__suffix"
+      ><i
         class="is-search el-input__icon el-icon-zoom-in"
         @click.stop="searchFn"
-      ></span>
-    </span>
+      ></i
+      ><i
+        v-if="clearable && isHove && hasVal"
+        class="is-search el-input__icon el-icon-circle-close"
+        @click="closeFn"
+      ></i
+    ></span>
   </div>
 </template>
 
@@ -51,20 +63,44 @@ export default {
       type: Boolean,
       default: false
     },
+    clearable: {
+      type: Boolean,
+      default: false
+    },
     allowCreate: {
       type: Boolean,
       default: true
     }
   },
   data() {
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {} })
-    return {}
+    return {
+      isHove: false
+    }
+  },
+  computed: {
+    hasVal() {
+      if (this.multiple) {
+        if (this.value && this.value.length) {
+          return true
+        } else {
+          return false
+        }
+      } else {
+        if (this.value || this.value === 0) {
+          return true
+        } else {
+          return false
+        }
+      }
+    }
   },
   methods: {
     visibleChangeFn(val) {
-      if (val && !this.$refs['input-search']['multiple']) {
-        this.$refs['input-search']['selectedLabel'] =
-          this.$refs['input-search']['currentPlaceholder']
+      if (val && !this.multiple) {
+        if (this.value || this.value === 0) {
+          this.$refs['input-search']['selectedLabel'] =
+            this.$refs['input-search']['currentPlaceholder']
+        }
       }
     },
     changeFn(val) {
@@ -73,6 +109,10 @@ export default {
     },
     searchFn() {
       this.$emit('search', this.value)
+    },
+    closeFn() {
+      this.$emit('input', undefined)
+      this.$emit('change', undefined)
     }
   }
 }

package/src/components/Layout/HeaderWrap/index.vue

@@ -80,21 +80,20 @@
         <el-dropdown-item command="changePassword" divided>{{
           '修改密码' | $l(i18n)
         }}</el-dropdown-item>
+        <el-dropdown-item v-if="customOpt.mydeal" command="myDeal" divided>{{
+          '我的交易' | $l(i18n)
+        }}</el-dropdown-item>
         <el-dropdown-item
-          v-if="customOpt.mydeal !== false"
-          command="myDeal"
-          divided
-          >{{ '我的交易' | $l(i18n) }}</el-dropdown-item
-        >
-        <el-dropdown-item
-          v-if="customOpt.agency && customOpt.agency.show"
-          command="myAgency"
+          v-if="customOpt.switchuser"
+          command="switchUser"
           divided
+          >{{ '切换用户' | $l(i18n) }}</el-dropdown-item
         >
+        <el-dropdown-item v-if="customOpt.agency" command="myAgency" divided>
           <div class="flex-box flex-v">
             <span>{{ '工作代理' | $l(i18n) }}</span>
             <el-badge
-              v-if="customOpt.agency.underway"
+              v-if="underway"
               class="m-l-auto font-size-small color-primary"
               is-dot
               type="primary"
@@ -169,6 +168,14 @@
     >
       <noticePop ref="noticeContent" :num.sync="noticeNum" />
     </el-popover>
+    <el-dialog
+      :visible.sync="scV"
+      :title="'切换用户' | $l(i18n)"
+      append-to-body
+      width="600px"
+    >
+      <switchUser :visible.sync="scV" :user-no="userNo" />
+    </el-dialog>
   </div>
 </template>
 
@@ -179,8 +186,9 @@ import { themeList } from '../../../utils/theme.config.js'
 import dialogWrap from '../../Dialog/index.vue'
 import changePwd from './changePwd.vue'
 import noticePop from './noticePop.vue'
-import axios from '../../../utils/axios'
+import switchUser from './switchUser.vue'
 
+import axios from '../../../utils/axios'
 import getJsonc from '../../../assets/getJsonc'
 import realUrl from '../../../assets/realUrl'
 import auth from '../../../utils/auth'
@@ -208,6 +216,9 @@ const i18n = {
   我的交易: {
     en: 'My deal'
   },
+  切换用户: {
+    en: 'Switch User'
+  },
   工作代理: {
     en: 'My agency'
   },
@@ -247,7 +258,8 @@ export default {
   components: {
     dialogWrap,
     changePwd,
-    noticePop
+    noticePop,
+    switchUser
   },
   inject: {
     customOpt: {
@@ -264,6 +276,7 @@ export default {
       headerTitle: undefined,
       headerUserUrl: undefined,
       userInfo: {},
+      userNo: window.sessionStorage.getItem('userNo'),
       durationTime: '00小时00分00秒',
       cpwdV: false,
       langV: false,
@@ -273,6 +286,8 @@ export default {
       themeVal: window.localStorage.getItem('pageTheme') || 'default',
       noticeNum: 0,
       rolesList: [],
+      scV: false,
+      underway: false,
       i18n
     }
   },
@@ -295,12 +310,16 @@ export default {
     setUserVisible(v) {
       if (v) {
         let userInfo = JSON.parse(sessionStorage.getItem('userInfo') || '{}')
+
+        this.userNo = userInfo.uno
         this.userInfo = {
           userName: userInfo.uname,
           companyName: userInfo.cltName
         }
         this.rolesList = userInfo.roles || []
 
+        this.customOpt.agency && this.getProxyAuthIing()
+
         let loginTime = sessionStorage.getItem('loginTime')
         if (loginTime) {
           this.setDurationTime(loginTime)
@@ -356,6 +375,15 @@ export default {
         case 'logOut':
           this.logOut()
           break
+        case 'myDeal':
+          this.$router.push('/activiti/alreadyToExamine')
+          break
+        case 'myAgency':
+          this.$router.push('/user-web/agency')
+          break
+        case 'switchUser':
+          this.switchUser()
+          break
         default:
           this.$emit('custom-event', { type: c })
           break
@@ -393,6 +421,9 @@ export default {
       // alert('修改密码')
       this.cpwdV = true
     },
+    switchUser() {
+      this.scV = true
+    },
     logOut() {
       // alert('退出登录')
       this.$confirm(
@@ -406,6 +437,16 @@ export default {
       ).then(() => {
         auth.removeToken()
       })
+    },
+    // 检查是否代理中
+    async getProxyAuthIing() {
+      let res = await axios.get(
+        `/bems/prod_1.0/user/wfUserProxyAuth/check/ongoing/${this.userNo}`,
+        null,
+        { loading: false, noMsg: true }
+      )
+
+      this.underway = !!res.data
     }
   }
 }

package/src/components/Layout/HeaderWrap/switchUser.vue

@@ -0,0 +1,67 @@
+<template>
+  <el-table :data="userListBanck" style="width: 100%">
+    <el-table-column type="index" label="序号" />
+    <el-table-column prop="uno" label="账号" width="180" />
+    <el-table-column prop="cltName" label="单位" />
+    <el-table-column width="100" label="操作">
+      <template slot-scope="{ row }">
+        <el-button v-if="userNo === row.uno" type="text" disabled
+          >当前用户</el-button
+        >
+        <el-button v-else type="text" @click="handleChange(row.uno)"
+          >切换</el-button
+        >
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import axios from '../../../utils/axios'
+import auth from '../../../utils/auth'
+
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    userNo: {
+      type: String,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      userListBanck: [{}]
+    }
+  },
+  created() {
+    axios
+      .get(
+        `/bems/prod_1.0/user/api/userController/queryUserListByUserNo/${this.userNo}`
+      )
+      .then(({ data }) => {
+        this.userListBanck = data
+      })
+  },
+  methods: {
+    handleChange(uno) {
+      axios
+        .get(`/bems/prod_1.0/uas/api/authorization/switchUser/${uno}`)
+        .then(({ data }) => {
+          this.$emit('update:visible', false)
+
+          window.sessionStorage.setItem('_auto_login_ing_', true)
+          window.sessionStorage.setItem(
+            '_auto_login_data_',
+            JSON.stringify(data)
+          )
+          auth.toLogin()
+        })
+    }
+  }
+}
+</script>
+
+<style></style>

package/src/components/LoginTemporary/index.vue

@@ -1,5 +1,15 @@
 <template>
+  <div v-if="alV" v-loading="alV" class="login-wrap">
+    <loginForm
+      ref="login-form"
+      :login-types="LOGIN_MODE || loginTypes"
+      :login-then="loginThen"
+      class="login-form"
+      style="display: none"
+    />
+  </div>
   <div
+    v-else
     class="login-wrap"
     :style="{
       backgroundImage: BgImage ? `url(${BgImage})` : `url(${loginBg})`
@@ -66,6 +76,14 @@ export default {
     loginThen: {
       type: Function,
       default: undefined
+    },
+    autoLogin: {
+      type: Boolean,
+      default: false
+    },
+    autoLoginDate: {
+      type: Object,
+      default: undefined
     }
   },
   data() {
@@ -82,10 +100,20 @@ export default {
       loginLogoHeight: 'auto',
       loginLogoText: '',
       sloganHtml: '',
-      operateType: 'login'
+      operateType: 'login',
+      alV: false
     }
   },
   created() {
+    if (this.autoLogin) {
+      this.autoLoginSC()
+      return
+    }
+    if (window.sessionStorage.getItem('_auto_login_ing_')) {
+      this.autoLoginSS()
+      return
+    }
+
     this.removeStorage()
     this.init()
   },
@@ -159,6 +187,37 @@ export default {
     },
     getChangetype(val) {
       this.operateType = val
+    },
+    autoLoginSC() {
+      this.alV = true
+      let alData = this.autoLoginDate
+      this.removeStorage()
+      if (alData && alData.accessToken) {
+        this.autoLoginFn(alData)
+      } else {
+        this.$watch('autoLoginDate', (alData) => {
+          if (alData && alData.accessToken) {
+            this.removeStorage()
+            this.autoLoginFn(alData)
+          }
+        })
+      }
+    },
+    autoLoginSS() {
+      this.alV = true
+      let alDataStr = window.sessionStorage.getItem('_auto_login_data_')
+      this.removeStorage()
+      if (alDataStr) {
+        let alData = JSON.parse(alDataStr)
+        if (alData && alData.accessToken) {
+          this.autoLoginFn(alData)
+        }
+      }
+    },
+    autoLoginFn(alData) {
+      this.$nextTick(() => {
+        this.$refs['login-form']?.loginAfter(alData)
+      })
     }
   }
 }