1

src/views/profitable/contractOtherMoney.vue

@@ -350,8 +350,8 @@
         if (Number(this.formData.amountMoney) < 0 || Number(this.formData.amountMoney) > 100000000) {
           this.$message.error("金额输入错误！")
         }
-        console.log(this.formData.amountMoney.split(".")[1].length)
-        if (this.formData.amountMoney.split(".")[1].length > 2) {
+        
+        if (this.formData.amountMoney.indexOf(".") != -1 && this.formData.amountMoney.split(".")[1].length > 2) {
           this.$message.error("金额请保留两位小数！")
           return
         }

src/views/profitable/inOutDetailed.vue

@@ -15,10 +15,10 @@
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">收入</el-button>
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
           <div class="top_info">
-            <span class="info_css">合同收入：20000元</span><span class="info_css">仓库收入：10000元</span><span class="info_css">经营收入：10000元</span><span class="info_css">合计收入：30000元</span>   
+           <span class="info_css">合同收入：{{tableData[0].inContractMoney? tableData[0].inContractMoney:0}}元</span><span class="info_css">仓库收入：{{tableData[0].inWarehouseMoney? tableData[0].inWarehouseMoney:0}}元</span><span class="info_css">经营收入：{{tableData[0].inManageMoney? tableData[0].inManageMoney:0}}元</span><span class="info_css">合计收入：{{intotal}}元</span>   
           </div>
           <div class="top_info">
-            <span class="info_css">合同支出：20000元</span><span class="info_css">仓库支出：10000元</span><span class="info_css">经营支出：10000元</span><span class="info_css">合计支出：30000元</span> <span class="info_css">毛利润：30000元</span>
+            <span class="info_css">合同支出：{{tableData[0].outContractMoney? tableData[0].outContractMoney:0}}元</span><span class="info_css">仓库支出：{{tableData[0].outWarehouseMoney? tableData[0].outWarehouseMoney:0}}元</span><span class="info_css">经营支出：{{tableData[0].outManageMoney? tableData[0].outManageMoney:0}}元</span><span class="info_css">合计支出：{{outtotal}}元</span> <span class="info_css">毛利润：{{Number(intotal - outtotal)}}元</span>
           </div>
         </el-col>
         <el-col :span="12">
@@ -72,6 +72,8 @@
         searchKeyWord:"",
         startDate:"",
         endDate:"",
+        outtotal:0,
+        intotal:0,
       }
     },
     activated() {
@@ -124,6 +126,8 @@
           .toPromise()
           .then(response => {
             this.tableData = response.records
+            this.intotal = Number(this.tableData[0].inContractMoney) + Number(this.tableData[0].inWarehouseMoney) + Number(this.tableData[0].inManageMoney)
+            this.outtotal = Number(this.tableData[0].outContractMoney) + Number(this.tableData[0].outWarehouseMoney) + Number(this.tableData[0].outManageMoney)
            this.deptBudgetTotal = response.total
           })
       },