zxz 1 年之前
父節點
當前提交
1289cc223d
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 0 3
      src/views/profitable/cashout.vue
  2. 2 1
      src/views/profitable/cashoutaduitNQ.vue

+ 0 - 3
src/views/profitable/cashout.vue

@@ -792,14 +792,11 @@ export default {
         this.deptBudgetList.costNo = 'HTF' + this.getdate() + this.Num
       } else if (this.deptBudgetList.purpose == '库点费用') {
         this.deptBudgetList.expensesPurpose = 3
-        debugger
         for (var i = 0;i<this.typeList.length;i++) {
           if (this.typeList[i].key == 8) {
             this.deptBudgetList.storageFeeFlag = 1
           }
         }
-        debugger
-
         if (this.mode == '暂不分配') {
             this.deptBudgetList.expenseAllocationInfoList = []
           } else {

+ 2 - 1
src/views/profitable/cashoutaduitNQ.vue

@@ -655,7 +655,7 @@ export default {
     },
     submit(status) {
       //经营性费用不进行分配
-      if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode != '暂不分配' || this.deptBudgetList.expensesPurpose == '3' && this.deptBudgetList.storageFeeFlag != 1 && this.mode != '暂不分配'&& this.deptBudgetList.autoAssign!=3 && this.deptBudgetList.autoAssign!=5) {
+      if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode != '暂不分配' || this.deptBudgetList.expensesPurpose == '3' && this.mode != '暂不分配' && this.deptBudgetList.autoAssign!=5) {
         // if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (!this.feeDetailsDistributions[i].distributionMoney) {
@@ -826,6 +826,7 @@ export default {
                 type: 'success',
               })
               this.rejectshow = false
+              this.feeDetailsDistributions = [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }]
               this.$router.go(-1)
             }).catch((response) => {
               this.$message({