根据零收付款启用标记来对采购入库和销售出库进行赋值判断

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -43,6 +43,8 @@ export const BillModalMixin = {
       isShowPrintBtn: true,
       /* 原始审核是否开启 */
       checkFlag: true,
+      //零收付款的场景开关
+      zeroChangeAmountFlag: false,
       validatorRules:{
         price:{
           rules: [
@@ -182,6 +184,7 @@ export const BillModalMixin = {
           this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
           this.purchaseBySaleFlag = res.data.purchaseBySaleFlag==='1'?true:false
           this.inOutManageFlag = res.data.inOutManageFlag==='1'?true:false
+          this.zeroChangeAmountFlag = res.data.zeroChangeAmountFlag==='1'?true:false
           if(res.data.auditPrintFlag==='1') {
             if(this.model.status === '0' || this.model.status === '9') {
               this.isShowPrintBtn = false
@@ -738,6 +741,7 @@ export const BillModalMixin = {
         changeAmountNew = this.prefixNo === 'CGDD' || this.prefixNo === 'XSDD'?0:changeAmountNew
         this.form.setFieldsValue({'discount':discount,'discountMoney':discountMoney,'discountLastMoney':discountLastMoney,
           'changeAmount':changeAmountNew,'debt':0})
+        this.setZeroChangeAmount()
       });
     },
     //改变优惠率
@@ -756,6 +760,7 @@ export const BillModalMixin = {
         changeAmountNew = this.prefixNo === 'CGDD' || this.prefixNo === 'XSDD'?0:changeAmountNew
         this.form.setFieldsValue({'discountMoney':discountMoneyNew,'discountLastMoney':discountLastMoneyNew,
           'changeAmount':changeAmountNew,'debt':0})
+        this.setZeroChangeAmount()
       });
     },
     //改变付款优惠
@@ -774,6 +779,7 @@ export const BillModalMixin = {
         changeAmountNew = this.prefixNo === 'CGDD' || this.prefixNo === 'XSDD'?0:changeAmountNew
         this.form.setFieldsValue({'discount':discountNew,'discountLastMoney':discountLastMoneyNew,
           'changeAmount':changeAmountNew,'debt':0})
+        this.setZeroChangeAmount()
       });
     },
     //其它费用
@@ -787,6 +793,7 @@ export const BillModalMixin = {
       }
       this.$nextTick(() => {
         this.form.setFieldsValue({'changeAmount':changeAmountNew, 'debt':0})
+        this.setZeroChangeAmount()
       });
     },
     //改变扣除订金
@@ -800,6 +807,7 @@ export const BillModalMixin = {
       }
       this.$nextTick(() => {
         this.form.setFieldsValue({'changeAmount':changeAmountNew, 'debt':0})
+        this.setZeroChangeAmount()
       });
     },
     //改变本次付款
@@ -880,12 +888,22 @@ export const BillModalMixin = {
                 changeAmountNew = this.prefixNo === 'XSDD'?0:changeAmountNew
                 this.form.setFieldsValue({'discount':discount,'discountMoney':discountMoney,'discountLastMoney':discountLastMoney,
                   'changeAmount':changeAmountNew,'debt':0})
+                this.setZeroChangeAmount()
               });
             }
           })
         }
       })
     },
+    //切换收付款的金额为0
+    setZeroChangeAmount() {
+      if(this.prefixNo === 'CGRK'||this.prefixNo === 'CGTH'||this.prefixNo === 'XSCK'||this.prefixNo === 'XSTH') {
+        if(this.zeroChangeAmountFlag) {
+          let oldChangeAmount = this.form.getFieldValue('changeAmount')-0
+          this.form.setFieldsValue({'changeAmount':0, 'debt':oldChangeAmount})
+        }
+      }
+    },
     scanEnter() {
       this.scanStatus = false
       this.$nextTick(() => {

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -194,6 +194,7 @@
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
+  import { getCurrentSystemConfig } from '@/api/api'
   export default {
     name: "PurchaseBackModal",
     mixins: [JEditableTableMixin, BillModalMixin],
@@ -446,6 +447,16 @@
               'accountId': accountId,
               'remark': remark
             })
+            getCurrentSystemConfig().then((res) => {
+              if (res.code === 200 && res.data) {
+                let flag = res.data.zeroChangeAmountFlag==='1'?true:false
+                if(flag) {
+                  //切换收付款的金额为0
+                  let oldChangeAmount = this.form.getFieldValue('changeAmount')-0
+                  this.form.setFieldsValue({'changeAmount':0, 'debt':oldChangeAmount})
+                }
+              }
+            })
           })
         }
       },

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -221,6 +221,7 @@
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
+  import { getCurrentSystemConfig } from '@/api/api'
 
   export default {
     name: "PurchaseInModal",
@@ -504,6 +505,16 @@
               'accountId': accountId,
               'remark': remark
             })
+            getCurrentSystemConfig().then((res) => {
+              if (res.code === 200 && res.data) {
+                let flag = res.data.zeroChangeAmountFlag==='1'?true:false
+                if(flag) {
+                  //切换收付款的金额为0
+                  let oldChangeAmount = this.form.getFieldValue('changeAmount')-0
+                  this.form.setFieldsValue({'changeAmount':0, 'debt':oldChangeAmount})
+                }
+              }
+            })
           })
           //判断后进行仓库的切换
           if(depotId) {

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -198,6 +198,7 @@
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
+  import { getCurrentSystemConfig } from '@/api/api'
   export default {
     name: "SaleBackModal",
     mixins: [JEditableTableMixin, BillModalMixin],
@@ -456,6 +457,16 @@
               'accountId': accountId,
               'remark': remark
             })
+            getCurrentSystemConfig().then((res) => {
+              if (res.code === 200 && res.data) {
+                let flag = res.data.zeroChangeAmountFlag==='1'?true:false
+                if(flag) {
+                  //切换收付款的金额为0
+                  let oldChangeAmount = this.form.getFieldValue('changeAmount')-0
+                  this.form.setFieldsValue({'changeAmount':0, 'debt':oldChangeAmount})
+                }
+              }
+            })
             this.personList.value = salesMan
           })
         }

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -236,6 +236,7 @@
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
+  import { getCurrentSystemConfig } from '@/api/api'
   export default {
     name: "SaleOutModal",
     mixins: [JEditableTableMixin, BillModalMixin],
@@ -521,6 +522,16 @@
               'accountId': accountId,
               'remark': remark
             })
+            getCurrentSystemConfig().then((res) => {
+              if (res.code === 200 && res.data) {
+                let flag = res.data.zeroChangeAmountFlag==='1'?true:false
+                if(flag) {
+                  //切换收付款的金额为0
+                  let oldChangeAmount = this.form.getFieldValue('changeAmount')-0
+                  this.form.setFieldsValue({'changeAmount':0, 'debt':oldChangeAmount})
+                }
+              }
+            })
             this.personList.value = salesMan
           })
           //判断后进行仓库的切换

jshERP-web/src/views/system/SystemConfigList.vue

@@ -123,6 +123,14 @@
               （启用后，零售管理、采购管理、销售管理和仓库管理下的单据，都需要先审核之后才能进行打印）
             </a-form-item>
           </a-col>
+          <a-col :lg="12" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="零收付款">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="zeroChangeAmountFlagSwitch" @change="onZeroChangeAmountChange"></a-switch>
+              （启用后，销售出库单据新建时默认<b>本次收款</b>为0，采购入库单据同理）
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="24">
           <a-col :lg="12" :md="12" :sm="24" v-if="isShowApproval">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多级审核">
               <a-switch checked-children="启用" un-checked-children="关闭" v-model="multiLevelApprovalFlagSwitch" @change="onMultiLevelApprovalChange"></a-switch>
@@ -178,6 +186,7 @@
         multiAccountFlagSwitch: false, //多账户
         moveAvgPriceFlagSwitch: false, //移动平均价
         auditPrintFlagSwitch: false, //先审核后打印
+        zeroChangeAmountFlagSwitch: false, //零收付款
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -279,6 +288,9 @@
               if (record.auditPrintFlag != null) {
                 this.auditPrintFlagSwitch = record.auditPrintFlag == '1' ? true : false;
               }
+              if (record.zeroChangeAmountFlag != null) {
+                this.zeroChangeAmountFlagSwitch = record.zeroChangeAmountFlag == '1' ? true : false;
+              }
             }
           } else {
             this.$message.info(res.data);
@@ -403,6 +415,10 @@
         this.model.auditPrintFlag = checked?'1':'0'
         this.handleChange()
       },
+      onZeroChangeAmountChange(checked) {
+        this.model.zeroChangeAmountFlag = checked?'1':'0'
+        this.handleChange()
+      },
       //改变内容
       handleChange() {
         this.confirmLoading = true