Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/view/sale/cus-receipt/form.vue

@@ -58,7 +58,7 @@
                      major-field="receiptId"
                      :height="this.tableHeight"
                      :new-row-flag="true"
-                     :columns="this.type === this.$config.formMode.receipt ? receiptColumns : refundColumns"
+                     :columns="this.type === this.$config.formMode.refund ? refundColumns : receiptColumns"
                      controlId="macId" @on-choose="getTotals" @changeValue="getTotals"/>
         </div>
       </DkPanel>
@@ -133,13 +133,13 @@ export default {
           fieldUpdate: self.$updateColumns.receiptChooseMac,
           searchDetailFlag: true
         },
-        // //账户余额
-        // {
-        //   field: 'balance',
-        //   type: 'disabled',
-        //   digits: 2,
-        //   title: this.$t('accountBalance'),
-        // },
+        //账户余额
+        {
+          field: 'balance',
+          type: 'disabled',
+          digits: 2,
+          title: this.$t('accountBalance'),
+        },
         //收款金额
         {
           field: 'amtRec',
@@ -180,6 +180,7 @@ export default {
         this.formData.staffName = val[0].staffName
         this.formData.addressFull = val[0].addressFull
 
+        // 查询客户可用余额
         let params = {
           'objectId': this.formData.objectId
         }
@@ -252,12 +253,6 @@ export default {
      * @date   : 2023/6/25 14:31
      */
     setParams(arg) {
-      if (this.type === this.$config.formMode.edit) {
-        // 删除的表数据
-        let deleteItemTable = this.$refs['receiptTable'].getDeleteData();
-        this.formData.deleteItemList = deleteItemTable
-      }
-
       if (this.type === this.$config.formMode.receipt) {
         this.formData.rpType = this.$config.rpType.shouKuan
       } else if (this.type === this.$config.formMode.refund) {
@@ -284,6 +279,8 @@ export default {
         return this.excute(this.$service.cusReceiptService, this.$service.cusReceiptService.insertReceipt, this.params);
       } else if (this.type === this.$config.formMode.refund) {
         return this.excute(this.$service.cusReceiptService, this.$service.cusReceiptService.insertRefund, this.params)
+      } else if (this.type === this.$config.formMode.edit) {
+        return this.excute(this.$service.cusReceiptService, this.$service.cusReceiptService.update, this.params)
       }
     },
     /**