n20-common-lib 2.11.32 → 2.11.34

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -261,8 +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.checkSum - verifyMsg.errorCount }}</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">
@@ -295,7 +296,7 @@
           </div>
         </div>
         <div v-if="promptType === '2'">
-          <el-button v-if="!!successNum" type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
+          <el-button v-if="checkSum !== errorCount" type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
         </div>
       </span>