Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialDocuments.vue

@@ -1792,6 +1792,8 @@
         expressageMsg: [],
         importFileUrl3: this.domainManager().UploadFileUrl +
           "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
+        importFileUrl4: this.domainManager().UploadFileUrl +
+          "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
         hbMsg: {
           FrIDList: [],
           Type: 1
@@ -2135,12 +2137,14 @@
         this.$message.info(this.$t('tips.shangchuanzhong'))
         this.UploadSelfFileT(path, newArr, x => {
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+          this.expressageMsg=[];
           this.expressageMsg.push({
             Content: x.data.FilePath,
             ID: 0,
             Type: fileTypeNumber,
             Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
           })
+          this.importFileUrl3 = this.importFileUrl4 + '&CreateByName=' + this.expressageMsg[0].Url;
           this.$message.success(this.$t('tips.scchenggong'))
         }, 1);
       },
@@ -2358,7 +2362,6 @@
         return isJPG && isLt2M;
       },
       beforeAvatarUpload2(file) {
-        this.importFileUrl3 = this.importFileUrl3 + '&CreateByName=' + this.expressageMsg[0].Url
         return;
       },
       //上传

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2391,6 +2391,20 @@ export default {
     if (this.$route.query.BranchId) {
       this.msg.OutBranchId = this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
     }
+
+    if(userInfo.RB_Group_id ==2 &&(userInfo.EmployeeId == 955 || userInfo.RB_Department_Id==2)){
+      this.columns.splice(24, 0, {
+          field: "CarExpectedCost",
+          formatter: this.moneyFormat,
+          title: "预估车资",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        });
+    }
+
     this.financeinfo_post_GetList()
     this.getCompanyList();
     this.getLineList();
@@ -2806,6 +2820,7 @@ export default {
       if (field === "YiShou") return this.priceFormat(rowData.YiShou);
       if (field === "YaoQingHan") return this.priceFormat(rowData.YaoQingHan);
       if (field === "CheZi") return this.priceFormat(rowData.CheZi);
+      if (field === "CarExpectedCost") return this.priceFormat(rowData.CarExpectedCost);
       if (field === "JiPiao") return this.priceFormat(rowData.JiPiao);
       if (field === "GuoNeiLianYunJiPiao") return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
       if (field === "AirLossIncome") return this.priceFormat(rowData.AirLossIncome);

src/components/TravelManager/TravelList/RegistrationStatistics.vue

@@ -318,7 +318,7 @@
         queryMsg: {
           pageIndex: 1,
           pageSize: 50,
-          LineID: 0,
+          LineId: 0,
           ltID: 0,
           PlaceID: 0,
           OutBranchId: -1,

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -126,7 +126,7 @@
         <li>
           <span>
             <em>{{$t('advmanager.v_line')}}</em>
-            <el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')"
+            <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
               @change="getLineTeamList()">
               <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
               <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
@@ -168,7 +168,6 @@
       <tr>
         <th width="50">{{$t('salesModule.Xu')}}</th>
         <th width="80">{{$t('Operation.Op_chutuan')}}</th>
-
         <th width='200'>系列</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
@@ -287,7 +286,7 @@
         queryMsg: {
           pageIndex: 1,
           pageSize: 50,
-          LineID: 0,
+          LineId: 0,
           ltID: 0,
           OutBranchId: -1,
           QStartDate: "",
@@ -351,7 +350,7 @@
       getLineTeamList() {
         this.queryMsg.ltID = 0;
         let msg = {
-          lineID: this.queryMsg.LineID,
+          lineID: this.queryMsg.LineId,
           isTOOP: 1
         };
         this.apipost("team_post_GetList", msg, res => {