1

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -603,7 +603,7 @@ tr._item_list td:last-child {
                 </el-select>
               </el-form-item>
             </el-col>
-
+<!-- 
           <el-col :span="4">
               <el-form-item :label="$t('salesModule.IsLianYn')">
                 <el-select v-model="msg.Is_Transport" filterable class="w150">
@@ -612,7 +612,7 @@ tr._item_list td:last-child {
                   <el-option value="0" :label="$t('pub.no')"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="4">
               <el-form-item :label="$t('salesModule.DJNum')">
                 <el-input v-model="msg.DMCNUM" class></el-input>
@@ -666,6 +666,22 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="msg.OutBranchId==1248">
+            <el-form-item label="车产品类型">
+              <el-select v-model="msg.CarProductType" class="w150">
+                <el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option value="1" label="公司自派大車(高停別)"></el-option>
+                <el-option value="2" label="公司自派大車(全包團)"></el-option>
+                <el-option value="3" label="公司自派中車(高停別)"></el-option>
+                <el-option value="4" label="公司自派中車(全包團)"></el-option>
+                <el-option value="5" label="外丟大車(高停別)"></el-option>
+                <el-option value="6" label="外丟大車(全包團)"></el-option>
+                <el-option value="7" label="外丟中車(高停別)"></el-option>
+                <el-option value="8" label="外丟中車(全包團)"></el-option>
+                <el-option value="9" label="外丟小車(全包團)"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" v-if="getCompanyMsg.RB_Group_Id==2 && (empBranchId==0 || empBranchId==1252)">
             <el-form-item label="其他查询">
               <el-select v-model="msg.SpecialType" class="w150">
@@ -1360,7 +1376,8 @@ export default {
         TeamType:'0',
         IsSelectReceipt:0,
         StandardCurrencyId: -1,
-        IncomeType:'1'
+        IncomeType:'1',
+        CarProductType:'0'
       },
       getCompanyMsg: {
         // 公司
@@ -2351,6 +2368,22 @@ export default {
           columnAlign: "right",
           isResize: true
         },
+        {
+          field: "GuideName",
+          title: '产品类型',
+          width: 120,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
+        {
+          field: "LeaderName",
+          title: '费用包含',
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true
+        },
         {
           field: "YingShou",
           formatter: this.moneyFormat,