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

src/components/FinancialModule/PlatformAccount/index.vue

 <template>
   <div class="flexOne page_PlatformAccount">
     <div class="query-box">
-      <!-- <el-form class="_info_box clearfix" label-width="110px">
-        <el-row>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="账户别名">
-              <el-input v-model="msg.Alias"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="所属机构">
-              <el-select filterable v-model="msg.BackId">
-                <el-option label="不限" value="-1"></el-option>
-                <el-option
-                  v-for="item in FinancialList"
-                  v-if="item.Type == 1"
-                  :label="item.Name"
-                  :value="item.ID"
-                  :key="item.ID"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="账户类型">
-              <el-select filterable v-model="msg.TypeId">
-                <el-option label="不限" value="-1"></el-option>
-                <el-option
-                  v-for="item in AccountTypeList"
-                  :label="item.Name"
-                  :value="item.ID"
-                  :key="item.ID"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="所属公司">
-              <el-select filterable v-model="msg.RB_Branch_Id">
-                <el-option label="不限" value="-2"></el-option>
-                <el-option
-                  v-for="item in CompanyList"
-                  :label="item.BName"
-                  :value="item.Id"
-                  :key="item.Id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>-->
+    
       <ul>
         <li>
-          <!-- <input
-            type="button"
-            class="hollowFixedBtn"
-            value="查询"
-            @click="resetPageIndex(),getList()"
-          >-->
           <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
             @click="addShow=true,text=$t('pub.addBtn'),ed=false,isLookPlatformAccountPwd=true">
           <input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
         </li>
       </ul>
     </div>
-    <!-- <div class="cm_content _scrollbar" :class="addShow==true||addCuren==false?'_edHeight':''">
-      <p class="_tips">以下汇率系统将每隔30分钟实时更新一次</p>
-      <div class="clearfix" v-loading="loading">
-        <div class="instMg_list_item" v-for="(item,index) in DataList">
-          <div class="_top">
-            <img v-if="!item.BankIcon" style="width:100%" src="../../assets/img/bg_c1@2x.png" alt>
-            <img v-else :src="item.BankIcon" alt>
-          </div>
-          <div class="_bt">
-            <div class="_bt_t">
-              <p>
-                <el-tooltip class="item" effect="dark" :content="item.Alias" placement="top-start">
-                  <span class="max_w200">{{item.Alias}}</span>
-                </el-tooltip>
-              </p>
-              <div class="_btt_b">
-                <div>
-                  <p class="over_ellipsis">
-                    <i class="iconfont icon-img-ren"></i>
-                    <el-tooltip
-                      class="item"
-                      effect="dark"
-                      :content="item.Accountholder"
-                      placement="top-start"
-                    >
-                      <span>{{item.Accountholder}}</span>
-                    </el-tooltip>
-                  </p>
-                  <p>{{item.TypeName}}</p>
-                </div>
-                <div class="clearfix">
-                  <p class="PingFangSC over_ellipsis fl">
-                    <el-tooltip
-                      class="item"
-                      effect="dark"
-                      :content="item.PlatformNo"
-                      placement="top-start"
-                    >
-                      <span>{{item.PlatformNo}}</span>
-                    </el-tooltip>
-                  </p>
-                  <p class="PingFangCom fl">
-                    <el-tooltip
-                      class="item"
-                      effect="dark"
-                      :content="item.Commission"
-                      placement="top-start"
-                    >
-                      <span>{{item.Commission}}</span>
-                    </el-tooltip>
-                  </p>
-                </div>
-              </div>
-            </div>
-            <div class="_bt_b">
-              <p>
-                <span class="_name">账户余额</span>
-                <span>
-                  <span
-                    v-if="item.IsStandardCurrency!=1"
-                  >{{item.showB?item.StandardCurrencyCode:item.CurrencyCode}}</span>
-                  <span v-else>{{item.StandardCurrencyCode}}</span>
-                  <span
-                    class="fc_green PingFangSC _underline"
-                    @click="item.IsStandardCurrency!=1?goUrl('FineBalance',item.ID,item.Alias):''"
-                  >{{item.showB?moneyFormat(item.benBalance):moneyFormat(item.Initialbalance)}}</span>
-                  <span
-                    class="iconfont icon-qiehuan"
-                    @click="item.showB=!item.showB"
-                    v-if="item.IsStandardCurrency!=1"
-                  ></span>
-                  <span v-if="item.IsStandardCurrency!=1" class="iconfont icon-ico-renwuyaoqiu"></span>
-                </span>
-              </p>
-              <p>
-                <span class="_name">账户币种</span>
-                <span class="_bold">
-                  <el-tooltip
-                    class="item"
-                    effect="dark"
-                    :content="item.CurrencyName"
-                    placement="top-start"
-                  >
-                    <span class="_max_wd">{{item.CurrencyName}}</span>
-                  </el-tooltip>(
-                  <span
-                    class="_bold"
-                    :class="item.IsStandardCurrency==1?'fc_green':'fc_red'"
-                  >{{item.IsStandardCurrency==1?'本位币':'外币'}}</span>)
-                  <span class="_no_bold" v-if="item.IsStandardCurrency!=1">{{item.CurrentRate}}</span>
-                </span>
-              </p>
-              <p>
-                <span class="_name">所属公司</span>
-                <el-tooltip class="item" effect="dark" :content="item.allName" placement="top-end">
-                  <span class="_cp_name">
-                    <span class="_bold" v-for="(b,bi) in item.BranchName">{{b}}</span>
-                  </span>
-                </el-tooltip>
-              </p>
-              <p v-if="item.IsStandardCurrency!=1">
-                <span class="_name">上期损益</span>
-                <span
-                  class="fr"
-                  v-if="item.ProfitLossMoney&&item.ProfitLossMoney!=0"
-                  :class="item.ProfitLossMoney>0?'fc_green':'fc_red'"
-                >123123</span>
-                <span class="fr" v-else>-</span>
-              </p>
-              <p v-else>&nbsp;</p>
-            </div>
-            <p class="_btn">
-              <el-button-group>
-                <el-button
-                  type="primary"
-                  @click="editCurency(item.ID),text='修改',addShow=true,addCuren=true"
-                >修改</el-button>
-                <el-button
-                  type="success"
-                  v-if="item.IsStandardCurrency===0"
-                  @click="moneyDate.ProfitLoss=0,cancelEdit(2),addShow=false,addCuren=false,SetProfitLossMsg.AccountID = item.ID,SetProfitLossMsg.CurrencyId=item.CurrencyId,SetProfitLossMsg.initRate=item.CurrentRate,SetProfitLossMsg.Money = item.Money"
-                >调汇</el-button>
-                <el-button
-                  type="info"
-                  v-if="item.IsStandardCurrency===0"
-                  @click="goUrl('RemittanceRecord',item.ID,item.Alias,2,item.CurrencyId)"
-                >记录</el-button>
-                <el-button type="danger" @click="financeinfoRemove(item.ID,item.Alias)">销户</el-button>
-              </el-button-group>
-            </p>
-          </div>
-        </div>
-      </div>
-      <div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
-      <div>
-        <el-pagination
-          background
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage"
-          layout="total,prev, pager, next, jumper"
-          :page-size="msg.pageSize"
-          :total="total"
-        ></el-pagination>
-      </div>
-    </div>-->
     <v-table v-if="isReady" is-horizontal-resize column-width-drag style="width:100%" :columns="columns"
       :table-data="DataList" :filter-method="filterMethod" :total="total" :pageSize="msg.pageSize"
       :pageIndex="msg.pageIndex" :handleCurrentChange="handleCurrentChanges" :multiple-sort="multipleSort"
@@ -381,14 +182,14 @@
               <el-input v-model="addMsg.Bond" maxlength="20"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :gutter="35">
+          <!-- <el-col :span="4" :gutter="35">
             <el-form-item :label="$t('fnc.hetong')">
               <el-select filterable v-model="addMsg.HaveContract" class>
                 <el-option :label="$t('fnc.yhetong')" value=1></el-option>
                 <el-option :label="$t('fnc.whetong')" value=0></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="4" :gutter="35">
             <el-form-item :label="$t('fnc.htshuoming')">
               <el-input v-model="addMsg.ContraceDateRange" class></el-input>
@@ -721,11 +522,6 @@
             required: true,
             message: '请输入风险上限',
             trigger: "blur"
-          }],
-          ContractArray: [{
-            required: true,
-            message: '请上传合同',
-            trigger: "change"
           }]
         },
         addCuren: true,

src/components/administrative/model/ChangeThePriceMessage.vue

+<template>
+  <el-dialog custom-class='PingFangSC' title="订单改价提醒" :visible.sync="outerVisibleNot" center
+      :before-close="closeChangeMachie" width="1100px">
+      <div style="margin-top: 20px;">
+        <p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;">订单改价列表</p>
+        <el-table
+      border
+      ref="multipleTable"
+      :data="ChangeThePriceData"
+      style="width: 100%"
+      :default-sort="{ prop: 'null', order: 'null' }"
+      :sort-by="[
+        'Money',
+        'Income',
+        'PreferTipAmount',
+        'PlatformTax',
+        'Refund',
+        'CostMoney',
+        'OrderProfit',
+        'DueInMoney'
+      ]"
+    >
+      <el-table-column
+        width="200"
+        prop="CreateTimeStr"
+        label="订单Id"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <div>
+            <p
+              class="cursor-pointer c059FF6 fz18 row-c"
+              @click="goDetails(scope.row)"
+            >
+              <el-tag style="margin-right: 5px;" size="mini">{{
+                scope.row.OrderTypeName
+              }}</el-tag>
+              <span>{{ scope.row.OrderId }}</span>
+            </p>
+            <p>{{ scope.row.CreateTimeStr }}</p>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="200"
+        prop="CreateTimeStr"
+        label="团号"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <div>
+            <p
+              class=" fz14"
+              :class="{ 'cursor-pointer c059FF6': scope.row.OrderType == 2 }"
+              @click="scope.row.OrderType == 2 ? goTuanDetails(scope.row) : ''"
+            >
+              {{ scope.row.TCNUM }}
+            </p>
+            <p>出发日期：{{ scope.row.StartDate }}</p>
+            <p v-if="scope.row.OrderType == 2 && scope.row.Status >= 0">
+              {{
+                scope.row.Status == 1
+                  ? "未结团"
+                  : scope.row.Status == 2
+                  ? "已结团    "
+                  : scope.row.Status == 5
+                  ? "待结团审核"
+                  : ""
+              }}{{ scope.row.Status == 2 ? scope.row.OutGroupAuditDate : "" }}
+            </p>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="客人" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>
+            {{ scope.row.GuestName }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="SaleName" label="销售"> </el-table-column>
+      <el-table-column prop="LureEmpName" label="引流"> </el-table-column>
+      <el-table-column label="商品名称" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div
+            style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
+          >
+            {{ scope.row.Name }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品详情" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <div
+            style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
+          >
+            {{ scope.row.Description }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        sortable
+        prop="Money"
+        label="总金额"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ scope.row.Money }}&ensp;({{ scope.row.CurrencyName }})
+        </template>
+      </el-table-column>
+
+      <el-table-column sortable prop="Income" label="实收"> </el-table-column>
+      <el-table-column
+        sortable
+        prop="PlatformTax"
+        label="手续费"
+        min-width="100"
+      >
+      </el-table-column>
+      <el-table-column sortable prop="Refund" label="退款"> </el-table-column>
+      <!-- <el-table-column sortable prop="CostMoney" label="成本" >
+    </el-table-column> -->
+      <el-table-column sortable prop="DueInMoney" label="待收">
+        <template slot-scope="scope">
+          <span :class="{ red: scope.row.DueInMoney > 0 }">{{
+            scope.row.DueInMoney
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        sortable
+        prop="OrderProfit"
+        label="预期利润"
+        min-width="110"
+      >
+        <template slot-scope="scope">
+          <span :class="{ red: scope.row.OrderProfit > 0 }">{{
+            scope.row.OrderProfit
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column sortable prop="DiscountsMoney" label="优惠">
+      </el-table-column>
+      <el-table-column
+        prop="Money"
+        label="申请金额"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <span> {{ scope.row.ApplyForMoney }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="ApplyForReason"
+        label="申请理由"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ scope.row.ApplyForReason }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="ApplyForState"
+        label="改价状态"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <span
+            >{{
+              scope.row.ApplyForState == 1
+                ? "待审核"
+                : scope.row.ApplyForState == 2
+                ? "已通过"
+                : scope.row.ApplyForState == 3
+                ? "已拒绝"
+                : ""
+            }}
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+      </div>
+      <div v-if="ChangeThePriceData.length==0" style="padding: 40px 0;text-align: center;">
+        暂无数据
+      </div>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props:["ChangeThePriceData"],
+    data() {
+      return {
+        outerVisibleNot: true
+      }
+    },
+    watch: {
+
+    },
+    methods: {
+      closeChangeMachie(done) {
+        this.$emit('ChangeThePriceVisible')
+      },
+    }
+  }
+</script>

src/components/index.vue

@@ -222,6 +222,11 @@
                   机票未绑团查看
                   <i class="iconfont icon-right1"></i>
                 </el-dropdown-item>
+                <el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
+                  <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
+                  订单改价详情
+                  <i class="iconfont icon-right1"></i>
+                </el-dropdown-item>
                 <el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
                   <i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
                   设置
@@ -1198,6 +1203,10 @@
     <!-- 机票未绑团提示 -->
     <unbundlingMessage v-if="unbundlingVisible"
     :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
+
+    <!-- 改价提醒 -->
+    <ChangeThePriceMessage v-if="ChangeThePriceVisible" :ChangeThePriceData="ChangeThePriceData"
+    @ChangeThePriceVisible="ChangeThePriceVisible=false"></ChangeThePriceMessage>
   </div>
 </template>
 
@@ -1221,6 +1230,8 @@
   import commissionDetail from "./commonPage/commissionDetail.vue";
   import Voting from "../components/administrative/model/Voting";
   import unbundlingMessage from "../components/administrative/model/unbundlingMessage";
+  import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
+
   export default {
     components: {
       ChatList,
@@ -1231,10 +1242,13 @@
       commissonBill,
       commissionDetail,
       Voting,
-      unbundlingMessage
+      unbundlingMessage,
+      ChangeThePriceMessage
     },
     data() {
       return {
+        ChangeThePriceData:[],
+        ChangeThePriceVisible: false,//改价提醒
         UnboundDate: {},
         unbundlingVisible: false,//未绑团提醒
         b2bDomain: "",
@@ -1855,10 +1869,28 @@
             localStorage.removeItem("UnboundDate");
             localStorage.removeItem("UnboundDateTime");
           }
-
         }
       }
 
+
+      // 获取改价提醒
+      if(!localStorage.getItem("ChangeThePriceDataTime")||
+      (localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
+        this.GetChangeThePrice()
+      }else{
+        // if(localStorage.getItem("ChangeThePriceData")){
+        //   this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData"))
+        // }
+      }
+      // 两小时请求一次改价提醒
+      setInterval(()=>{
+        if(!this.ChangeThePriceVisible){
+          this.GetChangeThePrice()
+        }else{
+          clearInterval()
+        }
+      },7200000)
+
     },
     created() {
       if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
@@ -1893,6 +1925,51 @@
       }
     },
     methods: {
+      // 获取改价提醒的数据
+      GetChangeThePrice(){
+        let msg = {
+          "pageIndex":1,
+          "pageSize":1,
+          "OrderId":"",
+          "GuestId":0,
+          "EnterId":0,
+          "OrderState":"1",
+          "Q_IsCollect":"2",
+          "StartTime":"",
+          "EndTime":"",
+          "FinishSTime":"",
+          "FinishETime":"",
+          "DepartSTime":"",
+          "DepartETime": this.getBeforeDate(0, new Date()),
+          "TCNUM":"",
+          "ProductName":"",
+          "CustomerName":"",
+          "LureEmpId":0,
+          "LineId":0,
+          "TravelType":0,
+          "OrderType":"0",
+          "IsSelectCRM":0,
+          "IsMyOrder":1,
+          "CommissionType":"-1"
+        }
+        this.ChangeThePriceData = []
+        this.apipost(
+            "CarSingle_post_GetChangePriceOrderPageList", msg,
+            res => {
+              if(res.data.resultCode==1){
+                if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
+                  localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
+                  localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
+                  this.ChangeThePriceData = res.data.data.pageData
+                  this.ChangeThePriceVisible = true
+                }else{
+                  localStorage.removeItem("ChangeThePriceData");
+                  localStorage.removeItem("ChangeThePriceDataTime");
+                }
+              }
+            }
+          );
+      },
       // 获取未绑定团的数据
       GetTravelAirNotBind(){
         this.UnboundDate = {}

src/components/myOrdersAllType/components/OrderListExaminePrice.vue

@@ -275,7 +275,7 @@
             </el-form-item></el-col
           >
           <el-col :span="8">
-            <el-form-item label="审核理由" prop="RefuseReason">
+            <el-form-item label="审核理由" prop="">
               <el-input
                 :readonly="changePriceMsg.DialogType == 1 ? true : false"
                 type="textarea"