zxz 1 rok pred
rodič
commit
7a2a6799e3

+ 2 - 0
src/views/profitable/cashoutedit.vue

@@ -492,6 +492,8 @@
             response.type='非粮款'
           }else if(response.costType==5){
             response.type='保证金'
+          }else if(response.costType==7){
+            response.type='利息'
           }
           if(response.paymentIdentifi == 1){
             this.selected = true

+ 4 - 4
src/views/profitable/expensemanagentedit.vue

@@ -195,7 +195,7 @@
         </ws-select>
         <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配:{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7&&mode!="暂不分配"||deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="利息"&&mode!="暂不分配"||deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
@@ -962,9 +962,10 @@ weight: 4000}]],
             response.type='非粮款'
           }else if(response.costType==5){
             response.type='保证金'
+          }else if(response.costType==7){
+            response.type='利息'
           }
           this.deptBudgetList=response
-          // this.feeDetailsDistributions = this.deptBudgetList.expenseAllocationInfoList
           this.dataList=[]
           if(response.addressUrl){
             var arr=[]
@@ -975,11 +976,10 @@ weight: 4000}]],
             }
             this.paymentScreenshot=srcs
           }
-          if(localStorage.getItem('expensebh')){
+          if(!localStorage.getItem('expensebh')){
             if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
               this.getgoodsourcelist()
             }
-          //   console.log(this.feeDetailsDistributions)
           }
         })
       },