n20-common-lib 2.9.76 → 2.9.78

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -125,7 +125,7 @@
           />
         </el-form-item>
       </div>
-      <el-form-item v-if="fileKit || fileKitT" :label="$lc('附件上传')">
+      <el-form-item v-if="fileKitT" :label="$lc('附件上传')">
         <cl-upload
           class="upload-224"
           :file-name.sync="fileName"
@@ -134,7 +134,10 @@
           :file-url.sync="fileUrl"
           :on-success="onSuccess"
           :on-remove="onRemove"
-          action="/neams/eamsbaserecord/batchSavejson"
+          show-file-list
+          :action="
+            apiPrefix ? apiPrefix + `/neams/eamsbaserecord/batchSavejson` : `/api/neams/eamsbaserecord/batchSavejson`
+          "
           msg-type="message"
         />
       </el-form-item>
@@ -360,6 +363,9 @@ export default {
         }
       }
     },
+    apiPrefix: {
+      type: String
+    },
     /**
      * 是否上传审批附件
      */
@@ -421,7 +427,8 @@ export default {
       remarkOpt: [],
       isShowRetrace: undefined,
       isJump: undefined,
-      showFlowDialog: false
+      showFlowDialog: false,
+      IsShowUploadWidget: false
     }
   },
   computed: {
@@ -442,7 +449,7 @@ export default {
     },
     fileKitT: {
       get() {
-        return window.fileKit
+        return this.IsShowUploadWidget || this.fileKit || window.fileKit
       }
     },
     tips() {
@@ -458,8 +465,24 @@ export default {
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
     this.getConfiguration()
+    this.getIsShowUploadWidget()
   },
   methods: {
+    async getIsShowUploadWidget() {
+      const { processInstanceId: procInstId, taskId } = this.$route.query
+      const { code, data } = await this.$axios.get(
+        `/bems/activiti/admin/todo/isShowUploadWidget/${procInstId}/${taskId}`,
+        null,
+        {
+          loading: false,
+          noMsg: true
+        }
+      )
+      if (code === 200) {
+        this.IsShowUploadWidget = data
+      }
+      console.log(code, data)
+    },
     // 意见是否必填
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
@@ -921,7 +944,7 @@ export default {
     onRemove(file, fileList) {
       this.fileDtos = this.getFileDtos(fileList)
     },
-    onSuccess(file, row, fileList) {
+    onSuccess(response, file, fileList) {
       this.fileDtos = this.getFileDtos(fileList)
       this.fileName = file.name || ''
     }

package/src/components/HandlingAdvice/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :visible.sync="visible" width="600px" :title="'提醒' | $lc">
+    <el-dialog :visible.sync="visible" width="600px" :title="'提交意见' | $lc">
       <el-form style="margin-bottom: 50px">
         <el-form-item :label="'请确认提交内容' | $lc">
           <el-select v-model="reasonSelect" class="w-100p" @change="changeReasonSelect">
@@ -50,8 +50,7 @@ export default {
     rows: {
       type: Number,
       default: 5
-    },
-    
+    }
   },
   data() {
     return {

package/src/i18n.json

@@ -3474,5 +3474,10 @@
     "en": "This mode will bypass the middle nodes that have been completed after the node is returned, causing the process to be non-standard. Use with caution!",
     "th": "เมื่อมีการย้อนกลับไปยังโครงการที่มีการเสร็จสิ้นแล้ว จะทำให้โครงการไม่สมบูรณ์ โปรดใช้ด้วยระวัง!",
     "vi": "Trong chế độ này, sau khi trả lại, các bước đã hoàn thành sẽ bị bỏ qua, làm cho quy trình không chuẩn xác. Sử dụng với cẩn thận!"
+  },
+  "提交意见": {
+    "en": "Submit opinion",
+    "th": "ส่งข้อเสนอ",
+    "vi": "Gửi ý kiến"
   }
 }

package/src/plugins/Sign/sdca/index.js

@@ -65,9 +65,9 @@ export async function getSign(plain, dn) {
 
   await getKeyExist()
   const certSN = await getCertSN()
-  if (certSN !== plainText) {
+  if (certSN !== dn) {
     Message.warning('当前Ukey不匹配！')
     throw new Error('当前Ukey不匹配！')
   }
-  return performSign(plain + plainText)
+  return performSign(plainText + dn)
 }