Merge branch 'dev' into test

src/views/financialManage/advanceReceipt/components/collectDialog.vue

@@ -77,7 +77,7 @@
             class="table-form-item"
           >
             <DictSelection
-              v-model="item.paymentType"
+              v-model="r.paymentType"
               dictName="支付类型"
               placeholder="请选择"
               class="payment-select"

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -1539,8 +1539,8 @@
           item.receiveTotalWeight = item.receiveTotalWeight || 0;
 
           item.saleCount = item.notGenerateSendCount;
-          // item.totalCount = item.notGenerateSendCount;
-          this.changeCount(item, index, false);
+          item.totalCount = item.notGenerateSendCount;
+          // this.changeCount(item, index, false);
 
           if (item.weightUnit == item.measuringUnit) {
             item.sendTotalWeight = item.sendTotalWeight || item.totalCount;