n20-common-lib 2.11.34 → 2.12.0

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -261,9 +261,9 @@
       <div class="m-t m-b">
         <span class="m-r-ss">{{ '结果统计：' | $lc }}</span>
         {{ '共计校验' | $lc }}<span>{{ verifyMsg.checkSum }}</span
-        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.sucessCount }}</span>
-        {{ $l('条，待确认') }}<span class="color-warning">{{ verifyMsg.tobeConfirmedCount }}</span>
-        {{ '条，未通过' | $lc }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
+        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.sucessCount }}</span> {{ $l('条，待确认')
+        }}<span class="color-warning">{{ verifyMsg.tobeConfirmedCount }}</span> {{ '条，未通过' | $lc
+        }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
         >{{ '条，未通过详情如下：' | $lc }}
       </div>
       <el-table :data="verifyMsg.checkFlowVoList" border max-height="400">
@@ -291,7 +291,7 @@
         <div v-if="promptType === '1'">
           <el-button v-if="checkSum !== errorCount" 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">
+          <div v-if="checkSum !== errorCount" class="m-t-s color-danger f-s-s">
             {{ $l('*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。') }}
           </div>
         </div>
@@ -346,6 +346,11 @@ export default {
     ExpandablePane
   },
   props: {
+    // 是否需要校验
+    isCheck: {
+      type: Boolean,
+      default: true
+    },
     message: {
       type: String,
       default: ''
@@ -863,7 +868,7 @@ export default {
         return this.addErrFn()
       }
       let { isCheck, taskId, appNo, groupNo, typeCode, orderId, isAgentcy } = this.$route.query
-      if (isCheck === '1') {
+      if (isCheck === '1' && this.isCheck) {
         let params = {
           plainText: '',
           signText: '',