n20-common-lib 2.4.62 → 2.4.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.4.62",
+  "version": "2.4.64",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -49,6 +49,7 @@
   "dependencies": {
     "axios": "*",
     "dayjs": "*",
+    "element-ui": "^2.15.14",
     "js-cookie": "^3.0.1",
     "jsonwebtoken": "^8.5.1",
     "lz-string": "^1.4.4",
@@ -75,7 +76,6 @@
     "copy-webpack-plugin": "^6.4.1",
     "core-js": "^3.6.5",
     "echarts": "^5.3.3",
-    "element-ui": "^2.15.9",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
     "exceljs": "^4.3.0",
@@ -105,11 +105,11 @@
     "vue-router": "^3.5.2",
     "vue-template-compiler": "^2.6.11",
     "vuex": "^3.6.2",
+    "vxe-table": "^3.6.17",
     "webpack-bundle-analyzer": "^3.9.0",
+    "xe-utils": "^3.5.11",
     "xlsx": "0.14.1",
-    "xlsx-style": "^0.8.13",
-    "vxe-table": "^3.6.17",
-    "xe-utils": "^3.5.11"
+    "xlsx-style": "^0.8.13"
   },
   "browserslist": [
     "> 1%",

package/src/components/DatePicker/por.vue

@@ -18,27 +18,27 @@
 
 <script>
 import { $lc } from '../../utils/i18n/index'
-import dayjs from 'dayjs'
-let startDate = ''
+// import dayjs from 'dayjs'
+// let startDate = ''
 
-const onPick = ({ maxDate, minDate }) => {
-  startDate = minDate.getMonth() + 1 + '-' + minDate.getDate()
-  let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
-  startSh.text = startDate + $lc('开始')
-  startSh.onClick = (picker) => {
-    const start = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
-    const end = dayjs(minDate).add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-    picker.$emit('pick', [start, end])
-  }
+// const onPick = ({ maxDate, minDate }) => {
+//   startDate = minDate.getMonth() + 1 + '-' + minDate.getDate()
+//   let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+//   startSh.text = startDate + $lc('开始')
+//   startSh.onClick = (picker) => {
+//     const start = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+//     const end = dayjs(minDate).add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+//     picker.$emit('pick', [start, end])
+//   }
 
-  let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
-  endSh.text = startDate + $lc('截止')
-  endSh.onClick = (picker) => {
-    const end = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
-    const start = dayjs(minDate).subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-    picker.$emit('pick', [start, end])
-  }
-}
+//   let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+//   endSh.text = startDate + $lc('截止')
+//   endSh.onClick = (picker) => {
+//     const end = dayjs(minDate).format('YYYY-MM-DD HH:mm:ss')
+//     const start = dayjs(minDate).subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+//     picker.$emit('pick', [start, end])
+//   }
+// }
 
 let disabledDate_1 = (t) => {
   let now = new Date()
@@ -95,23 +95,23 @@ let shortcuts_2 = [
       end.setHours(23, 59, 59)
       picker.$emit('pick', [start, end])
     }
-  },
-  {
-    text: $lc('今天开始'),
-    onClick(picker) {
-      const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      const end = dayjs().add(99, 'year').format('YYYY-MM-DD HH:mm:ss')
-      picker.$emit('pick', [start, end])
-    }
-  },
-  {
-    text: $lc('今天截止'),
-    onClick(picker) {
-      const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-      picker.$emit('pick', [start, end])
-    }
   }
+  // {
+  //   text: $lc('今天开始'),
+  //   onClick(picker) {
+  //     const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  //     const end = dayjs().add(99, 'year').format('YYYY-MM-DD HH:mm:ss')
+  //     picker.$emit('pick', [start, end])
+  //   }
+  // },
+  // {
+  //   text: $lc('今天截止'),
+  //   onClick(picker) {
+  //     const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  //     const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+  //     picker.$emit('pick', [start, end])
+  //   }
+  // }
 ]
 
 export default {
@@ -168,13 +168,13 @@ export default {
     this.pickerOptionsAs = Object.assign(
       {
         disabledDate: this.minNow ? disabledDate_1 : this.maxNow ? disabledDate_2 : undefined,
-        shortcuts,
-        onPick
+        shortcuts
+        // onPick
       },
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {}, blur: this.HandleBlur })
+    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {} })
     return {}
   },
   computed: {
@@ -202,12 +202,10 @@ export default {
               let D = end.getDate()
               let str = `${Y}-${M > 9 ? M : '0' + M}-${D > 9 ? D : '0' + D}`
               if (this.valueFormat === 'yyyy-MM-dd HH:mm:ss') str = str + ' 23:59:59'
-              startDate = val[0]
               this.$emit('update:start-date', val[0])
               this.$emit('update:end-date', str)
               this.$emit('change', [val[0], str])
             } else {
-              startDate = val[0]
               this.$emit('update:start-date', val[0])
               this.$emit('update:end-date', val[1])
               this.$emit('change', val)
@@ -225,22 +223,22 @@ export default {
     }
   },
   methods: {
-    HandleBlur() {
-      let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
-      let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
-      startSh.text = $lc('今天开始')
-      startSh.onClick = (picker) => {
-        const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
-        const end = dayjs().add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-        picker.$emit('pick', [start, end])
-      }
-      endSh.text = $lc('今天截止')
-      endSh.onClick = (picker) => {
-        const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
-        const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
-        picker.$emit('pick', [start, end])
-      }
-    }
+    // HandleBlur() {
+    //   let startSh = shortcuts_2.find((s) => s.text.includes($lc('开始')))
+    //   let endSh = shortcuts_2.find((s) => s.text.includes($lc('截止')))
+    //   startSh.text = $lc('今天开始')
+    //   startSh.onClick = (picker) => {
+    //     const start = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    //     const end = dayjs().add(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    //     picker.$emit('pick', [start, end])
+    //   }
+    //   endSh.text = $lc('今天截止')
+    //   endSh.onClick = (picker) => {
+    //     const end = dayjs().format('YYYY-MM-DD HH:mm:ss')
+    //     const start = dayjs().subtract(100, 'year').format('YYYY-MM-DD HH:mm:ss')
+    //     picker.$emit('pick', [start, end])
+    //   }
+    // }
   }
 }
 </script>

package/src/components/Dialog/index.vue

@@ -11,6 +11,10 @@ export default {
     appendToBody: {
       type: Boolean,
       default: true
+    },
+    closeOnClickModal: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

package/src/components/LoginTemporary/indexN.css

@@ -186,6 +186,23 @@
   cursor: pointer;
 }
 
+.login-language-box {
+  box-sizing: border-box;
+  position: absolute;
+  top: 57px;
+  right: 200px;
+  width: 28px;
+  height: 28px;
+  line-height: 28px;
+  font-size: 28px;
+  text-align: center;
+  color: #ffffff;
+  cursor: pointer;
+}
+.login-language-box .set-user-btn {
+  font-size: 28px;
+}
+
 .login-copyright {
   position: absolute;
   bottom: 24px;

package/src/components/LoginTemporary/indexN.scss

@@ -210,6 +210,23 @@ $swiperW: 860px;
   color: $colorL;
   cursor: pointer;
 }
+
+.login-language-box {
+  box-sizing: border-box;
+  position: absolute;
+  top: 57px;
+  right: 200px;
+  width: 28px;
+  height: 28px;
+  line-height: 28px;
+  font-size: 28px;
+  text-align: center;
+  color: $colorL;
+  cursor: pointer;
+  .set-user-btn {
+    font-size: 28px;
+  }
+}
 // 版权声明
 .login-copyright {
   position: absolute;

package/src/components/LoginTemporary/indexN.vue

@@ -34,6 +34,35 @@
         />
         <h3 class="login-logo-text">{{ loginLogoText | $l }}</h3>
       </div>
+
+      <el-dropdown
+        class="login-language-box m-l-lg"
+        :style="{ right: _lang == 'en' ? '260px' : '200px' }"
+        @command="setLang"
+      >
+        <!-- <el-tooltip v-if="!hideLang" :content="'语言切换' | $lc"> -->
+        <span
+          class="set-user-btn iconfont header-color"
+          :class="{
+            'icon-zhongwen': langVal === 'zh-cn',
+            'icon-fanti': langVal === 'zh-hk',
+            'icon-yuyanqiehuan': langVal === 'en'
+          }"
+        ></span>
+        <!-- </el-tooltip> -->
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="zh-cn"
+            ><i class="iconfont icon-zhongwen f-s-icon"></i>{{ '简体中文' | $lc }}</el-dropdown-item
+          >
+          <el-dropdown-item command="zh-hk"
+            ><i class="iconfont icon-fanti f-s-icon"></i>{{ '繁体中文' | $lc }}</el-dropdown-item
+          >
+          <el-dropdown-item command="en"
+            ><i class="iconfont icon-yuyanqiehuan f-s-icon"></i>{{ '英文' | $lc }}</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+
       <div v-if="inspectionCenter" class="login-verify-box" @click="inspectionV = true">{{ '查验中心' | $lc }} ></div>
 
       <template v-if="form.LOGIN_TYPE === 'T1'">
@@ -135,7 +164,8 @@ import { $lc } from '../../utils/i18n/index'
 import getJsonc from '../../assets/getJsonc'
 import realUrl from '../../assets/realUrl'
 import axios from '../../utils/axios'
-
+import auth from '../../utils/auth.js'
+import Cookies from 'js-cookie'
 import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
 import Inspection from './inspection/index.vue'
@@ -206,6 +236,7 @@ export default {
         loginCopyright: undefined,
         loginSloganHtml: undefined
       },
+      langVal: window.localStorage.getItem('pageLang') || 'zh-cn',
       operateType: 'login',
       alV: false,
       form: {
@@ -567,6 +598,14 @@ export default {
       localStorage.setItem('pageInSystemNo', item.NO)
       localStorage.setItem('pageInType', 'inFront')
       this.sltSys = item
+    },
+    setLang(val) {
+      this.langVal = val
+
+      window.localStorage.setItem('pageLang', this.langVal)
+      Cookies.set('language', ['zh-cn', 'zh-hk'].includes(this.langVal) ? 'zh' : this.langVal, { expires: 365 })
+      auth.setReqLang()
+      window.location.reload()
     }
   }
 }

package/src/components/Tree/document.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>页面</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="20" height="20"></rect>
+        <path d="M16.6914062,5.63867188 C16.8085938,5.75585938 16.875,5.9140625 16.875,6.08007812 L16.875,18.125 C16.875,18.4707031 16.5957031,18.75 16.25,18.75 L3.75,18.75 C3.40429688,18.75 3.125,18.4707031 3.125,18.125 L3.125,1.875 C3.125,1.52929688 3.40429688,1.25 3.75,1.25 L12.0449219,1.25 C12.2109375,1.25 12.3710938,1.31640625 12.4882813,1.43359375 L16.6914062,5.63867188 Z M15.4335938,6.3671875 L11.7578125,2.69140625 L11.7578125,6.3671875 L15.4335938,6.3671875 Z M6.25,9.4140625 C6.16370551,9.4140625 6.09375,9.48401801 6.09375,9.5703125 L6.09375,10.5078125 C6.09375,10.594107 6.16370551,10.6640625 6.25,10.6640625 L13.75,10.6640625 C13.8362945,10.6640625 13.90625,10.594107 13.90625,10.5078125 L13.90625,9.5703125 C13.90625,9.48401801 13.8362945,9.4140625 13.75,9.4140625 L6.25,9.4140625 Z M6.25,12.0703125 C6.16370551,12.0703125 6.09375,12.140268 6.09375,12.2265625 L6.09375,13.1640625 C6.09375,13.250357 6.16370551,13.3203125 6.25,13.3203125 L9.84375,13.3203125 C9.93004449,13.3203125 10,13.250357 10,13.1640625 L10,12.2265625 C10,12.140268 9.93004449,12.0703125 9.84375,12.0703125 L6.25,12.0703125 Z" id="形状" fill="#1677FF" fill-rule="nonzero"></path>
+    </g>
+</svg>

package/src/components/Tree/folder.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>文件</title>
+    <g id="文件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="20" height="20"></rect>
+        <rect id="矩形" fill="#FFBF00" opacity="0.300000012" x="3" y="4" width="14" height="11"></rect>
+        <path d="M17.1875,5.828125 L10.1757812,5.828125 L7.88476562,3.63671875 C7.85546875,3.609375 7.81640625,3.59375 7.77734375,3.59375 L2.8125,3.59375 C2.46679688,3.59375 2.1875,3.87304688 2.1875,4.21875 L2.1875,15.78125 C2.1875,16.1269531 2.46679688,16.40625 2.8125,16.40625 L17.1875,16.40625 C17.5332031,16.40625 17.8125,16.1269531 17.8125,15.78125 L17.8125,6.453125 C17.8125,6.10742188 17.5332031,5.828125 17.1875,5.828125 Z" id="路径" fill="#FFBF00" fill-rule="nonzero"></path>
+    </g>
+</svg>

package/src/components/Tree/index.js

@@ -0,0 +1,7 @@
+import Tree from './index.vue'
+
+Tree.install = function (Vue) {
+  Vue.component(Tree.name, Tree)
+}
+
+export default Tree

package/src/components/Tree/index.vue

@@ -0,0 +1,111 @@
+<template>
+  <el-tree
+    ref="tree"
+    :node-key="nodeKey"
+    :expand-on-click-node="false"
+    :data="data"
+    :props="props"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <div
+      slot-scope="{ node, data }"
+      class="flex-box flex-lr flex-v w-100p"
+      @mouseenter="mouseenterTree(node, data)"
+      @mouseleave="checkFlag = false"
+    >
+      <span class="flex-box flex-v">
+        <img :src="node.level == 1 ? folder : desc" class="m-r-ss" alt="" />
+
+        {{ (data[props.value] ? '(' + data[props.value] + ') ' : '') + data[props.label] }}
+      </span>
+      <el-button
+        v-if="node.data[nodeKey] === checkFlag && checkFlag.data && checkFlag.data[nodeKey]"
+        type="text"
+        @click="handleChecked(node)"
+        >{{ '只勾选当前节点' }}</el-button
+      >
+    </div>
+  </el-tree>
+</template>
+<script>
+export default {
+  name: 'Tree',
+  props: {
+    data: {
+      type: Array,
+      default: () => []
+    },
+    props: {
+      type: Object,
+      default: () => ({})
+    },
+    nodeKey: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      folder: require('./folder.svg'),
+      desc: require('./document.svg'),
+      checkFlag: {},
+      list: []
+    }
+  },
+  mounted() {
+    this.setRefData()
+  },
+  methods: {
+    setRefData() {
+      const {
+        filter,
+        updateKeyChildren,
+        getCheckedNodes,
+        setCheckedNodes,
+        getCheckedKeys,
+        setCheckedKeys,
+        setChecked,
+        getHalfCheckedNodes,
+        getHalfCheckedKeys,
+        getCurrentKey,
+        getCurrentNode,
+        setCurrentKey,
+        setCurrentNode,
+        getNode,
+        remove,
+        append,
+        insertBefore,
+        insertAfter
+      } = this.$refs['tree']
+
+      this.filter = filter
+      this.updateKeyChildren = updateKeyChildren
+      this.getCheckedNodes = getCheckedNodes
+      this.setCheckedNodes = setCheckedNodes
+      this.getCheckedKeys = getCheckedKeys
+      this.setCheckedKeys = setCheckedKeys
+      this.setChecked = setChecked
+      this.getHalfCheckedNodes = getHalfCheckedNodes
+      this.getHalfCheckedKeys = getHalfCheckedKeys
+      this.getCurrentKey = getCurrentKey
+      this.getCurrentNode = getCurrentNode
+      this.setCurrentKey = setCurrentKey
+      this.setCurrentNode = setCurrentNode
+      this.getNode = getNode
+      this.remove = remove
+      this.append = append
+      this.insertBefore = insertBefore
+      this.insertAfter = insertAfter
+    },
+    handleChecked(node) {
+      this.setChecked(node.data, true)
+    },
+    mouseenterTree(node, data) {
+      this.checkFlag = node
+    }
+  }
+}
+</script>
+
+<style scoped></style>

package/src/i18n.json

@@ -14,6 +14,15 @@
   "天!": {
     "en": "God!"
   },
+  "今天开始": {
+    "en": "Today starts"
+  },
+  "今天截止": {
+    "en": "Today ends"
+  },
+  "截止": {
+    "en": "The deadline"
+  },
   "审批进度查看": {
     "en": "Review of approval progress"
   },

package/src/index.js

@@ -61,6 +61,9 @@ import TertiaryTab from './components/TertiaryTab/index.vue'
 import TimePicker from './components/TimePicker/index.vue'
 import Upload from './components/Upload/index.vue'
 import WornPagination from './components/WornPagination/index.vue'
+
+import Tree from './components/Tree/index.js'
+
 // 新版日期选择框
 import BusiDatePicker from './components/DateSelect/busiDate.vue'
 import QuarterDatePicker from './components/DateSelect/quarterDatePicker.vue'
@@ -190,6 +193,7 @@ const components = [
   TableTransfer,
   WorkCard,
   UploadMsg,
+  Tree,
   /* old */
   TableO,
   FiltersO,
@@ -339,5 +343,6 @@ export {
   // 页签/路由
   setTabs,
   refreshTab,
+  Tree,
   version
 }