n20-common-lib 2.1.8 → 2.1.10

package/package.json

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

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

@@ -104,7 +104,8 @@ $--input-max: 224px;
   font-size: 16px;
 }
 
-.el-input__inner {
+.el-input__inner,
+.el-textarea__inner {
   padding-left: 10px;
   padding-right: 10px;
   &[oreadonly] {

package/src/components/ApprovalButtons/index.vue

@@ -3,75 +3,71 @@
   <div>
     <el-form label-position="right" :label-width="_lang === 'zh' ? '5em' : '10em'">
       <div v-if="taskId && showBtn" class="flex-box">
-        <div v-if="authList.includes('isCarboncopy')" class="flex-1">
-          <el-form-item :label="'抄送' | $lc">
+        <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
+          <el-input
+            :value="carbonCopyList.map((c) => c.uname).join(', ')"
+            type="textarea"
+            :autosize="{ minRows: 1 }"
+            @focus="setCarboncopyV = true"
+          />
+        </el-form-item>
+        <el-form-item v-if="authList.includes('isAddtask')" :label="'加签' | $lc" :error="addMsg" class="flex-1 m-b-s">
+          <label slot="label">
+            <span>{{ '加签' | $lc }}</span>
+            <el-tooltip placement="top">
+              <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
+              <div slot="content" style="width: 16em; line-height: 1.6">
+                {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
+                {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
+              </div>
+            </el-tooltip>
+          </label>
+          <div class="flex-box">
+            <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
+              <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
+              <el-option :label="'会签并行' | $lc" value="2" />
+              <el-option :label="'普通串行' | $lc" value="3" />
+            </el-select>
             <el-input
-              :value="carbonCopyList.map((c) => c.uname).join(', ')"
+              class="flex-item"
               type="textarea"
+              :value="addTaskList.map((c) => c.uname).join(', ')"
               :autosize="{ minRows: 1 }"
-              @focus="setCarboncopyV = true"
-            />
-          </el-form-item>
-        </div>
-        <div v-if="authList.includes('isAddtask')" class="flex-1">
-          <el-form-item :label="'加签' | $lc" :error="addMsg">
-            <label slot="label">
-              <span>{{ '加签' | $lc }}</span>
-              <el-tooltip placement="top">
-                <span class="n20-icon-xinxitishi m-l-ss" style="position: static"></span>
-                <div slot="content" style="width: 16em; line-height: 1.6">
-                  {{ '会签并行：增加一个会签节点，全部审批人同意才可通过审批' | $lc }}<br />
-                  {{ '普通串行：按照加签人数增加节点，每个节点审批通过才可完成当前加签流程' | $lc }}
-                </div>
-              </el-tooltip>
-            </label>
-            <div class="flex-box">
-              <el-select v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
-                <!-- <el-option :label="'普通节点' | $lc" value="1" /> -->
-                <el-option :label="'会签并行' | $lc" value="2" />
-                <el-option :label="'普通串行' | $lc" value="3" />
-              </el-select>
-              <el-input
-                class="flex-item"
-                type="textarea"
-                :value="addTaskList.map((c) => c.uname).join(', ')"
-                :autosize="{ minRows: 1 }"
-                @focus="setAddtaskV = true"
-              />
-            </div>
-          </el-form-item>
-        </div>
-      </div>
-      <el-form-item :label="'审批意见' | $lc" :error="errMsg">
-        <el-input
-          ref="msg-input"
-          v-model="messageC"
-          type="textarea"
-          :placeholder="
-            ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
-          "
-          :maxlength="messageMax"
-          :autosize="{ minRows: 1 }"
-        />
-      </el-form-item>
-      <template v-if="taskId && showBtn">
-        <el-form-item v-if="authList.includes('showAppOpi') || authList.includes('showOtherAtt')" label=" ">
-          <div class="flex-box">
-            <show-app-opi
-              v-if="authList.includes('showAppOpi')"
-              class="flex-1"
-              :task-id="taskId"
-              :message.sync="messageC"
-            />
-            <show-other-att
-              v-if="authList.includes('showOtherAtt')"
-              class="flex-1"
-              :task-id="taskId"
-              :other-att="otherAtt"
+              @focus="setAddtaskV = true"
             />
           </div>
         </el-form-item>
-      </template>
+      </div>
+      <div class="flex-box">
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" style="width: 70%">
+          <el-input
+            ref="msg-input"
+            v-model="messageC"
+            type="textarea"
+            :placeholder="
+              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+            "
+            :maxlength="messageMax"
+            :autosize="{ rows: 1 }"
+          />
+        </el-form-item>
+        <template v-if="taskId && showBtn">
+          <show-app-opi
+            v-if="authList.includes('showAppOpi')"
+            class="flex-1 m-l-s"
+            :task-id="taskId"
+            :message.sync="messageC"
+            style="width: 20%"
+          />
+          <show-other-att
+            v-if="authList.includes('showOtherAtt')"
+            class="flex-1 m-l"
+            :task-id="taskId"
+            :other-att="otherAtt"
+            style="width: 18%"
+          />
+        </template>
+      </div>
     </el-form>
 
     <div class="text-c">

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -1,7 +1,14 @@
 <template>
-  <div class="flex-box">
-    <span class="m-r">管理部审批意见</span>
-    <el-select v-model="approveMsgSlt" class="flex-item" clearable multiple collapse-tags @change="changeFn">
+  <div class="approve-msg-slt">
+    <el-select
+      v-model="approveMsgSlt"
+      class="w-100p"
+      clearable
+      multiple
+      collapse-tags
+      placeholder="请选择审批意见"
+      @change="changeFn"
+    >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />
     </el-select>
   </div>
@@ -32,7 +39,7 @@ export default {
   },
   methods: {
     getData() {
-      axios.post('/bems/activiti/actAppOpi/queryAppOpi').then(({ data }) => {
+      axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser').then(({ data }) => {
         this.approveMsgList = data.list || []
       })
     },
@@ -45,4 +52,11 @@ export default {
 }
 </script>
 
-<style></style>
+<style>
+.approve-msg-slt .el-select__tags {
+  flex-wrap: nowrap;
+}
+.approve-msg-slt .el-tag {
+  max-width: calc(100% - 36px);
+}
+</style>

package/src/components/ApprovalButtons/showOtherAttr.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-box">
-    <span class="m-l m-r">{{ otherattname || '--' }}</span>
+    <span class="p-t-s m-r-s">{{ otherattname || '--' }}</span>
     <el-select v-model="otherattvalue" class="flex-item" clearable @change="changeFn">
       <el-option v-for="(item, i) in otherattjson" :key="i" :label="item.name" :value="item.value" />
     </el-select>

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

@@ -232,7 +232,7 @@ import dayjs from 'dayjs'
 import duration from 'dayjs/plugin/duration'
 dayjs.extend(duration)
 
-import { getMenuAndRela } from '../../LoginTemporary/utils'
+import { siteTree2menus } from '../../LoginTemporary/utils'
 
 const prefix = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || process.env.BASE_URL || '/'
 
@@ -431,10 +431,10 @@ export default {
       window.localStorage.setItem('pageLang', this.langVal)
       Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
       auth.setReqLang()
-
-      let asyncRelaNos = JSON.parse(sessionStorage.getItem('isAsyncGetRela'))
-      let extraForm = JSON.parse(sessionStorage.getItem('extraFormToGetMenu')) || {}
-      getMenuAndRela(asyncRelaNos, extraForm).then(() => {
+      axios.get('/bems/1.0/menuTree/tree').then(({ data }) => {
+        data || (data = [])
+        let layoutMenus = siteTree2menus(data)
+        sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
         window.location.reload()
       })
     },

package/src/components/LoginSetting/setItem.vue

@@ -199,7 +199,7 @@ export default {
           },
           {
             NO: 'JRWG',
-            NAME: '金融网管系统',
+            NAME: '金融网关系统',
             ICON: '',
             LOGIN_MODE: [],
             OPEN: false

package/src/components/LoginTemporary/form.vue

@@ -143,7 +143,7 @@ import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 import auth from '../../utils/auth'
 import qrCode from './qrcode.vue'
-import { getMenuAndRela } from './utils'
+import { siteTree2menus, siteTree2RelaNos } from './utils'
 import importG from '../../utils/importGlobal.js'
 
 function encode(pwd = '', key = 0) {
@@ -572,9 +572,24 @@ export default {
     // 获取子应用相关列表
     async getMicroAppsInfo() {
       this.loadingAdd()
-      await getMenuAndRela(this.asyncRelaNos, this.extraForm, this.loadingSub)
-      sessionStorage.setItem('isAsyncGetRela', this.asyncRelaNos)
-      sessionStorage.setItem('extraFormToGetMenu', JSON.stringify(this.extraForm))
+      let { data } = await axios.get(
+        '/bems/1.0/menuTree/tree',
+        {
+          resType: this.asyncRelaNos ? '1' : undefined,
+          ...this.extraForm
+        },
+        { loading: this.loadingSub }
+      )
+      data || (data = [])
+
+      let layoutMenus = siteTree2menus(data)
+      sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
+
+      let relaNos = siteTree2RelaNos(data)
+      sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
+
+      // XXX: 兼容旧版resources
+      sessionStorage.setItem('resources', JSON.stringify(data))
     },
     // 新增不同单位对应不同角色,具有不同权限
     getCltRelaNos() {

package/src/components/LoginTemporary/indexN.vue

@@ -238,7 +238,7 @@ export default {
           },
           {
             NO: 'JRWG',
-            NAME: '金融网管系统',
+            NAME: '金融网关系统',
             ICON: undefined,
             LOGIN_MODE: [],
             OPEN: false

package/src/components/LoginTemporary/utils.js

@@ -84,25 +84,3 @@ export function siteTree2RelaNos(siteTree) {
   let relaNos = Object.values(relaNosMap)
   return relaNos
 }
-
-import axios from '../../utils/axios'
-export async function getMenuAndRela(asyncRelaNos, extraForm, loadingSub) {
-  let { data } = await axios.get(
-    '/bems/1.0/menuTree/tree',
-    {
-      resType: asyncRelaNos ? '1' : undefined,
-      ...extraForm
-    },
-    { loading: loadingSub }
-  )
-  data || (data = [])
-
-  let layoutMenus = siteTree2menus(data)
-  sessionStorage.setItem('menuTree', JSON.stringify(layoutMenus))
-
-  let relaNos = siteTree2RelaNos(data)
-  sessionStorage.setItem('relaNos', JSON.stringify(relaNos))
-
-  // XXX: 兼容旧版resources
-  sessionStorage.setItem('resources', JSON.stringify(data))
-}