Merge branch 'feat/lyf' into 'develop'

添加空白行统计

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!290

src/views/goods/order-manage.vue

@@ -703,6 +703,9 @@
         <div class="stat-result">
           <div class="success">成功：{{ ProgressData.successNum }}条</div>
           <div class="repetition">重复：{{ ProgressData.repeatNum }}条</div>
+
+          <div class="repetition">空行：{{ ProgressData.nullNum  }}条</div>
+
           <div class="failure">失败：{{ ProgressData.failNum }}条</div>
         </div>
       </div>
@@ -964,6 +967,7 @@ export default {
 
       ProgressData: {
         totalNum: "", //总数
+        nullNum:"",//空白行
         status: "", // 1完成 0进行中
         doneNum: "", // doneNum 完成数量
         successNum: "", // 成功数量