n20-common-lib 2.4.49 → 2.4.51

package/src/assets/iconFont3/iconfont.json

@@ -0,0 +1,541 @@
+{
+  "id": "2782772",
+  "name": "N20PC组件库",
+  "font_family": "core-lib-iconfont",
+  "css_prefix_text": "n20-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "37315078",
+      "name": "图钉",
+      "font_class": "tuding",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "35627211",
+      "name": "出口",
+      "font_class": "chukou",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "35627212",
+      "name": "步骤",
+      "font_class": "buzhou",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "35627213",
+      "name": "撤销",
+      "font_class": "chexiao",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "35627214",
+      "name": "并行网关",
+      "font_class": "binghangwangguan",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "35627215",
+      "name": "保存",
+      "font_class": "baocun",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "35627216",
+      "name": "框选",
+      "font_class": "kuangxuan",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "35627217",
+      "name": "分支网关",
+      "font_class": "fenzhiwangguan",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "35627218",
+      "name": "预览",
+      "font_class": "yulan",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "35627219",
+      "name": "入口",
+      "font_class": "rukou",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "35627220",
+      "name": "合并网关",
+      "font_class": "hebingwangguan",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "35627221",
+      "name": "恢复",
+      "font_class": "huifu",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "34742144",
+      "name": "收起折叠（去边框）",
+      "font_class": "shouqizhedie",
+      "unicode": "e620",
+      "unicode_decimal": 58912
+    },
+    {
+      "icon_id": "34737047",
+      "name": "折叠收起",
+      "font_class": "zhedieshouqi",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "29079842",
+      "name": "倒序",
+      "font_class": "daoxu",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "29079843",
+      "name": "顺序",
+      "font_class": "shunxu",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "29012251",
+      "name": "菜单收起",
+      "font_class": "caidanshouqi",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "28927755",
+      "name": "流程",
+      "font_class": "liucheng",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "28885219",
+      "name": "成功",
+      "font_class": "chenggong",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "28885221",
+      "name": "4.down",
+      "font_class": "a-4down",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "28885222",
+      "name": "编 辑",
+      "font_class": "a-bianji",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "28885223",
+      "name": "单选框-未选中",
+      "font_class": "danxuankuang-weixuanzhong",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "28885224",
+      "name": "错误",
+      "font_class": "cuowu",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "28885227",
+      "name": "单选框-已选中",
+      "font_class": "danxuankuang-yixuanzhong",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "28885229",
+      "name": "多选框-未选悬停",
+      "font_class": "duoxuankuang-weixuanxuanting",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "28885238",
+      "name": "反馈-成功空心",
+      "font_class": "fankui-chenggongkongxin",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "28885240",
+      "name": "年份切换-右侧",
+      "font_class": "nianfenqiehuan-youce",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "28885241",
+      "name": "反馈-信息空心",
+      "font_class": "fankui-xinxikongxin",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "28885242",
+      "name": "关闭-默认",
+      "font_class": "guanbi-moren",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "28885246",
+      "name": "减号",
+      "font_class": "jianhao",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "28885251",
+      "name": "可关闭错误",
+      "font_class": "keguanbicuowu",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "28885252",
+      "name": "年份切换-左侧",
+      "font_class": "nianfenqiehuan-zuoce",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "28885253",
+      "name": "默认",
+      "font_class": "moren",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "28885256",
+      "name": "搜索框-搜索弹窗",
+      "font_class": "sousuokuang-sousuodanchuang",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "28885258",
+      "name": "提示",
+      "font_class": "tishi",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "28885260",
+      "name": "下拉-默认",
+      "font_class": "xiala-moren",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "28885261",
+      "name": "日期选择-日历",
+      "font_class": "riqixuanze-rili",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "28885262",
+      "name": "卡片（选中）",
+      "font_class": "a-kapianxuanzhong1",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "28885263",
+      "name": "新增",
+      "font_class": "xinzeng",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "28885265",
+      "name": "文件",
+      "font_class": "wenjian",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "28885268",
+      "name": "信息",
+      "font_class": "xinxi",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "28885269",
+      "name": "图标和文本提示",
+      "font_class": "tubiaohewenbentishi",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "28885270",
+      "name": "下载-默认",
+      "font_class": "xiazai-moren",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "28885271",
+      "name": "文件上传",
+      "font_class": "wenjianshangchuan",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "28885273",
+      "name": "信息提示",
+      "font_class": "xinxitishi",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "28885274",
+      "name": "选择框-下拉展开",
+      "font_class": "xuanzekuang-xialazhankai",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "28885275",
+      "name": "选择框-下拉",
+      "font_class": "xuanzekuang-xiala",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "28885277",
+      "name": "月份切换-右侧",
+      "font_class": "yuefenqiehuan-youce",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "28885279",
+      "name": "预览-默认",
+      "font_class": "yulan-moren",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "28885280",
+      "name": "月份切换-左侧",
+      "font_class": "yuefenqiehuan-zuoce",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "28885284",
+      "name": "搜索框-搜索",
+      "font_class": "sousuokuang-sousuo",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "28882629",
+      "name": "刷新",
+      "font_class": "shuaxin",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "672036",
+      "name": "下拉",
+      "font_class": "xiala",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "27964179",
+      "name": "编辑选中",
+      "font_class": "bianjixuanzhong",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
+      "icon_id": "27964193",
+      "name": "表格（选中）",
+      "font_class": "a-biaogexuanzhong",
+      "unicode": "e608",
+      "unicode_decimal": 58888
+    },
+    {
+      "icon_id": "27964199",
+      "name": "卡片（选中）",
+      "font_class": "a-kapianxuanzhong",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "27964207",
+      "name": "全节点（选中）",
+      "font_class": "a-quanjiedianxuanzhong",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
+    },
+    {
+      "icon_id": "27964212",
+      "name": "删除（选中）",
+      "font_class": "a-shanchuxuanzhong",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
+    },
+    {
+      "icon_id": "27964230",
+      "name": "自身办理节点",
+      "font_class": "zishenbanlijiedian",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "27964102",
+      "name": "票面（选中）",
+      "font_class": "a-piaomianxuanzhong",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "11372694",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "26396703",
+      "name": "总金额",
+      "font_class": "zongjine",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "577398",
+      "name": "向下1",
+      "font_class": "xiangxia1",
+      "unicode": "e771",
+      "unicode_decimal": 59249
+    },
+    {
+      "icon_id": "4765723",
+      "name": "Dollar",
+      "font_class": "Dollar",
+      "unicode": "e77d",
+      "unicode_decimal": 59261
+    },
+    {
+      "icon_id": "6301055",
+      "name": "禁止",
+      "font_class": "jinzhi",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "6829304",
+      "name": "ic_bank",
+      "font_class": "ic_bank",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "12003265",
+      "name": "Bill A",
+      "font_class": "BillA",
+      "unicode": "ea71",
+      "unicode_decimal": 60017
+    },
+    {
+      "icon_id": "1986988",
+      "name": "删除",
+      "font_class": "n-shanchu",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "6446147",
+      "name": "消息",
+      "font_class": "tianchongxing",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "552270",
+      "name": "shaixuan",
+      "font_class": "iconfontshaixuan",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "8361853",
+      "name": "眼睛1",
+      "font_class": "yanjing",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "1301374",
+      "name": "上传",
+      "font_class": "shangchuan",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "7404517",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e785",
+      "unicode_decimal": 59269
+    },
+    {
+      "icon_id": "4880417",
+      "name": "拖动",
+      "font_class": "tuodong",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "24101213",
+      "name": "user",
+      "font_class": "user",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "24027681",
+      "name": "date",
+      "font_class": "date",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    }
+  ]
+}

package/src/components/ApprovalButtons/index.vue

@@ -59,6 +59,7 @@
               type="textarea"
               :value="addTaskList.map((c) => c.uname).join(', ')"
               :autosize="{ minRows: 1 }"
+              clearable
               @focus="setAddtaskV = true"
             />
           </div>
@@ -112,7 +113,19 @@
     <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '加 签' | $lc }}</el-button>
     </div>
-    <div v-else class="text-c">
+    <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
+      <el-button type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
+      <el-button type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
+      <el-button plain @click="rejectFn">{{ '驳回至发起人' | $lc }}</el-button>
+      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
+        '驳回至上一节点' | $lc
+      }}</el-button> -->
+
+      <el-button type="danger" plain @click="discardFn">{{ '作 废' | $lc }}</el-button>
+      <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
+    </div>
+    <div v-else-if="!authList.includes('byAddTask')" class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="approvalFn">{{ '批 准' | $lc }}</el-button>
       <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
       <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>

package/src/components/FlowStep/index.vue

@@ -50,6 +50,11 @@ export default {
         return []
       }
     },
+    disabled: {
+      // 是否禁用
+      type: Boolean,
+      default: false
+    },
     stepsDesc: {
       // 步骤description数组
       type: Array,
@@ -77,11 +82,17 @@ export default {
   methods: {
     onChange(index) {
       // 点击切换选择步骤
-      console.log('index:', index)
-      if (this.current !== index) {
+      if (this.current !== index && !this.disabled) {
         this.current = index
         this.$emit('change', index)
       }
+    },
+    next() {
+      let nextIndex = this.currentStep
+      if (this.current >= this.totalSteps) {
+        this.current = 0
+      }
+      this.current += nextIndex
     }
   }
 }

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

@@ -103,7 +103,19 @@
       @command="setUserFn"
       @visible-change="setUserVisible"
     >
-      <img v-popover:by_popover class="user-info-btn header-color" :src="headerUserUrl" />
+      <div class="flex-box">
+        <img v-popover:by_popover class="user-info-btn header-color" :src="headerUserUrl" />
+        <div
+          v-if="customOpt?.companyName"
+          v-title:br="rolesList.map((el) => el.name).join(',')"
+          :style="{ width: (userInfo?.companyName?.length * 0.86 || 4) + 'em', overflow: 'hidden' }"
+          class="pointer"
+          @click="handleUser"
+        >
+          <div class="font-size-small text-ellipsis">{{ userNo }}/{{ rolesList.map((el) => el.name).join('/') }}</div>
+          <div class="companyClass">{{ userInfo.companyName }}</div>
+        </div>
+      </div>
 
       <el-dropdown-menu
         ref="userDropMenu"
@@ -215,15 +227,6 @@
         <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">

package/src/i18n.json

@@ -6,7 +6,7 @@
     "en": "Data request"
   },
   "新一代集团财资管理系统": {
-    "en": "New generation group accounting system"
+    "en": "Group Treasury Management System"
   },
   "不支持在线预览，请": {
     "en": "Online preview is not supported, please"
@@ -234,7 +234,7 @@
     "en": "Approval Opinions"
   },
   "批 准": {
-    "en": "Approval"
+    "en": "Approve"
   },
   "请输入手机号": {
     "en": "Please enter your mobile phone number"
@@ -402,7 +402,7 @@
     "en": "Information presentation component"
   },
   "驳回至发起人": {
-    "en": "Rejected to promoter"
+    "en": "Reject to initiator"
   },
   "驳回至申请人": {
     "en": "Rejected to applicant"
@@ -1515,7 +1515,7 @@
     "en": "Approved to"
   },
   "驳回至": {
-    "en": "Rejected to"
+    "en": "Reject"
   },
   "设置抄送用户": {
     "en": "Set Cc User"