Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -954,7 +954,8 @@ export default {
         if (valid) {
           this.$api.expense.insertAccountOperate(obj).then((res) => {
             if (res.code == 200) {
-              this.$message.success("添加成功！");
+              this.$message.success("转账成功！");
+              this.findPage();
               this.incomeDialogVisible = false;
             } else {
               this.$message.error(res.msg);
@@ -1029,6 +1030,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success("确认转账成功");
                 this.getExpendData();
+                this.findPage();
               } else {
                 this.$message.error(res.msg);
               }

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -852,7 +852,7 @@ export default {
             let obj = {
               invoiceId: this.formDataId, //id
               payoutMoney: this.formData.payoutMoney, //进账金额
-              fundFlow: params.otherUnit + "→" + this.formData.invoiceBy, //资金流向
+              fundFlow: params.otherUnit.nameValue + "→" + this.formData.invoiceBy.nameValue, //资金流向
               payMethod: params.payMethod.join(","), //支付方式
               fundUse: this.formData.fundUse[this.formData.fundUse.length - 2], //资金用途
               fundFen: this.formData.fundUse[this.formData.fundUse.length - 1], //资金用途分项
@@ -959,7 +959,7 @@ export default {
             res.data.invoiceBy = obj;
           }
           if (obj2) {
-            res.data.otherUnit = obj;
+            res.data.otherUnit = obj2;
           }
           if (this.typeStatus == 1) {
             res.data.invoiceSubjects1 = res.data.invoiceSubjects.split('*')[0]