解决冲突

src/views/workshop/baseInfo/shopWare2.vue

@@ -194,7 +194,8 @@ export default {
           })
         }
         this.total = retObj.total
-        if (retObj.pages >0) {
+
+        if (retObj.pages > 0) {
           this.page++
           this.visibleCount += 10
         } else {

src/views/workshop/workshopLog/index.vue

@@ -34,7 +34,7 @@
     </div>
     <!-- 功能 -->
     <div class="filter-container">
-      <!-- <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="handleAdd()">生成当日台账</el-button> -->
+      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="handleAdd()">生成当日台账</el-button>
       <el-button class="filter-item" type="primary" icon="el-icon-printer" @click="handleExp(5)">封箱成品出入库台账</el-button>
       <el-button class="filter-item" type="primary" icon="el-icon-printer" @click="handleExp(4)">印花成品出入库台账</el-button>
       <el-button class="filter-item" type="primary" icon="el-icon-printer" @click="handleExp(2)">封箱成品实物收发卡</el-button>