n20-common-lib 2.7.25 → 2.7.26

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -186,6 +186,47 @@
     <cl-dialog v-drag :visible.sync="approvalToV" :title="'批准至节点' | $lc" width="960px" append-to-body top="7.5vh">
       <reject-to-prop :task-id="taskId" type="approvalTo" @close="approvalToV = false" @confirm="approvalToFn" />
     </cl-dialog>
+    <cl-dialog v-drag :visible.sync="verifyV" :title="'校验结果' | $lc" width="960px" append-to-body top="7.5vh">
+      <div class="m-t m-b">
+        <span class="m-r-ss">{{ '结果统计：' | $lc }}</span> {{ '共计校验' | $lc }}<span>{{ verifyMsg.checkSum }}</span
+        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.checkSum - verifyMsg.errorCount }}</span
+        >{{ '条，未通过' | $lc }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
+        >{{ '条，未通过详情如下：' | $lc }}
+      </div>
+      <el-table :data="verifyMsg.checkFlowVoList" border max-height="400">
+        <el-table-column type="index" :label="'序号' | $lc" align="center" width="50" />
+        <el-table-column prop="businessId" :label="'业务流水号' | $lc" align="center" width="120" />
+        <el-table-column prop="typeName" :label="'交易类型' | $lc" align="center" width="120">
+          <template slot-scope="{ row }">
+            {{ row.typeName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" :label="'校验状态' | $lc" align="center" width="120">
+          <template slot-scope="{ row }">
+            <div
+              :class="
+                row.status === 'PASS' ? 'color-success' : row.status === 'PROMPT' ? 'color-warning' : 'color-danger'
+              "
+            >
+              {{ row.statusName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="errorMsg" :label="'不通过原因' | $lc" />
+      </el-table>
+      <span slot="footer">
+        <div v-if="promptType === '1'">
+          <el-button type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
+          <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
+          <div class="m-t-s color-danger f-s-s">
+            {{ $l('*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。') }}
+          </div>
+        </div>
+        <div v-if="promptType === '2'">
+          <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
+        </div>
+      </span>
+    </cl-dialog>
   </div>
 </template>
 
@@ -321,7 +362,10 @@ export default {
       fileDtos: [],
       fileName: '',
       fileUrl: '',
-      todoList: []
+      todoList: [],
+      verifyV: false,
+      verifyMsg: {},
+      promptType: '0'
     }
   },
   computed: {
@@ -474,18 +518,19 @@ export default {
     },
     // 获取提交参数
     getParam() {
-      let { typeCode, taskId, groupNo, isAgentcy } = this.$route.query
+      let { typeCode, taskId, groupNo, isAgentcy, isCheck } = this.$route.query
       return [
         {
           typeCode,
           taskId,
           groupNo,
+          isAgentcy,
+          isCheck,
           taskDefKey: this.taskDefKey,
           message: this.messageC,
           formData: JSON.stringify(this.formData),
           signText: this.signText,
           plainText: this.plainText,
-          isAgentcy: isAgentcy,
           fileDtos: this.fileDtos,
           carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
           addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname })),
@@ -579,8 +624,38 @@ export default {
         })
       })
     },
+    async checkFlowFn() {
+      if (this.requiredC && !this.messageC) {
+        return this.errMsgFn(
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+        )
+      }
+      if (this.addTaskList.length > 0 && !this.addTaskType) {
+        return this.addErrFn()
+      }
+      const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, this.getParam())
+      if (code === 200) {
+        this.promptType = data.promptType
+        switch (data.promptType) {
+          case '0':
+            this.approvalFn()
+            break
+          case '1':
+            this.verifyV = true
+            this.verifyMsg = data
+            break
+          case '2':
+            this.verifyV = true
+            break
+        }
+      }
+    },
+    onceCancelFn() {
+      this.verifyV = false
+    },
     // 审批
     approvalFn() {
+      this.checkFlowFn()
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
           this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')

package/src/i18n.json

@@ -29,6 +29,36 @@
     "th": "ระบบการจัดการเงินสำหรับกลุ่ม",
     "vi": "Hệ thống Quản lý Kho bạc Nhóm mới"
   },
+  "结果统计：": {
+    "en": "Result statistics",
+    "th": "สถิติผลลัพธ์",
+    "vi": "Thống kê kết quả"
+  },
+  "共计校验": {
+    "en": "Total verification",
+    "th": "การตรวจสอบทั้งหมด",
+    "vi": "Tổng kiểm tra"
+  },
+  "条，未通过": {
+    "en": "items, of which failed to pass",
+    "th": "รายการ, ในบางส่วนที่ไม่ผ่าน",
+    "vi": "mục, trong đó chưa qua"
+  },
+  "业务流水号": {
+    "en": "businessId",
+    "th": "เลขที่ธุรการ",
+    "vi": "số hoạch đồng"
+  },
+  "条，其中通过": {
+    "en": "items, of which passed through",
+    "th": "รายการ, ในบางส่วนที่ผ่าน",
+    "vi": "mục, trong đó đã qua"
+  },
+  "条，未通过详情如下：": {
+    "en": "items, with details as follows:",
+    "th": "รายการ, รายละเอียดดังนี้:",
+    "vi": "mục, chi tiết như sau:"
+  },
   "不支持在线预览，请": {
     "en": "Online preview is not supported, please",
     "th": "ไม่สนับสนุนการดูตัวอย่างออนไลน์ โปรด",
@@ -324,6 +354,11 @@
     "th": "ยกเลิก",
     "vi": "Hủy"
   },
+  "*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。": {
+    "en": "*Click [Continue Approval] to submit verification passed and pending confirmation data. Failure data needs to be processed on the pending approval details page.",
+    "th": "* คลิก [Continue to Approve] จะส่งข้อมูลการตรวจสอบและรอการยืนยัน และข้อมูลที่ไม่ผ่านจะต้องได้รับการประมวลผลที่หน้ารายละเอียดที่รอการตรวจสอบ",
+    "vi": "* Nhấp [Tiếp tục phê duyệt] sẽ gửi dữ liệu kiểm tra thông qua và đang chờ xác nhận, dữ liệu không vượt qua cần được xử lý trên trang chi tiết đang chờ kiểm tra."
+  },
   "取消导入": {
     "en": "Cancel import",
     "th": "ยกเลิกการนำเข้า",
@@ -2094,6 +2129,26 @@
     "th": "หมายเลขลำดับ",
     "vi": "Số thứ tự"
   },
+  "交易类型": {
+    "en": "Transaction Type",
+    "th": "ประเภทการซื้อขาย",
+    "vi": "Loại giao dịch"
+  },
+  "校验状态": {
+    "en": "Validation Status",
+    "th": "สถานการตรวจสอบ",
+    "vi": "Trạng thái kiểm tra"
+  },
+  "不通过原因": {
+    "en": "Reason for failure",
+    "th": "ไม่ผ่านเหตุผล",
+    "vi": "Không thông qua lý do"
+  },
+  "继续审批": {
+    "en": "Continue approval",
+    "th": "ดำเนินการอนุมัติ",
+    "vi": "Tiếp tục phê duyệt"
+  },
   "手机验证码登录": {
     "en": "Mobile phone verification code login",
     "th": "เข้าสู่ระบบด้วยรหัสยืนยันทางโทรศัพท์มือถือ",