Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/InvoiceRegCkeck.vue

@@ -172,10 +172,10 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="codeTotal > 0"
+        v-show="total > 0"
-        :total="codeTotal"
+        :total="total"
-        :page.sync="codeQuery.page"
+        :page.sync="filterQuery.page"
-        :limit.sync="codeQuery.limit"
+        :limit.sync="filterQuery.limit"
         @pagination="getCodeDetailLists"
       />
     </el-tabs>

src/views/inventory/InvCountOrderModify.vue

@@ -531,10 +531,6 @@ export default {
           this.$message.warning("请先选择盘点仓库");
           return;
         }
-        if (this.codeArray.length === 0) {
-          this.$message.warning("请先录入产品");
-          return;
-        }
         //拉取整个仓库的数据
         let params = {
           invCode: this.formData.invCode,