Merge branch 'dev' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc into dev

src/views/profitable/contractOtherMoney.vue

@@ -16,7 +16,7 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
           <div class="top_info">
             <span class="info_css">合计收入：{{inmoney}}元</span><span class="info_css">合计支出：{{outmoney}}元</span><span
-              class="info_css">请款中：{{inmoney}}元</span>
+              class="info_css">请款中：{{nopayment}}元</span>
           </div>
         </el-col>
         <el-col :span="12">
@@ -89,7 +89,7 @@
         class="title_css">
         <el-form ref="formData" :model="formData" label-width="100px">
           <el-form-item label="费用类型" v-if="btnChange == 3 || btnChange == 4 || btnChange == 5">
-            <el-radio-group v-model="radio">
+            <el-radio-group v-model="radio" @change="moneyChange">
               <el-radio v-model="radio" label="1">经营费用</el-radio>
               <el-radio v-model="radio" label="2">仓库费用</el-radio>
             </el-radio-group>
@@ -225,6 +225,7 @@
         auditRecord: [],
         inmoney:0,
         outmoney:0,
+        nopayment:0,
       }
     },
     activated() {
@@ -233,6 +234,10 @@
       this.getWarehouse()
     },
     methods: {
+      moneyChange(){
+        this.formData.addressUrl = ""
+        this.formData = {}
+      },
       showAudit(row) {
         getAuditRecord({
             id: row.id,
@@ -541,6 +546,7 @@
           .then(response => {
             this.inmoney = 0
              this.outmoney = 0
+             this.nopayment = 0
             this.tableData = response.records
             for(let count = 0 ; count < this.tableData.length ; count++){
               if(this.tableData[count].reexType == '收入'){
@@ -549,6 +555,9 @@
               if(this.tableData[count].reexType == '支出'){
                  this.outmoney += this.tableData[count].amountMoney
               }
+              if(this.tableData[count].status == '待付款'){
+                 this.nopayment += this.tableData[count].amountMoney
+              }
             }
             this.deptBudgetTotal = response.total
           })