n20-common-lib 1.2.36 → 1.2.39

package/package.json

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

package/src/components/ApprovalRecord/approvalImg.vue

@@ -14,7 +14,12 @@ export default {
     // blobUrl: {
     //   type: String,
     //   default: undefined
-    // }
+    // },
+  },
+  inject: {
+    procInstId: {
+      from: 'procInstId'
+    }
   },
   data() {
     return {
@@ -24,7 +29,7 @@ export default {
   created() {
     axios
       .get('/bems/activiti/sample/Q004', {
-        procInstId: this.$route.query.processInstanceId
+        procInstId: this.procInstId
       })
       .then(({ data }) => {
         if (data) {

package/src/components/ApprovalRecord/flowDialog.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <el-button plain size="mini" :disabled="false" @click="imgV = true"
+      >流程图查看</el-button
+    >
+    <el-dialog
+      title="查看流程"
+      :visible.sync="imgV"
+      width="65%"
+      class="p-a-0"
+      append-to-body
+      top="10vh"
+    >
+      <approvalImg
+        :proc-inst-id="procInstId"
+        class="text-c p-a"
+        style="height: 70vh; overflow: auto"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import approvalImg from './approvalImg.vue'
+export default {
+  name: 'FlowDialog',
+  components: {
+    approvalImg
+  },
+  props: {
+    procInstId: {
+      type: String,
+      default: ''
+    }
+  },
+  provide() {
+    return { procInstId: this.$route.query.procInstId || this.procInstId }
+  },
+  data() {
+    return {
+      imgV: false
+    }
+  }
+}
+</script>

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

@@ -139,6 +139,9 @@ export default {
     }
   },
   created() {
+    clearTimeout(this.getNNumTimeOut)
+    this.getNNumTimeOut = setInterval(this.getNNum, 1000 * 60 * 2)
+
     this.getNNum()
   },
   methods: {
@@ -228,6 +231,19 @@ export default {
           }
         })
       }
+      if (item.readState === '0') {
+        this.$axios
+          .put(
+            `/bems/wkb/messageCenter/batchUpdate`,
+            { ids: [item.id], type: '1' },
+            { loading: false, noMsg: true }
+          )
+          .then(() => {
+            item.readState = '1'
+            this.noticeNum = this.noticeNum - 1
+            this.numC = this.numC - 1
+          })
+      }
     },
     seeDetailsAffiche(item) {
       if (this.$route.path === '/notice/views') {

package/src/components/LoginTemporary/qrcode.vue

@@ -1,90 +1,90 @@
-<template>
-  <div v-loading="loadingV">
-    <canvas
-      ref="qr-canvas"
-      style="display: block; width: 212px; height: 212px; margin: 0 auto"
-    ></canvas>
-    <div
-      class="text-r"
-      style="font-size: 12px; color: #3d4a57; margin-bottom: -8px"
-    >
-      请使用网银移动端扫码免Ukey登录<el-button
-        class="m-l-s"
-        type="text"
-        @click="refreshQrCode"
-      >
-        <i class="el-icon-refresh"></i>
-        刷新</el-button
-      >
-    </div>
-  </div>
-</template>
-<script>
-import QRCode from 'qrcode'
-import axios from '../../utils/axios'
-
-export default {
-  data() {
-    this.timeA = undefined
-    return {
-      loadingV: false,
-      qrCode: ''
-    }
-  },
-  created() {
-    this.getQrcode()
-  },
-  beforeDestroy() {
-    clearTimeout(this.timeA)
-  },
-  methods: {
-    getQrcode() {
-      this.loadingV = true
-      let loading = () => {
-        setTimeout(() => {
-          this.loadingV = false
-        }, 500)
-      }
-
-      axios
-        .get('/bems/prod_1.0/uas/api/qrCode', null, { loading })
-        .then(({ data }) => {
-          this.qrCode = data.qrCode
-
-          let qrCanvas = this.$refs['qr-canvas']
-          let width = qrCanvas.clientWidth
-
-          QRCode.toCanvas(this.$refs['qr-canvas'], this.qrCode, {
-            width: width,
-            height: width,
-            margin: 1
-          })
-
-          this.getQrCodePwd()
-        })
-    },
-    refreshQrCode() {
-      this.getQrcode()
-    },
-    getQrCodePwd() {
-      axios
-        .get(`/bems/prod_1.0/uas/api/qrCode/${this.qrCode}`, null, {
-          loading: false
-        })
-        .then(({ data }) => {
-          clearTimeout(this.timeA)
-          if (data.status === 3) {
-            this.QrcodeLogin(data)
-          } else {
-            this.timeA = setTimeout(() => {
-              this.getQrCodePwd()
-            }, 2000)
-          }
-        })
-    },
-    QrcodeLogin({ userNo, qrcode }) {
-      this.$emit('qrcode-login', { userNo, qrcode })
-    }
-  }
-}
-</script>
+<template>
+  <div v-loading="loadingV">
+    <canvas
+      ref="qr-canvas"
+      style="display: block; width: 212px; height: 212px; margin: 0 auto"
+    ></canvas>
+    <div
+      class="text-r"
+      style="font-size: 12px; color: #3d4a57; margin-bottom: -8px"
+    >
+      请使用网银移动端扫码免Ukey登录<el-button
+        class="m-l-s"
+        type="text"
+        @click="refreshQrCode"
+      >
+        <i class="el-icon-refresh"></i>
+        刷新</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import QRCode from 'qrcode'
+import axios from '../../utils/axios'
+
+export default {
+  data() {
+    this.timeA = undefined
+    return {
+      loadingV: false,
+      qrCode: ''
+    }
+  },
+  created() {
+    this.getQrcode()
+  },
+  beforeDestroy() {
+    clearTimeout(this.timeA)
+  },
+  methods: {
+    getQrcode() {
+      this.loadingV = true
+      let loading = () => {
+        setTimeout(() => {
+          this.loadingV = false
+        }, 500)
+      }
+
+      axios
+        .get('/bems/prod_1.0/uas/api/qrCode', null, { loading })
+        .then(({ data }) => {
+          this.qrCode = data.qrCode
+
+          let qrCanvas = this.$refs['qr-canvas']
+          let width = qrCanvas.clientWidth
+
+          QRCode.toCanvas(this.$refs['qr-canvas'], this.qrCode, {
+            width: width,
+            height: width,
+            margin: 1
+          })
+
+          this.getQrCodePwd()
+        })
+    },
+    refreshQrCode() {
+      this.getQrcode()
+    },
+    getQrCodePwd() {
+      axios
+        .get(`/bems/prod_1.0/uas/api/qrCode/${this.qrCode}`, null, {
+          loading: false
+        })
+        .then(({ data }) => {
+          clearTimeout(this.timeA)
+          if (data.status === 3) {
+            this.QrcodeLogin(data)
+          } else {
+            this.timeA = setTimeout(() => {
+              this.getQrCodePwd()
+            }, 2000)
+          }
+        })
+    },
+    QrcodeLogin({ userNo, qrcode }) {
+      this.$emit('qrcode-login', { userNo, qrcode })
+    }
+  }
+}
+</script>

package/src/components/LoginTemporary/utils.js

@@ -1,73 +1,73 @@
-import forEachs from '../../utils/forEachs'
-import list2tree from '../../utils/list2tree'
-
-export function siteTree2menus(siteTree) {
-  let list_1 = []
-
-  forEachs(siteTree, (item) => {
-    if (item.resType === '1' || item.resType === '2') {
-      list_1.push(item)
-    }
-  })
-
-  let list_2 = []
-  list_1.forEach((item) => {
-    let menuObj = {
-      menuid: item.menuid,
-      pmid: item.pmid,
-      sortnum: item.sortnum ? Number(item.sortnum) : item.menuid,
-      appNo: item.appNo || undefined,
-      title: item.label
-    }
-    if (/^http(s)?:|\/\//.test(item.pageurl)) {
-      menuObj.href = item.pageurl
-    } else {
-      menuObj.route = item.pageurl
-    }
-
-    if (/\//.test(item.logo)) {
-      menuObj.iconUrl = item.logo
-    } else {
-      menuObj.iconClass = item.logo
-    }
-
-    if (item.resType === '2') {
-      menuObj.hide = true
-    }
-
-    list_2.push(menuObj)
-  })
-
-  return list2tree(list_2, 'menuid', 'pmid', 'children', 'sortnum')
-}
-
-export function siteTree2RelaNos(siteTree) {
-  let relaNos = []
-  siteTree.forEach((m) => {
-    let oRelaObj = relaNos.find((item) => item.appNo === m.appNo)
-    if (oRelaObj) {
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
-    } else {
-      oRelaObj = {
-        appNo: m.appNo,
-        label: m.label,
-        pageurl: m.pageurl,
-        relaNos: []
-      }
-
-      m.treeno && oRelaObj.relaNos.push(m.treeno)
-      if (Array.isArray(m.children)) {
-        forEachs(m.children, (item) => {
-          item.treeno && oRelaObj.relaNos.push(item.treeno)
-        })
-      }
-      relaNos.push(oRelaObj)
-    }
-  })
-  return relaNos
-}
+import forEachs from '../../utils/forEachs'
+import list2tree from '../../utils/list2tree'
+
+export function siteTree2menus(siteTree) {
+  let list_1 = []
+
+  forEachs(siteTree, (item) => {
+    if (item.resType === '1' || item.resType === '2') {
+      list_1.push(item)
+    }
+  })
+
+  let list_2 = []
+  list_1.forEach((item) => {
+    let menuObj = {
+      menuid: item.menuid,
+      pmid: item.pmid,
+      sortnum: item.sortnum ? Number(item.sortnum) : item.menuid,
+      appNo: item.appNo || undefined,
+      title: item.label
+    }
+    if (/^http(s)?:|\/\//.test(item.pageurl)) {
+      menuObj.href = item.pageurl
+    } else {
+      menuObj.route = item.pageurl
+    }
+
+    if (/\//.test(item.logo)) {
+      menuObj.iconUrl = item.logo
+    } else {
+      menuObj.iconClass = item.logo
+    }
+
+    if (item.resType === '2') {
+      menuObj.hide = true
+    }
+
+    list_2.push(menuObj)
+  })
+
+  return list2tree(list_2, 'menuid', 'pmid', 'children', 'sortnum')
+}
+
+export function siteTree2RelaNos(siteTree) {
+  let relaNos = []
+  siteTree.forEach((m) => {
+    let oRelaObj = relaNos.find((item) => item.appNo === m.appNo)
+    if (oRelaObj) {
+      m.treeno && oRelaObj.relaNos.push(m.treeno)
+      if (Array.isArray(m.children)) {
+        forEachs(m.children, (item) => {
+          item.treeno && oRelaObj.relaNos.push(item.treeno)
+        })
+      }
+    } else {
+      oRelaObj = {
+        appNo: m.appNo,
+        label: m.label,
+        pageurl: m.pageurl,
+        relaNos: []
+      }
+
+      m.treeno && oRelaObj.relaNos.push(m.treeno)
+      if (Array.isArray(m.children)) {
+        forEachs(m.children, (item) => {
+          item.treeno && oRelaObj.relaNos.push(item.treeno)
+        })
+      }
+      relaNos.push(oRelaObj)
+    }
+  })
+  return relaNos
+}

package/src/index.js

@@ -45,6 +45,7 @@ import AnchorItem from './components/Anchor/AnchorItem.vue'
 import FlowStep from './components/FlowStep/index.vue'
 import CascaderArea from './components/CascaderArea/index.vue'
 import FileExportAsync from './components/FileExportAsync/index.vue'
+import FlowDialog from './components/ApprovalRecord/flowDialog.vue'
 /* old */
 import TableO from './components/Table/indexO.vue'
 import FiltersO from './components/Filters/indexO.vue'
@@ -126,6 +127,7 @@ const components = [
   FlowStep,
   CascaderArea,
   FileExportAsync,
+  FlowDialog,
   /* old */
   TableO,
   FiltersO,
@@ -225,5 +227,6 @@ export {
   AnchorItem,
   FlowStep,
   CascaderArea,
-  FileExportAsync
+  FileExportAsync,
+  FlowDialog
 }

package/src/utils/axios.js

@@ -192,8 +192,8 @@ customAxios.post = function (url, data = {}, opt = {}) {
   return request(Object.assign({ method: 'post', url, data }, opt))
 }
 /** @returns {Promise} */
-customAxios.put = function (url, data = {}, params = {}, opt = {}) {
-  return this.request(Object.assign({ method: 'put', url, data, params }, opt))
+customAxios.put = function (url, data = {}, opt = {}) {
+  return this.request(Object.assign({ method: 'put', url, data }, opt))
 }
 /** @returns {Promise} */
 customAxios.delete = function (url, params = {}, opt = {}) {

package/src/utils/repairElementUI.js

@@ -40,11 +40,11 @@ function repairPopper() {
 export default function (ElementUI) {
   repairPopper()
 
-  setPropsDefault(ElementUI.Table, {
-    tooltipEffect: {
-      default: 'light'
-    }
-  })
+  // setPropsDefault(ElementUI.Table, {
+  //   tooltipEffect: {
+  //     default: 'light'
+  //   }
+  // })
 
   setPropsDefault(ElementUI.TableColumn, {
     filterPlacement: {