n20-common-lib 1.3.45 → 1.3.48

package/nstc-g6/components/NstcElectronicFile/NstcElectronicFile.vue

@@ -5,7 +5,11 @@
     <div class="uploadfiletip">
       <div>附件信息</div>
       <div>
-        <el-button type="primary" size="small" @click="createRow"
+        <el-button
+          v-if="viewMode"
+          type="primary"
+          size="small"
+          @click="createRow"
           >新增</el-button
         >
         <el-button size="small" plain @click="batchload">下载</el-button>
@@ -26,6 +30,7 @@
       <el-table-column label="附件类型">
         <template slot-scope="scope">
           <el-select
+            v-if="scope.row.updateType != 0"
             v-model="scope.row.attnoadd"
             placeholder="请选择"
             size="small"
@@ -38,22 +43,25 @@
               :value="item.attno"
             />
           </el-select>
+          <span v-if="scope.row.updateType === 0">{{ scope.row.attname }}</span>
         </template>
       </el-table-column>
       <el-table-column label="附件名称" width="200">
         <template slot-scope="scope">
           <el-input
+            v-if="scope.row.updateType != 0"
             v-model="scope.row.memo"
             size="small"
             autocomplete="off"
             placeholder="请输入"
             clearable
           />
+          <span v-if="scope.row.updateType === 0">{{ scope.row.memo }}</span>
         </template>
       </el-table-column>
       <el-table-column label="附件上传">
         <template slot-scope="scope">
-          <div class="cantpick">
+          <div v-if="scope.row.updateType != 0" class="cantpick">
             <div
               v-show="!scope.row.attnoadd"
               class="canttip"
@@ -103,16 +111,23 @@
               </el-input>
             </el-upload>
           </div>
+          <span v-if="scope.row.updateType === 0">{{
+            scope.row.recordname
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="文件大小">
         <template slot-scope="scope">
           <span v-if="scope.row.file != null">{{ scope.row.file.size }}</span>
+          <span v-if="scope.row.updateType === 0">{{
+            scope.row.fileSize
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="上传时间" align="left">
         <template slot-scope="scope">
           <span v-if="scope.row.file != null">{{ uploadDate }}</span>
+          <span>{{ format(scope.row.uploadtime, 'yyyy-MM-dd hh:mm:ss') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="上传进度">
@@ -157,9 +172,14 @@
       <el-table-column label="操作" type="index" width="100">
         <template slot-scope="scope">
           <i
-            v-show="scope.row.recordno"
+            v-show="scope.row.beid && scope.row.updateType != 0"
             class="el-icon-view"
-            @click="handleDownload(scope.row.recordno)"
+            @click="handleDownload(scope.row.beid, scope.row.file.name)"
+          ></i>
+          <i
+            v-show="scope.row.beid && scope.row.updateType === 0"
+            class="el-icon-view"
+            @click="handleDownload(scope.row.beid, scope.row.recordname)"
           ></i>
         </template>
       </el-table-column>
@@ -171,37 +191,37 @@
 
 <script>
 import axios from 'axios'
+import Cookies from 'js-cookie'
 var CancelToken = axios.CancelToken
+let token = Cookies.get('Admin-Token')
+function randomString(num) {
+  num = num || 32
+  var t = ''
+  t = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'
+
+  const a = t.length
+  let n = ''
+  for (let i = 0; i < num; i++) n += t.charAt(Math.floor(Math.random() * a))
+  return n
+}
 export default {
   name: 'NstcElectronicFile',
   props: {
+    value: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     paramVal: {
       default: null,
       type: Object
     },
-    sysno: {
-      default: '',
-      type: String
-    },
-    appno: {
-      default: '',
-      type: String
-    },
-    bussValue: {
-      default: '',
-      type: String
-    },
-    bussId: {
-      default: '',
-      type: String
-    },
-    cltno: {
-      default: '',
-      type: String
-    },
-    cltname: {
-      default: '',
-      type: String
+    viewMode: {
+      default() {
+        return false
+      },
+      type: Boolean
     },
     propList: {
       default: null,
@@ -211,7 +231,6 @@ export default {
   data() {
     return {
       VisibleAdd: true,
-      files: [],
       eamsAttachfiles: [],
       eamsBaseRecord: {},
       attno: '',
@@ -227,18 +246,65 @@ export default {
       axios: axios
     }
   },
-  watch: {},
+  computed: {
+    files: {
+      get() {
+        return this.value
+      },
+      set(val) {
+        this.$emit('input', val)
+      }
+    }
+  },
+  watch: {
+    'paramVal.bussId'(val) {
+      this.getUploadedFile()
+    }
+  },
   created() {
     this.getUploadDate()
     axios.defaults.timeout = 60000
   },
   mounted: function () {
     this.getBussTypeSetting()
+    this.getUploadedFile()
   },
   methods: {
+    formatDate(date, fmt) {
+      date = new Date(date)
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + '').substr(4 - RegExp.$1.length)
+        )
+      }
+      let o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+      }
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + ''
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : this.padLeftZero(str)
+          )
+        }
+      }
+      return fmt
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
+    format(date, f) {
+      if (date == '' || date == undefined) {
+        return ''
+      }
+      return this.formatDate(date, f)
+    },
     getUploadDate() {
       let date = new Date()
       this.uploadDate =
@@ -261,6 +327,26 @@ export default {
       }
       this.files.push(row)
     },
+    // 获取业务附件数
+    getUploadedFile() {
+      let params = {
+        bussValue: this.paramVal.bussValue,
+        bussId: this.paramVal.bussId
+      }
+      axios
+        .post('/api/neams/eamsbaserecord/queryList', params)
+        .then((res) => {
+          res.data.length &&
+            res.data.forEach((file) => {
+              file.updateType = 0
+            })
+          this.files = res.data || []
+          console.log(this.files, 'file')
+        })
+        .catch((error) => {
+          console.log(error)
+        })
+    },
     batchload() {
       this.$confirm('确定下载选中的附件?', {
         confirmButtonText: '确定',
@@ -282,15 +368,34 @@ export default {
         type: 'warning'
       }).then(() => {
         let files = this.files
+        let idArr = []
         while (this.multipleSelection.length > 0) {
           let pop = this.multipleSelection.pop()
+          if (pop.beid) {
+            idArr.push(pop.beid)
+          }
           for (let i = 0; i < files.length; i++) {
             if (files[i] == pop) {
               files.splice(i, 1)
             }
           }
         }
-        this.files = files
+        if (idArr.length === 0) {
+          return
+        }
+        axios
+          .post('/api/neams/eamsbaserecord/delete', idArr)
+          .then((res) => {
+            if (res.code == '200') {
+              this.$message.success('删除成功')
+              this.files = files
+            } else {
+              this.$message.success('删除失败' + res.data.msg)
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
       })
     },
     handleDelete(index) {
@@ -301,13 +406,13 @@ export default {
       this.VisibleAdd = true
     },
     getBussTypeSetting() {
-      this.axios
-        .get(
-          '/neams/eamsattachfile/queryByBussValue/' +
-            this.$props.paramVal.bussValue
-        )
-        .then((response) => {
-          this.eamsAttachfiles = response.data.data
+      let params = {
+        bussValue: this.$props.paramVal.bussValue
+      }
+      axios
+        .post('/api/neams/eamsattachfile/getByBussValue', params)
+        .then((res) => {
+          this.eamsAttachfiles = res.data.data
         })
         .catch(function (error) {
           console.log(error)
@@ -411,12 +516,17 @@ export default {
       formData.append('date', '2021-08-02 12:33:33,2023-08-23 12:33:33')
       _file.cancel = ''
       axios({
-        url: '/neams/eamsbaserecord/batchSavejson',
+        url: '/api/neams/eamsbaserecord/batchSavejson',
         method: 'post',
         data: formData,
         contentType: false,
         headers: {
-          'Content-Type': 'multipart/form-data;charset=utf-8'
+          charset: 'utf-8',
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'multipart/form-data',
+          timestamp: Date.now(),
+          requestKey: randomString(16),
+          OperationDesc: 'yYarJp'
         },
         onUploadProgress(progressEvent) {
           _file.loadprogress =
@@ -435,11 +545,11 @@ export default {
             _file.upstatus = 2
             this.$message.success('上传成功！')
             let recordno = res.data.data.replace(',', '')
-            _file.recordno = recordno
-            if (this.recordarr.indexOf(recordno) === -1) {
-              this.recordarr.push(recordno)
-              this.$emit('refreshDataList', this.recordarr)
-            }
+            // _file.recordno = recordno
+            // if (this.recordarr.indexOf(recordno) === -1) {
+            //   this.recordarr.push(recordno)
+            //   this.$emit('refreshDataList', this.recordarr)
+            // }
           }
         })
         .catch((err) => {
@@ -453,11 +563,21 @@ export default {
     cancelupload(index) {
       this.files[index].cancel()
     },
-    handleDownload(row) {
+    handleDownload(beid, name) {
       this.axios({
-        method: 'GET',
-        url: `/neams/eamsbaserecord/download/${row}/${0}`,
-        responseType: 'blob'
+        method: 'POST',
+        url: '/api/neams/eamsbaserecord/downloadFile',
+        responseType: 'blob',
+        headers: {
+          charset: 'utf-8',
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+          // "Content-Type": "multipart/form-data",
+          timestamp: Date.now(),
+          OperationDesc: 'yYarJp',
+          requestKey: randomString(16)
+        },
+        data: { beid: beid }
       })
         .then((response) => {
           if (response.data.type === 'application/octet-stream') {

package/package.json

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

package/src/plugins/Sign/sign.js

@@ -1,6 +1,13 @@
 // Attached方式签名
 import { IWSAgent } from './InfosecNetSignCNGAgent.min.js'
-const { IWSASetTimeOut, IWSAAttachedSign, IWSAAttachedVerify, IWSASendAvailable, IWSAGetAvailable } = new IWSAgent()
+const {
+  IWSASetTimeOut,
+  IWSAAttachedSign,
+  IWSAAttachedVerify,
+  IWSASendAvailable,
+  IWSAGetAvailable,
+  IWSAGetAllCertsListInfoByCertDN
+} = new IWSAgent()
 IWSASetTimeOut(6000)
 
 let _dn
@@ -52,6 +59,12 @@ export function getSign(plain, dn) {
     plainText = plain
   }
 
+  let checkRes
+  IWSAGetAllCertsListInfoByCertDN('', 'Sign', parseCA(dn), 0, (dnList) => {
+    checkRes = verifyDn(dnList, dn)
+  })
+  if (checkRes) return ''
+
   let answer = undefined
   IWSAAttachedSign('1', plainText, '0', 'SHA1', (errorCode, signedData) => {
     if (errorCode === 0 || errorCode === '0') {
@@ -62,3 +75,34 @@ export function getSign(plain, dn) {
   })
   return answer
 }
+
+function parseCA(dn) {
+  const mark = /^CN=/
+  let cn = ''
+  if (dn == null) return cn
+
+  let booked = dn.split(',')
+  let dnC = booked.find((b) => mark.test(b))
+  dnC && (cn = dnC.replace(mark, ''))
+  return cn
+}
+
+function verifyDn(dnList, dn) {
+  if (!dnList || dnList.length === 0) return 'dnListEmpty'
+
+  if (!dn) return 'dnIsEmpty'
+
+  let checkRes = ''
+  let userDnAttrsArr = dn.split(',').map((c) => c.trim())
+
+  dnList.find((C) => {
+    let dnAttrsArr = C.certDN.split(',').map((c) => c.trim())
+
+    if (!dnAttrsArr.some((dnAttr) => userDnAttrsArr.includes(dnAttr))) {
+      checkRes = 'checkRes'
+      return true
+    }
+  })
+
+  return checkRes
+}