n20-common-lib 2.13.7 → 2.13.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.13.7",
+  "version": "2.13.9",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AIButton/index.vue

@@ -0,0 +1,90 @@
+<template>
+  <span>
+    <slot :customEvent="aiFn">
+      <el-button v-title="'AI识别'" type="text" icon="n20-icon-query" @click="aiFn" />
+    </slot>
+    <cl-dialog v-drag :visible.sync="visible" title="AI识别" :destroy-on-open="true" width="690px">
+      <cl-upload
+        :drag="true"
+        :file-name.sync="fileName"
+        :file-url.sync="fileUrl"
+        action="/api/neams/eamsbaserecord/batchSavejson"
+        :on-success="onSuccess"
+        :msg-type="null"
+        :data="dataPorp"
+      >
+        <template slot="trigger">
+          <i class="drag-icon n20-icon-shangchuan"></i>
+          <span class="drag-text">点击或将文件拖拽到这里上传</span>
+        </template>
+      </cl-upload>
+    </cl-dialog>
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'AiButton',
+  components: {},
+  props: {
+    AIOptions: {
+      type: Object,
+      default: () => ({})
+    },
+    dataPorp: {
+      type: Object,
+      default: () => {
+        return {
+          data: JSON.stringify({
+            syscode: '010000000',
+            appno: 'abcd',
+            bussValue: '006001001',
+            cltno: '001',
+            creator: 'jz'
+          })
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      fileName: '',
+      fileUrl: ''
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    aiFn() {
+      this.visible = true
+    },
+    onSuccess({ data }) {
+      this.AiFn(data)
+    },
+    // ai识别
+    async AiFn(beid) {
+      if (!this.AIOptions.bussType) {
+        this.$message.error('请先配置bussType')
+        return false
+      }
+      const { data, code } = await this.$axios.post(
+        this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
+        {
+          beid: beid,
+          bussType: this.AIOptions.bussType,
+          extendPrompt: ''
+        }
+      )
+      if (code === 200) {
+        this.$emit('aiFn', data)
+        this.visible = false
+        this.$message.success('识别成功')
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>

package/src/components/FileUploadTable/index.vue

@@ -165,12 +165,14 @@
       <el-table-column :label="'操作' | $lc" align="center" width="90" fixed="right">
         <slot slot="header" slot-scope="scope" name="handle-header" :column="scope.column">{{ '操作' | $lc }}</slot>
         <slot slot-scope="{ row }" name="handle" :row="row">
+          <el-button type="text" icon="el-icon-view" :disabled="!row[keys.url]" @click="seeFile(row)" />
           <el-button
-            v-if="getOfficeStatus"
+            v-if="getOfficeStatus && openAI"
+            v-title="'ai识别'"
             type="text"
-            icon="el-icon-view"
+            icon="n20-icon-query"
             :disabled="!row[keys.url]"
-            @click="seeFile(row)"
+            @click="AiFn(row)"
           />
           <el-button
             v-if="readonly"
@@ -334,6 +336,14 @@ export default {
     }
   },
   props: {
+    AIOptions: {
+      type: Object,
+       default: () => ({})
+    },
+    openAI: {
+      type: Boolean,
+      default: false
+    },
     readonly: {
       type: Boolean,
       default: false
@@ -466,6 +476,24 @@ export default {
     this.getConfiguration()
   },
   methods: {
+    // ai识别
+    async AiFn(row) {
+      if (!this.AIOptions.bussType) {
+        this.$message.error('请先配置bussType')
+        return false
+      }
+      const { data, code } = await this.$axios.post(
+        this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
+        {
+          beid: row.beid,
+          bussType: this.AIOptions.bussType,
+          extendPrompt: ''
+        }
+      )
+      if (code === 200) {
+        this.$emit('aiFn', data)
+      }
+    },
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
         .then(({ loginConf }) => {
@@ -536,7 +564,7 @@ export default {
       $uploadwrap.submit()
     },
     batchSuccess(response, file, fileList) {
-      let row = {...this.dataPorp.keys}
+      let row = { ...this.dataPorp.keys }
       this.tableData.splice(0, 0, row)
       this.$nextTick(() => {
         this.onSuccessFn(response, file, fileList, row)

package/src/components/HandlingAdvice/index.vue

@@ -23,6 +23,7 @@
             :show-word-limit="showWordLimit"
             :maxlength="maxlength"
             class="w-100p"
+            :placeholder="placeholder"
           />
         </el-form-item>
       </el-form>
@@ -88,7 +89,9 @@ export default {
       reason: '',
       otherAttDataA: [],
       procInstId: '',
-      whether: false
+      whether: false,
+      optionsRequired: false,
+      placeholder: ''
     }
   },
   methods: {
@@ -109,6 +112,12 @@ export default {
         if (code === 200) {
           this.otherAttDataA = data.customizationList || []
           this.whether = data.whether
+          this.optionsRequired = data.optionsRequired
+          if (data.optionsRequired) {
+            this.placeholder = '请选择或输入意见（必填）'
+          } else {
+            this.placeholder = '请选择或输入意见（选填）'
+          }
           this.visible = data.whether === true || this.otherAttDataA.length > 0
           this.flowOptions = data?.opinions?.map((d) => {
             return {
@@ -159,6 +168,10 @@ export default {
       this.reason = val
     },
     submit() {
+      if (this.whether && this.optionsRequired && !this.reason) {
+        this.$message.warning('请选择或输入意见')
+        return
+      }
       const getOtherAttData = this.$refs['showOtherAttNew'] && this.$refs['showOtherAttNew']?.getOtherAttData()
       this.visible = false
       if (this.beforeSubmit) {

package/src/components/TablePro/index.vue

@@ -334,12 +334,17 @@ export default {
     },
     // 计算列宽
     calcColumnWidth(columns) {
+      columns = columns.map((item) => {
+        return {
+          ...item,
+          _width_: 0
+        }
+      })
       const wrapperEl = document.querySelector('div#app')
       const notHasWidth = columns.filter((column) => !column.width && !column.minWidth && column.label !== $lc('操作'))
       if (!wrapperEl || notHasWidth.length > 0) {
         return columns
       }
-      columns = XEUtils.clone(columns, true)
       const { width: windowWidth } = wrapperEl.getBoundingClientRect()
       function calc(columns) {
         let columnsWidth = 0
@@ -368,7 +373,6 @@ export default {
           return column
         })
       }
-
       return calc(columns)
     }
   }

package/src/index.js

@@ -66,6 +66,7 @@ import WornPagination from './components/WornPagination/index.vue'
 
 import AdvancedFilter from './components/AdvancedFilter/index.vue'
 import AttachmentPass from './components/AttachmentPass/index.vue'
+import AIButton from './components/AIButton/index.vue'
 import DateChoose from './components/DateChoose/index.vue'
 import ElectronicArchive from './components/ElectronicArchive/index.vue'
 import HandlingAdvice from './components/HandlingAdvice/index.vue'
@@ -232,6 +233,7 @@ const components = [
   ElectronicArchive,
   Preview,
   AttachmentPass,
+  AIButton,
   HandlingAdvice,
   /* old */
   TableO,
@@ -303,6 +305,7 @@ export {
   ApproveCard,
   ApproveCardZjk,
   AttachmentPass,
+  AIButton,
   BusiDatePicker,
   Button,
   ButtonGroup,

package/src/plugins/Sign/signV3/sign.js

@@ -102,22 +102,24 @@ export function getCertInfo(dn) {
   }
   return new Promise((resolve, reject) => {
     let certInfo
-    IWSAGetAllCertsListInfo('infosec.sm2', 'SignAndEncrypt', 0, (dnList) => {
-      if (!dn) {
-        Message.error('没有获取到签名参数DN!')
-        reject()
-      }
-      if (!dnList) {
-        Message.error('没有获取到证书列表!')
-        reject()
-      }
-      if (dnList.length === 0) {
-        Message.error('用户证书信息与当前用户不匹配!')
-        reject()
-      }
+    IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 0, (dnList) => {
+      IWSAGetAllCertsListInfo('infosec.sm2', 'Sign', 2, (dnList2) => {
+        if (!dn) {
+          Message.error('没有获取到签名参数DN!')
+          reject()
+        }
+        if (!dnList && !dnList2) {
+          Message.error('没有获取到证书列表!')
+          reject()
+        }
+        if (dnList.length === 0 && dnList2.length === 0) {
+          Message.error('用户证书信息与当前用户不匹配!')
+          reject()
+        }
 
-      certInfo = verifyDn(dnList, dn)
-      resolve(certInfo)
+        certInfo = verifyDn([...dnList, ...dnList2], dn)
+        resolve(certInfo)
+      })
     })
   })
 }
@@ -169,10 +171,10 @@ function verifyDn(dnList, dn) {
     }
   })
   if (index === -1) {
-    let dnList = dnList?.map((res) => res.certDN)?.join(',')
+    let dnListA = dnList?.map((res) => res.certDN)?.join(',')
     Message({
       type: 'error',
-      text: `证书Dn不匹配:${dnList}里面无法匹配===>${dn}`,
+      text: `证书Dn不匹配:${dnListA}里面无法匹配===>${dn}`,
       duration: 5000
     })
     return index