n20-common-lib 2.16.18 → 2.16.20

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -683,6 +683,12 @@ export default {
           noMsg: true
         })
         .then(({ data = {} }) => {
+          // 自定义按钮
+          if (data.customBtnName && data.customBtnName.length > 0) {
+            data.customBtnName.forEach((item) => {
+              this.btnsNames[item.key] = item.optionName
+            })
+          }
           let { taskDefKey, menuAuthority } = data
 
           this.taskDefKey = taskDefKey

package/src/components/FileUploadTable/aiCheckDialog.vue

@@ -8,14 +8,7 @@
     :close-on-click-modal="false"
     @close="closeSee"
   >
-    <Table
-      :data="tableData"
-      :columns="checkColumns"
-      :filters-map="filtersMap"
-      height="400px"
-      :show-setsize="true"
-      :cell-default="true"
-    >
+    <Table :data="tableData" :columns="checkColumns" height="400px" :show-setsize="true" :cell-default="true">
       <el-table-column slot="checkStatus" slot-scope="{ column }" v-bind="column">
         <template slot-scope="{ row }">
           <el-tag v-if="row.checkStatus === '0'" effect="dark" type="warning" size="mini">不通过</el-tag>
@@ -24,7 +17,13 @@
       </el-table-column>
       <el-table-column slot="remark" slot-scope="{ column }" v-bind="column">
         <template slot-scope="{ row }">
-          <el-input v-model="row.remark" placeholder="请输入" size="normal" clearable :disabled="readonly" />
+          <el-input
+            v-model="row.remark"
+            placeholder="请输入"
+            size="normal"
+            clearable
+            :disabled="readonly || row.status === '1'"
+          />
         </template>
       </el-table-column>
     </Table>

package/src/components/FileUploadTable/index.vue

@@ -544,27 +544,34 @@ export default {
     },
     // ai校验
     async AiCheck(row) {
-      if (!this.AIOptions.bussType) {
-        this.$message.error('请先配置bussType')
-        return false
-      }
-      let { data, code } = await this.$axios.post(
-        this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
-        {
-          ...this.AIOptions,
-          beid: row.beid,
-          bussType: this.AIOptions.bussType,
-          extendPrompt: ''
-        }
-      )
-      if (code === 200) {
-        this.$emit('AiCheckFn', data, (result) => {
+      // isOptionAiCheck为true,业务组件自己调ai校验
+      if (this.AIOptions.isOptionAiCheck) {
+        this.$emit('AiCheckFn', row, (result) => {
           row.aiCheckStatus = result.aiCheckStatus
           this.tableKey++
-          if (row.aiCheckStatus === 0) {
-            this.$refs.aiCheckDialog.setView(result.list, row.beid)
-          }
+          this.$refs.aiCheckDialog.setView(result.list, row.beid)
         })
+      } else {
+        if (!this.AIOptions.bussType) {
+          this.$message.error('请先配置bussType')
+          return false
+        }
+        let { data, code } = await this.$axios.post(
+          this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
+          {
+            ...this.AIOptions,
+            beid: row.beid,
+            bussType: this.AIOptions.bussType,
+            extendPrompt: ''
+          }
+        )
+        if (code === 200) {
+          this.$emit('AiCheckFn', data, (result) => {
+            row.aiCheckStatus = result.aiCheckStatus
+            this.tableKey++
+            this.$refs.aiCheckDialog.setView(result.list, row.beid)
+          })
+        }
       }
     },
     // ai识别