代码合并，bug修复

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -413,8 +413,6 @@ export default {
     },
     /*提交*/
     getSubmit(){
-      this.dialogFormVisible = false
-      this.loading = true
       if (this.form.date.length === 0){
         this.form.begdate = ''
         this.form.enddate = ''
@@ -425,6 +423,7 @@ export default {
       }
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
+        this.loading = true
         this.form.discountrate = this.form.discountrate / 100
         this.form.sa_quotedpriceid = this.ownerid
         const res = await this.$api.requested({
@@ -433,6 +432,7 @@ export default {
         })
         if (res.code == 0){
           this.loading = false
+          this.tool.showMessage(res,()=>{})
         }
         this.tool.showMessage(res,() => {
           this.loading = false

src/HDrpManagement/rebatesettlement/details/tabs/rebatesettlementmx.vue

@@ -47,6 +47,14 @@
           <span>{{tool.formatAmount(scope.row.amount,2)}}</span>
         </template>
       </el-table-column>
+      <el-table-column
+          prop="returnamount"
+          label="退款金额"
+          width="100">
+        <template slot-scope="scope">
+          <span>{{tool.formatAmount(scope.row.returnamount,2)}}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="rebate_discountrate"
         label="居间产品折扣"