Skip to content

S
SuperMan
Commit f9ea474c authored by 黄奎's avatar 黄奎
Browse files
Options

今日订单修改

parent 9f0e2e87
Show whitespace changes
Inline Side-by-side
Showing with 680 additions and 750 deletions
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ f9ea474c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<li> <li>
<span> <span>
<em>{{$t('scen.sc_cp')}}</em> <em>{{$t('scen.sc_cp')}}</em>
<el-select class="w200" v-model="msg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w135" v-model="msg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
...@@ -14,27 +14,18 @@ ...@@ -14,27 +14,18 @@
<li> <li>
<span> <span>
<em>{{$t('advmanager.v_line')}}</em> <em>{{$t('advmanager.v_line')}}</em>
<el-select <el-select class="w135" v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
class="w200"
v-model="msg.LineId"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option <el-option v-for="item in LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
v-for="item in LineList" </el-option>
:label="item.LineName"
:value="item.LineID"
:key="item.LineID"
></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_baomingCompany')}}</em> <em>{{$t('Operation.Op_baomingCompany')}}</em>
<el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getDepartmentMsg.RB_Branch_Id=msg.BranchId,msg.RB_Department_Id='',msg.CreateBy='',getDepartment()"> <el-select class="w135" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getDepartmentMsg.RB_Branch_Id=msg.BranchId,msg.RB_Department_Id='',msg.CreateBy='',getDepartment()">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
...@@ -43,11 +34,10 @@ ...@@ -43,11 +34,10 @@
<li> <li>
<span> <span>
<em>部门选择</em> <em>部门选择</em>
<el-select filterable v-model='msg.RB_Department_Id' @change="employeeMsg.DepartmentId=msg.RB_Department_Id,getEmployee(),msg.CreateBy=''"> <el-select class="w135" filterable v-model='msg.RB_Department_Id'
@change="employeeMsg.DepartmentId=msg.RB_Department_Id,getEmployee(),msg.CreateBy=''">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList' <el-option v-for='item in DepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'> :key='item.DepartmentID'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -57,48 +47,44 @@ ...@@ -57,48 +47,44 @@
<span> <span>
<em>{{$t('Operation.Op_peopleChoice')}}</em> <em>{{$t('Operation.Op_peopleChoice')}}</em>
</span> </span>
<el-select <el-select class="w135" v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
class="w200"
v-model="msg.CreateBy"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
v-for="item in EmployeeList" :key="item.EmployeeId"></el-option>
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.order_Number')}}</em> <em>{{$t('hotel.order_Number')}}</em>
</span> </span>
<el-input class="w200" v-model="msg.tempOrderId"></el-input> <el-input class="w135" v-model="msg.tempOrderId"></el-input>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_OrderStates')}}</em> <em>{{$t('hotel.hotel_OrderStates')}}</em>
</span> </span>
<el-select v-model="msg.OrderState" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w135" v-model="msg.OrderState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in ddztList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option> <el-option v-for="item in ddztList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select> </el-select>
</li> </li>
<li><span><em>{{$t('fnc.bmriqi')}}</em><el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <li><span><em>{{$t('fnc.bmriqi')}}</em>
<el-date-picker v-model='msg.CStartDate' @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</span>
</li>
<li><span><em>发团日期</em>
<el-date-picker v-model='msg.QStartDate' class="w135" value-format="yyyy-MM-dd" type="date">
</el-date-picker>
-
<el-date-picker v-model='msg.QEndDate' class="w135" value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<input <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getList()">
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="resetPageIndex();getList()"
>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -114,7 +100,8 @@ ...@@ -114,7 +100,8 @@
<p> <p>
<span>{{$t('Operation.Op_yingPay')}}：{{countData.PreferPrice}};</span> <span>{{$t('Operation.Op_yingPay')}}：{{countData.PreferPrice}};</span>
<span>{{$t('Operation.Op_yiShou')}}：{{countData.Income}};</span> <span>{{$t('Operation.Op_yiShou')}}：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">{{$t('Operation.Op_weiShou')}}：{{countData.DueinMoney}};</span> <span
:class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">{{$t('Operation.Op_weiShou')}}：{{countData.DueinMoney}};</span>
<span>{{$t('fnc.ztjine')}}：{{countData.ZaiTu}};</span> <span>{{$t('fnc.ztjine')}}：{{countData.ZaiTu}};</span>
</p> </p>
</div> </div>
...@@ -131,6 +118,14 @@ ...@@ -131,6 +118,14 @@
<span>{{$t('Airticket.Air_businessClass')}}：{{countData.NormalESeatNum}};</span> <span>{{$t('Airticket.Air_businessClass')}}：{{countData.NormalESeatNum}};</span>
<span>{{$t('Airticket.Air_firstClass')}}：{{countData.NormalFSeatNum}};</span> <span>{{$t('Airticket.Air_firstClass')}}：{{countData.NormalFSeatNum}};</span>
</p> </p>
<div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i>
<span>机位数</span>
</div>
<p>
<span class="color_red_order">总: {{countData.YSeat}}(经济舱)+{{countData.CSeat}}(商务舱)+{{countData.FSeat}}(头等舱) ;</span>
<span class="color_red_order">剩: {{countData.YSeat-countData.SurplusYSeat}}(经济舱)+{{countData.CSeat-countData.SurplusCSeat}}(商务舱)+{{countData.FSeat-countData.SurplusFSeat}}(头等舱) ;</span>
</p>
</div> </div>
</el-col> </el-col>
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="5" class="groupTourOrder_count_col">
...@@ -189,13 +184,7 @@ ...@@ -189,13 +184,7 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div style="clear: both; width: 100%;height: 20px;"></div> <div style="clear: both; width: 100%;height: 20px;"></div>
<table <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
class="enrollTotalSearchTable"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr> <tr>
<th width="80">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th> <th width="80">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
<th width="70">{{$t('advmanager.v_type')}}</th> <th width="70">{{$t('advmanager.v_type')}}</th>
...@@ -222,40 +211,23 @@ ...@@ -222,40 +211,23 @@
<tr> <tr>
<td rowspan="2"> <td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p> <p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
class="fbold over_ellipsis" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.orderId}}</p>
style="width: 100%;cursor:pointer;" <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.orderId" :title="item.alName" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
>{{item.orderId}}</p> style="color:red">({{item.leaveStr}})</span></p>
<p <p class="fz12 over_ellipsis" style="width: 100%;">
class="fz12 over_ellipsis" {{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.alName"
@click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)"
>{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p
class="fz12 over_ellipsis"
style="width: 100%;"
>{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
</td> </td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td> </td>
<td class="fz12"> <td class="fz12">
<p <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
style="max-width: 160px;display: block;"
class="over_ellipsis"
:title="item.lineName"
>
<span>{{item.lineName}}</span> <span>{{item.lineName}}</span>
</p> </p>
<p <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
style="max-width: 160px;display: block;"
class="over_ellipsis"
:title="item.ltName"
>{{item.ltName}}</p>
</td> </td>
<td>{{item.guestNum}}</td> <td>{{item.guestNum}}</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td> <td style="color:#FF9C00">{{item.tC_Price}}</td>
...@@ -265,7 +237,7 @@ ...@@ -265,7 +237,7 @@
</td> </td>
<td> <td>
<span v-if="item.isEnd==0" >{{item.income}}</span> <span v-if="item.isEnd==0">{{item.income}}</span>
<span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span> <span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span>
</td> </td>
<!-- 优惠 --> <!-- 优惠 -->
...@@ -312,11 +284,7 @@ ...@@ -312,11 +284,7 @@
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td> <td>
<p <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
class="over_ellipsis"
style="width: 150px;"
:title="item.contactName"
>{{item.contactName}}</p>
<p>{{item.contactMobile}}</p> <p>{{item.contactMobile}}</p>
</td> </td>
<td v-if="userId==1"> <td v-if="userId==1">
...@@ -325,25 +293,18 @@ ...@@ -325,25 +293,18 @@
</tr> </tr>
<tr> <tr>
<td colspan="7" class="groupTourOrder_remarks" style="height: 20px;"> <td colspan="7" class="groupTourOrder_remarks" style="height: 20px;">
<!-- <div v-if="item.platformOrder!==''" style="font-size: 12px;">
<em>平台订单号：</em>
<span>{{item.platformOrder}}</span>
</div> -->
<div> <div>
<div> <div>
<span>{{$t('hotel.hotel_remark')}}：</span> <span>{{$t('hotel.hotel_remark')}}：</span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p> <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
{{item.platformOrder}};</span>{{item.remarks}}</p>
</div> </div>
<div> <div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>{{$t('fnc.lsbeizhu')}}</div> <div>{{$t('fnc.lsbeizhu')}}</div>
<p <p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
v-if="item.remarksList.length !== 0"
v-for="(item2, index2) in item.remarksList"
:key="index2"
>
<span>{{item2.remarks}}</span> <span>{{item2.remarks}}</span>
<span> <span>
{{item2.createByName}} {{item2.createByName}}
...@@ -352,71 +313,39 @@ ...@@ -352,71 +313,39 @@
</p> </p>
<span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span> <span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div> </div>
<el-button <el-button slot="reference" icon="iconfont icon-gengduo"
slot="reference" style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn">
icon="iconfont icon-gengduo" </el-button>
style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"
></el-button>
</el-popover> </el-popover>
</div> </div>
</div> </div>
</td> </td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>
<div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span> <div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue"> 《{{item2.frID}}》
v-if="item2.colorState===1"
class="groupTourOrder_tickets_blue"
> 《{{item2.frID}}》
</span> </span>
<span <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green"> 《{{item2.frID}}》</span>
v-else-if="item2.colorState===2"
class="groupTourOrder_tickets_green"
> 《{{item2.frID}}》</span>
<span
v-else-if="item2.colorState===3"
class="groupTourOrder_tickets_red"
>《{{item2.frID}}》 <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">《{{item2.frID}}》
</span> </span>
<span <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">《{{item2.frID}}》
v-else-if="item2.colorState===4"
class="groupTourOrder_tickets_black"
>《{{item2.frID}}》
</span> </span>
</span> </span>
</div> </div>
</div> </div>
<div> <div>
<div style="white-space: nowrap">{{$t('fnc.fkdanju')}}：<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span> <div style="white-space: nowrap">{{$t('fnc.fkdanju')}}：<span v-if="item.financeList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">《{{item2.frID}}》</span>
v-if="item2.colorState===1" <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">《{{item2.frID}}》</span>
class="groupTourOrder_tickets_blue" <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">《{{item2.frID}}》</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">《{{item2.frID}}》</span>
>《{{item2.frID}}》</span>
<span
v-else-if="item2.colorState===2"
class="groupTourOrder_tickets_green"
>《{{item2.frID}}》</span>
<span
v-else-if="item2.colorState===3"
class="groupTourOrder_tickets_red"
>《{{item2.frID}}》</span>
<span
v-else-if="item2.colorState===4"
class="groupTourOrder_tickets_black"
>《{{item2.frID}}》</span>
</span> </span>
</div> </div>
...@@ -425,14 +354,8 @@ ...@@ -425,14 +354,8 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
background layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;"> <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
...@@ -442,10 +365,10 @@ ...@@ -442,10 +365,10 @@
</template> </template>
<script> <script>
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import updateSalesMan from "../../commonPage/updateSalesMan.vue"; import updateSalesMan from "../../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
components: { components: {
Treeselect, Treeselect,
updateSalesMan updateSalesMan
...@@ -459,17 +382,16 @@ export default { ...@@ -459,17 +382,16 @@ export default {
children: node.ChildList children: node.ChildList
}; };
}, },
defaultImg: defaultImg: 'this.src="' + require("../../../assets/img/litheader.png") + '"',
'this.src="' + require("../../../assets/img/litheader.png") + '"',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
loading: false, loading: false,
companyList: [], companyList: [],
msg: { msg: {
OutBranchId: -1, OutBranchId: -1,
BranchId:-1, BranchId: -1,
LineId: -1, LineId: -1,
LineIdStr:"",//线路字符串 LineIdStr: "", //线路字符串
RB_Department_Id: '', RB_Department_Id: '',
CreateBy: "-1", CreateBy: "-1",
OrderState: "-1", OrderState: "-1",
...@@ -478,14 +400,16 @@ export default { ...@@ -478,14 +400,16 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
tempOrderId: "", tempOrderId: "",
SellFormEmp: 0 SellFormEmp: 0,
QStartDate: '', //发团日期-开始
QEndDate: '', //发团日期-结束
}, },
getDepartmentMsg:{// 部门 getDepartmentMsg: { // 部门
RB_Group_Id:'', RB_Group_Id: '',
RB_Branch_Id:'', RB_Branch_Id: '',
Status:0, Status: 0,
ParentId:-1, ParentId: -1,
Tier:0, Tier: 0,
}, },
employeeMsg: { employeeMsg: {
RB_Group_id: "0", RB_Group_id: "0",
...@@ -524,13 +448,13 @@ export default { ...@@ -524,13 +448,13 @@ export default {
InteriorNum: 0, InteriorNum: 0,
B2BNum: 0 B2BNum: 0
}, },
showChangeSales:false, showChangeSales: false,
//订单编号及业务员信息 //订单编号及业务员信息
subInfo:{ subInfo: {
CreateBy:'', CreateBy: '',
OrderId:0 OrderId: 0
}, },
userId:0 userId: 0
}; };
}, },
methods: { methods: {
...@@ -547,7 +471,11 @@ export default { ...@@ -547,7 +471,11 @@ export default {
obj.description = [] obj.description = []
this.$router.push({ this.$router.push({
name: path, name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)} query: {
blank: 'y',
tab: name,
item: JSON.stringify(obj)
}
}); });
}, },
getCompanyList() { getCompanyList() {
...@@ -559,8 +487,8 @@ export default { ...@@ -559,8 +487,8 @@ export default {
RB_Group_Id: RB_Group_id RB_Group_Id: RB_Group_id
} }
this.apipost('admin_get_BranchGetList', msg, res => { this.apipost('admin_get_BranchGetList', msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.companyList=res.data.data; this.companyList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
...@@ -583,7 +511,7 @@ export default { ...@@ -583,7 +511,7 @@ export default {
}); });
}, },
// 获取统计数据 // 获取统计数据
getCount: function() { getCount: function () {
this.apipost( this.apipost(
"sellorder_post_OP_GetOrderListStatistics", "sellorder_post_OP_GetOrderListStatistics",
this.msg, this.msg,
...@@ -615,8 +543,7 @@ export default { ...@@ -615,8 +543,7 @@ export default {
}, },
getDdztList() { getDdztList() {
this.apipost( this.apipost(
"sellorder_post_GetSellOrderStatusEnumList", "sellorder_post_GetSellOrderStatusEnumList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ddztList = res.data.data; this.ddztList = res.data.data;
...@@ -629,11 +556,11 @@ export default { ...@@ -629,11 +556,11 @@ export default {
this.apipost("line_post_GetList", {}, res => { this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.LineList = res.data.data;
var lineIdStr=""; var lineIdStr = "";
this.LineList.forEach(lineItem=>{ this.LineList.forEach(lineItem => {
lineIdStr+= lineItem.LineID+","; lineIdStr += lineItem.LineID + ",";
}); });
this.msg.LineIdStr= lineIdStr.substring(0, lineIdStr.lastIndexOf(',')) this.msg.LineIdStr = lineIdStr.substring(0, lineIdStr.lastIndexOf(','))
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -645,7 +572,6 @@ export default { ...@@ -645,7 +572,6 @@ export default {
"sellorder_post_OP_GetOrderList", "sellorder_post_OP_GetOrderList",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -667,27 +593,26 @@ export default { ...@@ -667,27 +593,26 @@ export default {
this.currentPage = 1; this.currentPage = 1;
}, },
//点击修改业务员 //点击修改业务员
getSalerInfo(item){ getSalerInfo(item) {
this.subInfo.CreateBy = item.createBy; this.subInfo.CreateBy = item.createBy;
this.subInfo.OrderId = item.orderId; this.subInfo.OrderId = item.orderId;
this.showChangeSales = true; this.showChangeSales = true;
}, },
//关闭修改业务员 //关闭修改业务员
closeSalseDiv(){ closeSalseDiv() {
this.showChangeSales=false; this.showChangeSales = false;
}, },
getDepartment(){ //部门 getDepartment() { //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => { this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DepartmentList = res.data.data; this.DepartmentList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getEmployee() { //员工 getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
console.log(this.EmployeeList);
} }
}, err => {}) }, err => {})
}, },
...@@ -701,22 +626,23 @@ export default { ...@@ -701,22 +626,23 @@ export default {
this.getLineList(); this.getLineList();
this.getDepartment(); this.getDepartment();
this.getDdztList(); this.getDdztList();
let nowDay = new Date().toLocaleDateString();
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id; this.msg.tempOrderId = this.$route.query.id;
} }
if (this.msg.CStartDate === "" && this.msg.CEndDate === "") { if (this.msg.CStartDate === "" && this.msg.CEndDate === "") {
let nowDay = new Date().toLocaleDateString();
this.msg.CStartDate = nowDay; this.msg.CStartDate = nowDay;
this.msg.CEndDate = nowDay; this.msg.CEndDate = nowDay;
} }
if(userInfo.EmployeeId==5||userInfo.EmployeeId==1){ if (userInfo.EmployeeId == 5 || userInfo.EmployeeId == 1) {
this.msg.OutBranchId = -1; this.msg.OutBranchId = -1;
}else{ } else {
this.msg.OutBranchId = this.getLocalStorage().RB_Branch_id; this.msg.OutBranchId = this.getLocalStorage().RB_Branch_id;
} }
this.getList(); this.getList();
} }
}; };
</script> </script>
<style> <style>
...@@ -726,7 +652,7 @@ export default { ...@@ -726,7 +652,7 @@ export default {
padding-left: 15px; padding-left: 15px;
} }
.personNolayer p > span { .personNolayer p>span {
font-size: 12px; font-size: 12px;
color: #333; color: #333;
margin-right: 25px; margin-right: 25px;
...@@ -761,62 +687,63 @@ export default { ...@@ -761,62 +687,63 @@ export default {
.personNolayer table tr._color_666 th { .personNolayer table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.enrollTotalSearch {
.enrollTotalSearch {
width: 100%; width: 100%;
min-height: auto; min-height: auto;
padding: 0 0 20px 0; padding: 0 0 20px 0;
} }
.enrollTotalSearch::after { .enrollTotalSearch::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
visibility: hidden; visibility: hidden;
height: 0; height: 0;
} }
.enrollTotalSearch li { .enrollTotalSearch li {
float: left; float: left;
font-size: 12px; font-size: 12px;
height: 40px; height: 40px;
color: #666; color: #666;
margin: 20px 10px 10px 0; margin: 20px 10px 10px 0;
} }
.enrollTotalSearch li > span { .enrollTotalSearch li>span {
display: inline-block; display: inline-block;
} }
.enrollTotalSearch li span > em { .enrollTotalSearch li span>em {
display: inline-block; display: inline-block;
min-width: 60px; min-width: 60px;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
margin: 0 12px 0 0; margin: 0 12px 0 0;
} }
.enrollTotalSearch li:last-child { .enrollTotalSearch li:last-child {
float: right; float: right;
position: fixed; position: fixed;
top: 36px; top: 36px;
right: 20px; right: 20px;
text-align: right; text-align: right;
z-index: 50; z-index: 50;
} }
.enrollTotalSearchTable { .enrollTotalSearchTable {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc; border-right: 1px solid #cccccc;
} }
.enrollTotalSearchTable tr { .enrollTotalSearchTable tr {
/* border-bottom: 2px solid #333; */ /* border-bottom: 2px solid #333; */
} }
.enrollTotalSearchTable tr th { .enrollTotalSearchTable tr th {
background: #bdbdbd; background: #bdbdbd;
height: 30px; height: 30px;
font-size: 12px; font-size: 12px;
...@@ -824,98 +751,98 @@ export default { ...@@ -824,98 +751,98 @@ export default {
text-indent: 15px; text-indent: 15px;
border-top: 1px solid #cccccc; border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc; border-left: 1px solid #cccccc;
} }
.enrollTotalSearchTable tr { .enrollTotalSearchTable tr {
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.enrollTotalSearchTable tr td { .enrollTotalSearchTable tr td {
height: 50px; height: 50px;
padding: 10px; padding: 10px;
border-top: 1px solid #cccccc; border-top: 1px solid #cccccc;
border-left: 1px solid #cccccc; border-left: 1px solid #cccccc;
} }
.enrollTotalSearchTable tr td > img { .enrollTotalSearchTable tr td>img {
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 16px; border-radius: 16px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
.enrollTotalSearchTable tr td p { .enrollTotalSearchTable tr td p {
line-height: 20px; line-height: 20px;
} }
.groupTourOrder_count_green { .groupTourOrder_count_green {
color: #1bc594; color: #1bc594;
} }
.groupTourOrder_count_blue { .groupTourOrder_count_blue {
color: #4d7afd; color: #4d7afd;
} }
.groupTourOrder_count_yellow { .groupTourOrder_count_yellow {
color: #ff9c00; color: #ff9c00;
} }
.groupTourOrder_count_gray { .groupTourOrder_count_gray {
color: #999999; color: #999999;
} }
.groupTourOrder_count { .groupTourOrder_count {
margin: 0 0 20px 0; margin: 0 0 20px 0;
width: 100%; width: 100%;
height: auto; height: auto;
} }
.groupTourOrder_count_col { .groupTourOrder_count_col {
height: 80px; height: 110px;
} }
.groupTourOrder_count_item { .groupTourOrder_count_item {
font-weight: 400; font-weight: 400;
padding: 10px; padding: 10px;
height: 100%; height: 100%;
border: 1px solid #e6e6e6; border: 1px solid #e6e6e6;
background-color: #ffffff; background-color: #ffffff;
color: #333333; color: #333333;
} }
.groupTourOrder_count_item > div > i { .groupTourOrder_count_item>div>i {
font-size: 12px; font-size: 12px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > div > span:nth-child(2) { .groupTourOrder_count_item>div>span:nth-child(2) {
font-size: 14px; font-size: 14px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > div > span:nth-child(3) { .groupTourOrder_count_item>div>span:nth-child(3) {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 16px;
vertical-align: bottom; vertical-align: bottom;
} }
.groupTourOrder_count_item > p { .groupTourOrder_count_item>p {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.groupTourOrder_count_item > p > span { .groupTourOrder_count_item>p>span {
margin: 0 5px 0 0; margin: 0 5px 0 0;
white-space: nowrap; white-space: nowrap;
} }
.groupTourOrder_more { .groupTourOrder_more {
margin: 0 -12px; margin: 0 -12px;
} }
.groupTourOrder_more > div { .groupTourOrder_more>div {
width: 100%; width: 100%;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
...@@ -924,97 +851,96 @@ export default { ...@@ -924,97 +851,96 @@ export default {
color: #333333; color: #333333;
background-color: #ffffff; background-color: #ffffff;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_more > div:hover { .groupTourOrder_more>div:hover {
color: #297bef; color: #297bef;
background-color: #dcebff; background-color: #dcebff;
} }
.groupTourOrder_remarks { .groupTourOrder_remarks {
font-size: 0px; font-size: 0px;
} }
.groupTourOrder_remarks > div { .groupTourOrder_remarks>div {}
}
.groupTourOrder_remarks > div > div:nth-child(1) { .groupTourOrder_remarks>div>div:nth-child(1) {
float: left; float: left;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.groupTourOrder_remarks > div > div:nth-child(1) > span { .groupTourOrder_remarks>div>div:nth-child(1)>span {
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
white-space: nowrap; white-space: nowrap;
} }
.groupTourOrder_remarks > div > div:nth-child(1) > p { .groupTourOrder_remarks>div>div:nth-child(1)>p {
line-height: 20px; line-height: 20px;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
} }
.groupTourOrder_remarks > div > div:nth-child(2) { .groupTourOrder_remarks>div>div:nth-child(2) {
float: right; float: right;
text-align: right; text-align: right;
font-size: 12px; font-size: 12px;
color: #e95252; color: #e95252;
} }
.groupTourOrder_remarks > div > div:nth-child(2) > i { .groupTourOrder_remarks>div>div:nth-child(2)>i {
font-size: 10px; font-size: 10px;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_remarks > div::after { .groupTourOrder_remarks>div::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
visibility: hidden; visibility: hidden;
height: 0; height: 0;
} }
.groupTourOrder_remarks_btn { .groupTourOrder_remarks_btn {
padding: 0px; padding: 0px;
width: 12px; width: 12px;
height: 12px; height: 12px;
border: none; border: none;
background-color: transparent; background-color: transparent;
} }
.groupTourOrder_remarks_btn > i { .groupTourOrder_remarks_btn>i {
color: #e95252; color: #e95252;
font-size: 12px; font-size: 12px;
} }
.groupTourOrder_remarks_popover > div { .groupTourOrder_remarks_popover>div {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > div::before { .groupTourOrder_remarks_popover>div::before {
content: ""; content: "";
display: inline-block; display: inline-block;
margin: 0 5px 0 0; margin: 0 5px 0 0;
width: 2px; width: 2px;
height: 12px; height: 12px;
background-color: #e95252; background-color: #e95252;
} }
.groupTourOrder_remarks_popover > span { .groupTourOrder_remarks_popover>span {
display: block; display: block;
margin: 0 0 0 0; margin: 0 0 0 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > p { .groupTourOrder_remarks_popover>p {
margin: 5px 0 0 0; margin: 5px 0 0 0;
padding: 3px; padding: 3px;
width: 100%; width: 100%;
...@@ -1022,72 +948,76 @@ export default { ...@@ -1022,72 +948,76 @@ export default {
overflow-y: auto; overflow-y: auto;
font-size: 12px; font-size: 12px;
color: #000000; color: #000000;
} }
.groupTourOrder_remarks_popover > p:nth-child(even) { .groupTourOrder_remarks_popover>p:nth-child(even) {
background-color: #e6e6e6; background-color: #e6e6e6;
} }
.groupTourOrder_remarks_popover > p > span:nth-child(1) { .groupTourOrder_remarks_popover>p>span:nth-child(1) {
float: left; float: left;
} }
.groupTourOrder_remarks_popover > p > span:nth-child(2) { .groupTourOrder_remarks_popover>p>span:nth-child(2) {
margin: 0 10px 0 0; margin: 0 10px 0 0;
float: right; float: right;
} }
.groupTourOrder_remarks_popover > p::after { .groupTourOrder_remarks_popover>p::after {
display: block; display: block;
clear: both; clear: both;
content: ""; content: "";
visibility: hidden; visibility: hidden;
height: 0; height: 0;
} }
.groupTourOrder_tickets > div > span { .groupTourOrder_tickets>div>span {
margin: 0 5px 0 0; margin: 0 5px 0 0;
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_tickets_red { .groupTourOrder_tickets_red {
color: #ff0000; color: #ff0000;
cursor: pointer; cursor: pointer;
/* text-decoration: underline; */ /* text-decoration: underline; */
} }
.groupTourOrder_tickets_blue { .groupTourOrder_tickets_blue {
color: #0000ff; color: #0000ff;
/* text-decoration: underline; */ /* text-decoration: underline; */
cursor: pointer; cursor: pointer;
} }
.groupTourOrder_tickets_green { .groupTourOrder_tickets_green {
color: #008000; color: #008000;
cursor: pointer; cursor: pointer;
/* text-decoration: underline; */ /* text-decoration: underline; */
} }
.groupTourOrder_tickets_black {
.groupTourOrder_tickets_black {
color: #000000; color: #000000;
text-decoration: underline; text-decoration: underline;
} }
.groupTourOrderByTuan_ico {
.groupTourOrderByTuan_ico {
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
.groupTourOrderByTuan_ico > i { .groupTourOrderByTuan_ico>i {
display: inline-block; display: inline-block;
margin: 0 2px 0 0; margin: 0 2px 0 0;
width: 8px; width: 8px;
height: 8px; height: 8px;
border-radius: 2px; border-radius: 2px;
vertical-align: middle; vertical-align: middle;
} }
.groupTourOrderByTuan_ico > span { .groupTourOrderByTuan_ico>span {
vertical-align: middle; vertical-align: middle;
} }
.color_red_order{
.color_red_order {
color: #e95252 !important; color: #e95252 !important;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment