Commit db28dcd8 authored by 黄奎's avatar 黄奎

页面修改

parent abc34936
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
</span> </span>
</li> </li>
<li><span><em>公司</em> <li><span><em>公司</em>
<el-select class='w200' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change='linkageDepartment()'> <el-select class='w200' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"
@change='linkageDepartment()'>
<el-option label="不限" value='-1'></el-option> <el-option label="不限" value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
...@@ -50,15 +51,19 @@ ...@@ -50,15 +51,19 @@
</el-select> </el-select>
</li> </li>
<li><span><em>发团日期</em> <li><span><em>发团日期</em>
<el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.QStartDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</span> </span>
</li> </li>
<li><span><em>报名日期</em> <li><span><em>报名日期</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.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> </span>
</li> </li>
<li> <li>
...@@ -86,25 +91,30 @@ ...@@ -86,25 +91,30 @@
<th width="80">平台在途</th> <th width="80">平台在途</th>
<th width="80">待收金额</th> <th width="80">待收金额</th>
<th width="60">状态</th> <th width="60">状态</th>
<th v-if="userId==1" width="140">操作</th> <th v-if="EditBtn" width="140">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td> <td v-show="list.length==0" :colspan="EditBtn?17:16" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
<td rowspan="2"> <td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red"></p> <p v-if="item.isChargeLossOrders==1" style="color:red"></p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p> <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p> <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p> :title="item.alName" @click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</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>
<p>发团:{{item.startDate}}</p> <p>发团:{{item.startDate}}</p>
<p v-if='item.commissionMoney' style="color:red">提成:{{item.commissionMoney}}</p> <p v-if='item.commissionMoney' style="color:red">提成:{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成:{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成:{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额:<span style="color:#e95252">{{item.extraRewardMoney}}</span></div> <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额:<span
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额:<span style="color:#e95252">{{item.extraDeductMoney}}</span></div> style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额:<span
style="color:#e95252">{{item.extraDeductMoney}}</span></div>
</td> </td>
<td> <td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p> <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
...@@ -127,8 +137,6 @@ ...@@ -127,8 +137,6 @@
<td> <td>
<p style="color:#FF9C00">{{item.preferPrice}}</p> <p style="color:#FF9C00">{{item.preferPrice}}</p>
</td> </td>
<td> <td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span> <span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span> <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
...@@ -176,15 +184,17 @@ ...@@ -176,15 +184,17 @@
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</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 v-if="userId==1"> <td v-if="EditBtn">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button> <button class="normalBtn" style="margin-left:0;width:95px;padding:0"
@click="getSalerInfo(item)">修改业务员</button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注:</span> <div><span>备注:</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>
...@@ -197,8 +207,9 @@ ...@@ -197,8 +207,9 @@
</p> </p>
<span v-if="item.remarksList.length === 0">暂无数据</span> <span v-if="item.remarksList.length === 0">暂无数据</span>
</div> </div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" <el-button slot="reference" icon="iconfont icon-gengduo"
class="groupTourOrder_remarks_btn"></el-button> style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn">
</el-button>
</el-popover> </el-popover>
</div> </div>
</div> </div>
...@@ -211,7 +222,8 @@ ...@@ -211,7 +222,8 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <td :colspan="EditBtn?9:8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>
<div>收款单据:</div> <div>收款单据:</div>
<div> <div>
...@@ -240,10 +252,14 @@ ...@@ -240,10 +252,14 @@
<div>发票单据:</div> <div>发票单据:</div>
<div> <div>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2"> <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue"
<span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green"
<span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span>
</span> </span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
...@@ -252,14 +268,13 @@ ...@@ -252,14 +268,13 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
:page-size=msg.pageSize :total=total></el-pagination> 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>
</div> </div>
</div> </div>
</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";
...@@ -281,6 +296,7 @@ ...@@ -281,6 +296,7 @@
} }
return obj; return obj;
}, },
EditBtn:false,//修改业务员权限
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -300,8 +316,8 @@ ...@@ -300,8 +316,8 @@
SellFormEmp: 0, SellFormEmp: 0,
GroupType: '-1', GroupType: '-1',
TCNUM: '', TCNUM: '',
BranchId:'-1', BranchId: '-1',
IsUnionOrder:'1' IsUnionOrder: '1'
}, },
employeeMsg: { employeeMsg: {
RB_Group_id: "0", RB_Group_id: "0",
...@@ -351,13 +367,12 @@ ...@@ -351,13 +367,12 @@
B2BNum: 0 B2BNum: 0
}, },
ctlxList: [], ctlxList: [],
showChangeSales:false, showChangeSales: false,
//订单编号及业务员信息 //订单编号及业务员信息
subInfo:{ subInfo: {
CreateBy:'', CreateBy: '',
OrderId:0 OrderId: 0
}, },
userId:0,
}; };
}, },
methods: { methods: {
...@@ -374,7 +389,11 @@ ...@@ -374,7 +389,11 @@
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)
}
}); });
}, },
// 结束日期不能大于开始日期 // 结束日期不能大于开始日期
...@@ -459,7 +478,7 @@ ...@@ -459,7 +478,7 @@
}, },
linkageDepartment() { //联动部门 linkageDepartment() { //联动部门
this.msg.RB_Department_Id = null; this.msg.RB_Department_Id = null;
if(this.msg.BranchId!=0){ if (this.msg.BranchId != 0) {
this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId; this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId;
} }
this.getDepartment(); this.getDepartment();
...@@ -478,7 +497,6 @@ ...@@ -478,7 +497,6 @@
err => {} err => {}
); );
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -514,29 +532,42 @@ ...@@ -514,29 +532,42 @@
}, err => {}) }, err => {})
}, },
//点击修改业务员 //点击修改业务员
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;
}, },
goIisDetail: function (id) { // 跳转发票详情页面 goIisDetail: function (id) { // 跳转发票详情页面
this.$router.push({ this.$router.push({
name: 'invoicesManagerDetail', name: 'invoicesManagerDetail',
query: { id: id,noDetail: 1,blank: "y",} query: {
id: id,
noDetail: 1,
blank: "y",
}
}); });
}, },
//修改业务员权限
GetAuth() {
var actionCode = this.$AuthCode.EditOrderCreateBy;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.EditBtn = true;
console.log("this.EditBtn",this.EditBtn)
}
});
},
}, },
mounted() { mounted() {
this.GetAuth();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团 this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getCompany(); this.getCompany();
this.getCtlxList() this.getCtlxList()
this.getEmployee(); this.getEmployee();
this.getLineList(); this.getLineList();
...@@ -569,9 +600,10 @@ ...@@ -569,9 +600,10 @@
</script> </script>
<style> <style>
.color_red_order{ .color_red_order {
color: #e95252 !important; color: #e95252 !important;
} }
.enrollTotalSearch { .enrollTotalSearch {
width: 100%; width: 100%;
min-height: auto; min-height: auto;
...@@ -642,12 +674,15 @@ ...@@ -642,12 +674,15 @@
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.enrollTotalSearchTable tbody tr:last-child {
.enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr:first-child td:first-child {
.enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr td { .enrollTotalSearchTable tr td {
height: 80px; height: 80px;
padding: 10px; padding: 10px;
......
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