1

src/components/FinancialModule/MonthlyCostStatement/components/selectSettlementData.vue

@@ -38,7 +38,7 @@
               其他收入
             </span>
 
-            <span v-else-if="scope.row.Type==2" style="display: inline-block;
+            <span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
               padding: 2px 8px;
               color: white;
               background-color: #E95252;
@@ -46,6 +46,14 @@
               border-radius: 4px;">
               成本支出
             </span>
+            <span v-else-if="scope.row.Type==2" style="display: inline-block;
+              padding: 2px 8px;
+              color: white;
+              background-color: #2BB87C;
+              line-height: 16px;
+              border-radius: 4px;">
+              PIC代付
+            </span>
             <span v-else-if="scope.row.Type==1" style="display: inline-block;
               padding: 2px 8px;
               color: white;
@@ -126,7 +134,7 @@
           this.dataList.forEach(x=>{
 
             x.DetailList.forEach(y=>{
-              if(x.TemplateId==281 || x.TemplateId==283 || x.Type==2){
+              if(x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)){
                 this.OriginalMoney+=(y.Money *100)
               }else{
                 this.OriginalMoney-=(y.Money *100)

src/components/FinancialModule/MonthlyCostStatement/settlement.vue

@@ -70,7 +70,7 @@
           <button class="normalBtn" @click="GenerateDocuments()">生成结算单据</button>
         </li>
       </ul>
-      注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入
+      注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入 - PIC代付
     </div>
     <div style="display: flex;flex-wrap: nowrap; padding: 10px;">
       <div style="display: flex;flex-wrap: wrap;">
@@ -122,8 +122,7 @@
               border-radius: 4px;">
               其他收入
             </span>
-
-            <span v-else-if="scope.row.Type==2" style="display: inline-block;
+            <span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
               padding: 2px 8px;
               color: white;
               background-color: #E95252;
@@ -131,6 +130,14 @@
               border-radius: 4px;">
               成本支出
             </span>
+            <span v-else-if="scope.row.Type==2" style="display: inline-block;
+              padding: 2px 8px;
+              color: white;
+              background-color: #2BB87C;
+              line-height: 16px;
+              border-radius: 4px;">
+              PIC代付
+            </span>
             <span v-else-if="scope.row.Type==1" style="display: inline-block;
               padding: 2px 8px;
               color: white;
@@ -627,7 +634,7 @@
         let Money = 0
         this.multipleSelection.forEach(x => {
           x.DetailList.forEach(y => {
-            if (x.TemplateId==281 || x.TemplateId==283 || x.Type == 2) {
+            if (x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)) {
               Money += (y.Money * 100)
             }else{
               Money -= (y.Money * 100)