Merge branch 'master' into carOrder

src/components/FinancialModule/DataAnalysis/index.vue

@@ -6,7 +6,7 @@
       <el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
-      <el-form class="_info_box clearfix" label-width="110px">
+      <el-form class="_info_box clearfix" label-width="90px">
         <el-row style="padding: 15px 0px 0 0">
           <el-col :span="4">
             <el-form-item :label="$t('system.table_company')">
@@ -96,6 +96,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="2" v-if="msg.Type!=3">
+            <el-form-item label="季度汇总">
+              <el-checkbox v-model="msg.LossType" true-label="1" false-label="0"></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -134,7 +139,8 @@ export default {
         StandardCurrencyId:0,
         LineId: 0,
         Type: '1',
-        DataType:'-1'
+        DataType:'-1',
+        LossType:'0'
       },
       dateTime: [],
       CompanyList: [],

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1889,6 +1889,7 @@
                 event_id: 'CarDealerOrder',
                 data: {
                   OrderId: this.GetDetail.ReFinanceId,
+                  type:2
                 }
               }, `${href}`)
             } else {
@@ -1908,6 +1909,7 @@
                 event_id: 'CarDealerOrder',
                 data: {
                   MainId: this.GetDetail.ReFinanceId,
+                  type:1
                 }
               }, `${href}`)
             } else {