n20-common-lib 2.4.43 → 2.4.44

package/package.json

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

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

@@ -117,6 +117,14 @@ $--input-max: 224px;
   padding-right: 10px;
 }
 
+.el-input.is-disabled .el-input__inner {
+  color: $--color-text-primary;
+}
+
+.el-textarea.is-disabled .el-textarea__inner {
+  color: $--color-text-primary;
+}
+
 .w-224 {
   width: $--input-width !important;
 }

package/src/assets/css/el-button.scss

@@ -1,3 +1,5 @@
+$--button-margin-left: 6px;
+
 .el-button--primary,
 .el-button--default,
 .el-button--default.is-plain,
@@ -16,15 +18,15 @@
 }
 
 .el-button + .el-button {
-  margin-left: 8px;
+  margin-left: $--button-margin-left;
 }
 
 .el-button + .el-dropdown {
-  margin-left: 8px;
+  margin-left: $--button-margin-left;
 }
 
 .el-button--mini + .el-button--mini {
-  margin-left: 8px;
+  margin-left: $--button-margin-left;
 }
 
 .el-button[onlyicon] {

package/src/assets/css/normalize.scss

@@ -396,18 +396,18 @@ iframe {
 
 .page-footer-shadow {
   position: relative;
-  height: 38px;
-  margin-bottom: -8px;
+  height: 28px;
+  margin-bottom: -4px;
 
   &::before {
     content: '';
     pointer-events: none;
     position: absolute;
-    top: 0px;
+    top: 0;
     height: 100%;
     left: -8px;
     right: -8px;
-    box-shadow: 0px -2px 6px 0px rgba($--color-black, 0.08);
+    box-shadow: 0 -2px 6px 0px rgba($--color-black, 0.08);
   }
 }
 

package/src/components/ApprovalButtons/index.vue

@@ -24,15 +24,23 @@
           </label>
           <div class="flex-box">
             <el-select
-              v-if="preAddTask"
+              v-if="authList.includes('isAddtask') || authList.includes('isAddForwardTask') || preAddTask"
               v-model="addTaskWay"
               class="m-r-ss"
               clearable
               :placeholder="'请选择加签类型' | $lc"
               style="width: 10em"
             >
-              <el-option :label="'向前加签' | $lc" value="2" />
-              <el-option :label="'向后加签' | $lc" value="1" />
+              <el-option
+                v-if="authList.includes('isAddForwardTask') || preAddTask"
+                :label="'向前加签' | $lc"
+                :value="authList.includes('isAddForwardTask') ? 'isAddForwardTask' : '2'"
+              />
+              <el-option
+                v-if="authList.includes('isAddtask') || preAddTask"
+                :label="'向后加签' | $lc"
+                :value="authList.includes('isAddtask') ? 'isAddtask' : '1'"
+              />
             </el-select>
             <el-select
               v-model="addTaskType"
@@ -295,7 +303,6 @@ export default {
     this.getBtns()
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
-    this.getHasPreAddTask()
   },
   methods: {
     // 换回到发起页
@@ -325,9 +332,15 @@ export default {
           } else {
             this.authList = this.btnList
           }
+          if (!(this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask'))) {
+            this.getHasPreAddTask()
+          }
         })
         .catch(() => {
           this.authList = this.btnList
+          if (!(this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask'))) {
+            this.getHasPreAddTask()
+          }
         })
     },
     // 获取是否显示驳回至按钮

package/src/components/FileUploadTable/index.vue

@@ -106,7 +106,7 @@
           </slot>
         </el-table-column>
         <slot name="slotCol"></slot>
-        <el-table-column :label="'上传时间' | $lc" :prop="keys.time" sortable width="170" align="center">
+        <el-table-column :label="'上传时间' | $lc" :prop="keys.time" sortable width="170" align="left">
           <slot slot="header" slot-scope="scope" name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
           <slot slot-scope="{ row }" name="time" :row="row">{{ row[keys.time] }}</slot>
         </el-table-column>

package/src/components/Filters/index.vue

@@ -246,7 +246,7 @@ export default {
         item.options = opts || []
       }
     },
-    getRemote() {
+    getRemote(flag) {
       getColumns(this.pageId, this.userNo, this.filterLT).then((list) => {
         if (list) {
           this.remoteList = list
@@ -254,7 +254,7 @@ export default {
           let defaultList = this.filterLT.filter((col) => col.isDefault)
           this.remoteList = defaultList.length ? defaultList : this.filterLT.slice(0, this.defaultShow)
         }
-        this.showPop = true
+        this.showPop = flag || true
       })
     },
     setRemoteChange(list) {

package/src/components/InputNumber/index.vue

@@ -105,10 +105,8 @@ export default {
     phd() {
       if (this.placeholder) {
         return this.placeholder
-      } else if (this.type === 'rate') {
-        return $lc('请输入利率')
       } else {
-        return $lc('请输入金额')
+        return $lc('请输入')
       }
     },
     fNum() {

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

@@ -95,6 +95,7 @@
     </el-popover>
 
     <el-dropdown
+      ref="userDrop"
       class="user-info-drop"
       trigger="click"
       placement="bottom-end"
@@ -104,7 +105,12 @@
     >
       <img v-popover:by_popover class="user-info-btn header-color" :src="headerUserUrl" />
 
-      <el-dropdown-menu slot="dropdown" :class="{ 'user-info-drop_height': !inBack }" class="user-info-drop-menu-new">
+      <el-dropdown-menu
+        ref="userDropMenu"
+        slot="dropdown"
+        :class="{ 'user-info-drop_height': !inBack }"
+        class="user-info-drop-menu-new"
+      >
         <div class="uif-user-w" :style="{ backgroundImage: headerUserInfoBg ? `url(${headerUserInfoBg})` : undefined }">
           <div class="uif-img-w">
             <img class="_img" :src="headerUserUrl" />
@@ -209,6 +215,15 @@
         <div class="uif-ydn p-r-m">{{ '已登录' | $lc }}：{{ durationTime }}</div>
       </el-dropdown-menu>
     </el-dropdown>
+    <div
+      v-title:br="rolesList.map((el) => el.name).join(',')"
+      :style="{ width: (userInfo?.companyName?.length * 0.86 || 4) + 'em', overflow: 'hidden' }"
+      class="text-ellipsis pointer"
+      @click="handleUser"
+    >
+      <div class="font-size-small">{{ userNo }}/{{ rolesList.map((el) => el.name).join('/') }}</div>
+      <div class="companyClass">{{ userInfo.companyName }}</div>
+    </div>
 
     <dialogWrap :title="'主题设置' | $lc" :visible.sync="themeV" append-to-body width="432px">
       <div style="min-height: 114px">
@@ -417,7 +432,7 @@ export default {
     },
     async clickSystem(item) {
       await this.getTreeList(item)
-      localStorage.setItem('pageInType', 'toFront')
+      // localStorage.setItem('pageInType', 'toFront')
       window.localStorage.setItem('pageInSystemNo', item.NO)
       let { base = '/' } = this.$router.options
       if (!/\/$/.test(base)) base += '/'
@@ -425,6 +440,14 @@ export default {
       window.location.href = window.location.origin + base + 'dashboard/workplace'
     },
 
+    handleUser() {
+      this.$refs.userDropMenu.offset = 1000
+      if (this.$refs.userDrop.visible) {
+        this.$refs.userDrop.hide()
+      } else {
+        this.$refs.userDrop.show()
+      }
+    },
     // 跳转打主数据人员页面
     goMdmUser() {
       this.customOpt.userMd && linkPush('/mdm/personnel')
@@ -687,4 +710,8 @@ export default {
   font-size: 20px;
   vertical-align: middle;
 }
+.companyClass {
+  font-size: 12px;
+  color: #999;
+}
 </style>

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

@@ -1,21 +1,26 @@
 <template>
-  <el-table :data="userListBanck" style="width: 100%">
-    <el-table-column type="index" :label="'序号' | $lc" />
-    <el-table-column prop="uno" :label="'账号' | $lc" width="180" />
-    <el-table-column prop="cltName" :label="'单位' | $lc" />
-    <el-table-column width="100" :label="'操作' | $lc">
-      <template slot-scope="{ row }">
-        <el-button v-if="userNo === row.uno" type="text" disabled>{{ '当前用户' | $lc }}</el-button>
-        <el-button v-else type="text" @click="handleChange(row.uno)">{{ '切换' | $lc }}</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
+  <div>
+    <div>
+      <el-input v-model="searchValue" class="w-224 m-r" />
+      <el-button type="primary" @click="search">查询</el-button>
+    </div>
+    <el-table :data="userListBanck" height="400px" style="width: 100%; margin-top: 8px">
+      <el-table-column type="index" :label="'序号' | $lc" />
+      <el-table-column prop="uno" :label="'账号' | $lc" width="180" />
+      <el-table-column prop="cltName" :label="'单位' | $lc" />
+      <el-table-column width="100" :label="'操作' | $lc">
+        <template slot-scope="{ row }">
+          <el-button v-if="userNo === row.uno" type="text" disabled>{{ '当前用户' | $lc }}</el-button>
+          <el-button v-else type="text" @click="handleChange(row.uno)">{{ '切换' | $lc }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
 import axios from '../../../utils/axios'
 import auth from '../../../utils/auth'
-
 export default {
   props: {
     visible: {
@@ -29,15 +34,23 @@ export default {
   },
   data() {
     return {
-      userListBanck: [{}]
+      userListBanck: [{}],
+      searchValue: '',
+      list: [{}]
     }
   },
   created() {
     axios.get(`/bems/prod_1.0/user/api/userController/queryUserListByUserNo/${this.userNo}`).then(({ data }) => {
       this.userListBanck = data
+      this.list = data
     })
   },
   methods: {
+    search() {
+      this.userListBanck = this.list.filter(
+        (item) => item.uno.match(this.searchValue) || item.cltName.match(this.searchValue)
+      )
+    },
     handleChange(uno) {
       axios.get(`/bems/prod_1.0/uas/api/authorization/switchUser/${uno}`).then(({ data }) => {
         this.$emit('update:visible', false)

package/src/components/Statis/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="size !== 'mini'" class="flex-box p-t-s p-b-s">
+    <div v-if="size !== 'mini'" class="flex-box p-t-ss p-b-ss">
       <statisItem :type="'当页合计' | $lc" :list="pageList" :show-w="showW" :show-u="showU" :count-label="countLabel" />
       <statisItem
         :type="'全部合计' | $lc"
@@ -10,7 +10,7 @@
         :count-label="countLabel"
       />
     </div>
-    <div v-else class="n20-statis p-t-s p-b-s">
+    <div v-else class="n20-statis p-t-ss p-b-ss">
       <span class="m-r">
         {{ '当页:' | $lc }}<span class="n20-primary"> {{ pageSum }}</span> {{ '条' | $lc }}
       </span>

package/src/components/Statis/statisPopover.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="lists.length == 1" class="flex-box p-t-s p-b-s">
+  <div v-if="lists.length == 1" class="flex-box p-t-ss p-b-ss">
     <statisItem
       v-for="(item, i) in lists[0]['statis']"
       :key="i"
@@ -20,7 +20,7 @@
     @show="show = true"
     @hide="show = false"
   >
-    <div slot="reference" class="flex-box p-t-s p-b-s">
+    <div slot="reference" class="flex-box p-t-ss p-b-ss">
       <statisItem
         v-for="(item, i) in lists[0]['statis']"
         :key="i"

package/src/components/Table/index.vue

@@ -245,6 +245,7 @@ export default {
       this.$emit('update:size', size)
     },
     sizeSet(el) {
+      console.log(el)
       this.sizeBind = el
       let inTable = this.$refs['el-table']
       if (inTable) {

package/src/i18n.json

@@ -5,6 +5,9 @@
   "数据请求": {
     "en": "Data request"
   },
+  "新一代集团财资管理系统": {
+    "en": "New generation group accounting system"
+  },
   "不支持在线预览，请": {
     "en": "Online preview is not supported, please"
   },