提交代码

src/components/FinancialModule/HelpBranch/components/bindListData.vue

@@ -292,12 +292,14 @@
       },
       clicksubmit(){
         //先判断selectDataList里面是否有，没有再去调用接口
+let count=0;
         this.selectDataList.forEach(item => {
           if(item.FrID==this.bindMsg.FrID){
-            return;
+            count+=1;
           }
         });
-        this.apipost(
+        if (count==0) {
+          this.apipost(
           "Financial_post_SelectAllotFinan",
           this.bindMsg,
           res => {
@@ -318,6 +320,7 @@
           },
           err => {}
         );
+        }
       },
 
       SureAllot(){

src/components/FinancialModule/HelpBranch/index.vue

@@ -243,29 +243,34 @@
           </div>
       </div>
       <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
-          <div style="display: flex;flex-wrap: wrap;">
-            <span>已选数据：</span>
-            <template v-if="multipleSelection.length>0">
-              <el-tag size="mini" closable
-              style="margin-right: 5px;margin-bottom: 5px;"
-              v-for="(x,index) in multipleSelection"
-              :key="x.FrID" @close="handleClose([multipleSelection[index]])"
-              :type="x.Type==2?'danger':'success'">
-              {{x.FrID}}/
-                <template v-for="(y,i) in x.DetailList">
-                  {{y.CostTypeName}}:{{y.OriginalMoney}} {{i!=(x.DetailList.length-1)?',':''}}
-                </template>
-            </el-tag>
-            </template>
-            <template v-else>
-              无
-            </template>
-          </div>
-          <div style="margin-left: 20px;flex-shrink: 0;">
-            总金额：{{getMoney()}}
+        <div style="float:left;width:85%;display: flex;flex-wrap: nowrap; padding: 10px;">
+          <div style="display: flex;flex-wrap: wrap; ">
+                    <span>已选数据：</span>
+                    <template v-if="multipleSelection.length>0">
+                      <el-tag size="mini" closable
+                      style="margin-right: 5px;margin-bottom: 5px;"
+                      v-for="(x,index) in multipleSelection"
+                      :key="x.FrID" @close="handleClose([multipleSelection[index]])"
+                      :type="x.Type==2?'danger':'success'">
+                      {{x.FrID}}/
+                        <template v-for="(y,i) in x.DetailList">
+                          {{y.CostTypeName}}:{{y.OriginalMoney}} {{i!=(x.DetailList.length-1)?',':''}}
+                        </template>
+                    </el-tag>
+                    </template>
+                    <template v-else>
+                      无
+                    </template>
+                  </div>
+                  <div style="margin-left: 20px;flex-shrink: 0;">
+                    总金额：{{getMoney()}}
+                  </div>
+        </div>
+          <div style="margin-left: 20px;display: flex;flex-wrap: wrap;float:right;">
+            <span style="font-size:12px;">关联调拨单颜色</span>
+          <span style="background-color:#00C6FF;border-radius:2px;margin:4px 6px 0px 6px; height:8px;width:8px;vertical-align:middle;display:inline-block;"></span><span style="font-size:12px;">代收</span>
+          <span style="background-color:rgb(159 46 46);border-radius:2px;margin:4px 6px 0px 6px;height:8px;width:8px;vertical-align:middle;display:inline-block;"></span><span style="font-size:12px;">代付</span>
           </div>
-
-          
       </div>
       
       <div class="_fnDm_content" v-loading='loading'>
@@ -478,12 +483,15 @@
             </el-table-column>
             <el-table-column
             prop=""
-            label="关联调拨单付款单"
+            label="关联调拨单"
             show-overflow-tooltip width="165">
             <template slot-scope="scope" v-if="scope.row.ReFinanceIdList">
               <div v-for="(x,index) in scope.row.ReFinanceIdList" >
+
                 <p  style="cursor: pointer;color: #00C6FF;"
-                @click="openDetails(x.RelevanceFrId,2)">{{x.RelevanceFrId}}{{x.ShareMoney>0?("分摊金额："+x.ShareMoney):""}}</p>
+                @click="openDetails(x.RelevanceFrId,2)" v-if="x.RelevanceFrId2===1">{{x.RelevanceFrId}}{{x.ShareMoney>0?("分摊金额："+x.ShareMoney):""}}</p>
+                <p  style="cursor: pointer;color: rgb(159 46 46);"
+                @click="openDetails(x.RelevanceFrId,2)" v-else-if="x.RelevanceFrId2===2">{{x.RelevanceFrId}}{{x.ShareMoney>0?("分摊金额："+x.ShareMoney):""}}</p>
               </div>
             </template>
             <template v-else>-</template>