Merge remote-tracking branch 'origin/master'

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/SaleRegistrationCollectionServiceImpl.java

@@ -161,7 +161,7 @@ public class SaleRegistrationCollectionServiceImpl implements ISaleRegistrationC
             // saleAccountsReceivableDetail1.setAmountReceivable(saleRegistrationCollection.getAmounts());//应收金额
             saleAccountsReceivableDetail1.setReceivedAmount(saleRegistrationCollection.getAmounts());
             //加后余额
-            Double addedBalance2 = amount + saleRegistrationCollection.getAmounts();
+            Double addedBalance2 = amount - saleRegistrationCollection.getAmounts();
             saleAccountsReceivableDetail1.setAmounts(handlingWeight(addedBalance2));//余额
             saleAccountsReceivableDetail1.setCustomerId(saleRegistrationCollection.getCustomerId());// 客户名称
             saleAccountsReceivableDetail1.setAccountsReceivableDate(saleRegistrationCollection.getCollectionMoneyDate()); // 日期

zkqy-ui/src/views/system/financialManage/finishedProductInvoice.vue

@@ -717,7 +717,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        invoiceDate: null,
+        invoiceDate: moment(new Date()).format("YYYY-MM-DD"),
         customerId: null,
         settlementUnitId: null,
         invoiceNumber: null,

zkqy-ui/src/views/system/financialManage/invoiceDetail.vue

@@ -382,7 +382,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    
+
     <!-- 明细弹窗 -->
     <el-dialog :title="title" :visible.sync="detailShow" width="600px" append-to-body>
       <div>11111</div>
@@ -612,7 +612,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加其他收款";
+      this.title = "添加其他应收";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

zkqy-ui/src/views/system/financialManage/receiveRecordReview.vue

@@ -840,7 +840,7 @@ export default {
         this.currentRow = row;
         console.log("this.currentRow", this.currentRow);
         this.open = true;
-        this.title = "修改收款登记";
+        this.title = "收款登记审核";
       });
     },
     /** 提交按钮 */

zkqy-ui/src/views/system/financialManage/saleOtherCollection.vue

@@ -401,7 +401,7 @@
                 v-model="form.settlementUnitId"
                 placeholder="请输入结算单位"
               >
-                
+
               </el-input> -->
               <el-select v-model="form.settlementUnitId" clearable filterable>
                 <el-option
@@ -926,7 +926,7 @@ export default {
         (item) => item.deptName == "财务部"
       )?.deptId;
       this.open = true;
-      this.title = "添加其他收款";
+      this.title = "添加其他应收";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

zkqy-ui/src/views/system/financialManage/saleOtherCollectionReview.vue

@@ -632,7 +632,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加其他收款";
+      this.title = "添加其他应收";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {