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

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -281,19 +281,19 @@
           </el-row>
           <el-row style="margin-bottom: 20px">
             <el-col :span="12" style="text-align: center"
-              ><h3>收入方资金归属(%)</h3>
+              ><h3>支出方资金归属(%)</h3>
               <span>(请输入资金归属百分比)</span></el-col
             >
             <el-col :span="12" style="text-align: center"
-              ><h3>支出方资金归属(%)</h3>
+              ><h3>收入方资金归属(%)</h3>
               <span>(请输入资金归属百分比)</span></el-col
             >
           </el-row>
           <el-row class="profit_box">
             <el-col :span="12">
               <el-form-item
-                v-for="item in affiliationData"
-                :key="item.profitId + 'sr'"
+                v-for="item in affiliationData2"
+                :key="item.profitId + 'zc'"
                 :label="item.profitName"
                 prop="entProfit"
               >
@@ -308,8 +308,8 @@
             </el-col>
             <el-col :span="12">
               <el-form-item
-                v-for="item in affiliationData2"
-                :key="item.profitId + 'zc'"
+                v-for="item in affiliationData"
+                :key="item.profitId + 'sr'"
                 :label="item.profitName"
                 prop="entProfit"
               >

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -269,7 +269,7 @@
               >
                 <el-option
                   v-for="item in collectionData"
-                  :key="item.accountId"
+                  :key="item.bankCardNum"
                   :label="item.name"
                   :value="item.nameValue"
                 >
@@ -369,18 +369,18 @@
         </el-row>
         <el-row>
           <el-col :span="12" style="text-align: center"
-            ><h3>收入方资金归属(%)</h3>
+            ><h3>支出方资金归属(%)</h3>
             <span>(请输入资金归属百分比)</span></el-col
           >
           <el-col :span="12" style="text-align: center"
-            ><h3>支出方资金归属(%)</h3>
+            ><h3>收入方资金归属(%)</h3>
             <span>(请输入资金归属百分比)</span></el-col
           >
         </el-row>
         <el-row class="profit_box">
           <el-col :span="12">
             <el-form-item
-              v-for="item in affiliationData"
+              v-for="item in affiliationData2"
               :key="item.profitId + 'sr'"
               :label="item.profitName"
               prop="entProfit"
@@ -396,7 +396,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item
-              v-for="item in affiliationData2"
+              v-for="item in affiliationData"
               :key="item.profitId + 'zc'"
               :label="item.profitName"
               prop="entProfit"
@@ -899,6 +899,7 @@ export default {
           res.data.forEach((item) => {
             if (item.invAccountCardList != null) {
               item.invAccountCardList.forEach((it) => {
+                it.outerFlag = item.outerFlag;
                 it.name =
                   (item.outerFlag == 0 ? "内部用户" : "外部用户") +
                   "   " +
@@ -922,6 +923,11 @@ export default {
     //选择收款单位change事件
     companyChange(val) {
       const item = this.collectionData.find((item) => item.nameValue === val);
+      if(item.outerFlag==0&&item.bankCardNum!=this.enterCardId){
+        this.$message.error('转账方必须为外部账户或与收款方账户一致')
+        this.inComeFormData.company=""
+        return
+      }
       this.companyItem = item;
     },
     //点击确认收入事件
@@ -932,8 +938,8 @@ export default {
       obj.fundFlow = obj.company + "→" + obj.collectionMessage; //资金流向
       obj.payMethod = obj.payMethod.join(",");//支付方式
       obj.revenueOutlay = "0";
-      obj.fundUse = obj.fundUse[obj.fundUse.length - 2]; //资金用途
-      obj.fundFen = obj.fundUse[obj.fundUse.length - 1]; //资金用途分项
+      obj.fundUse = this.inComeFormData.fundUse[this.inComeFormData.fundUse.length - 2]; //资金用途
+      obj.fundFen = this.inComeFormData.fundUse[this.inComeFormData.fundUse.length - 1]; //资金用途分项
       //转化资金归属
       obj.entProfit = {};
       obj.outProfit = {};