Skip to content

S
SuperMan
Commit 989807ed authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

'改了好多东西@@@@@'

parent 75ba4d98
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 13 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 989807ed
...@@ -781,9 +781,6 @@ export default { ...@@ -781,9 +781,6 @@ export default {
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
formatter(rowData, rowIndex, pagingIndex, field) {
return 0
}
}, },
{ {
field: "DaiShou", field: "DaiShou",
...@@ -1478,6 +1475,8 @@ export default { ...@@ -1478,6 +1475,8 @@ export default {
if (field === "PingTaiShuiJin") if (field === "PingTaiShuiJin")
return this.priceFormat(rowData.PingTaiShuiJin); return this.priceFormat(rowData.PingTaiShuiJin);
if (field === "DaiShou") return this.priceFormat(rowData.DaiShou); if (field === "DaiShou") return this.priceFormat(rowData.DaiShou);
if (field === "ZaiTu") return this.priceFormat(rowData.ZaiTu);
if (field === "RealIncome") return this.priceFormat(rowData.RealIncome);
if (field === "YiShou") return this.priceFormat(rowData.YiShou); if (field === "YiShou") return this.priceFormat(rowData.YiShou);
if (field === "YaoQingHan") return this.priceFormat(rowData.YaoQingHan); if (field === "YaoQingHan") return this.priceFormat(rowData.YaoQingHan);
if (field === "CheZi") return this.priceFormat(rowData.CheZi); if (field === "CheZi") return this.priceFormat(rowData.CheZi);
......
src/components/SalesModule/enrollTotal.vue
View file @ 989807ed
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6" 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>
...@@ -232,6 +232,14 @@ ...@@ -232,6 +232,14 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 989807ed
...@@ -1369,7 +1369,7 @@ ...@@ -1369,7 +1369,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
...@@ -1388,6 +1388,14 @@ ...@@ -1388,6 +1388,14 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 989807ed
...@@ -1515,7 +1515,7 @@ ...@@ -1515,7 +1515,7 @@
<td class="groupTourOrderIcon"> <td class="groupTourOrderIcon">
<el-button-group v-if='item.isOwn==1 || userId==1||userId==5'> <el-button-group v-if='item.isOwn==1 || userId==1||userId==5'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button v-if="(userId==1||userId==5) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')" type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button> <el-button v-if="(userId==1 || userId==5 || item.isUpdateOrder) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')" type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" @click='getRemarks(item)'></el-button> <el-button v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" @click='getRemarks(item)'></el-button>
...@@ -1558,7 +1558,7 @@ ...@@ -1558,7 +1558,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
...@@ -1577,6 +1577,14 @@ ...@@ -1577,6 +1577,14 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 989807ed
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
} }
.RegisTrationTable span.personNo:hover { .RegisTrationTable span.personNo:hover {
font-weight: bold;
color: #e95252; color: #e95252;
} }
...@@ -1466,6 +1466,7 @@ ...@@ -1466,6 +1466,7 @@
<div class="groupTourOrder_more"> <div class="groupTourOrder_more">
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
<div @click='deleteItem(item)'>删除</div> <div @click='deleteItem(item)'>删除</div>
</div> </div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
...@@ -1487,12 +1488,18 @@ ...@@ -1487,12 +1488,18 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">{{item.Remarks}}</span> <span class="RL-redType RL-remarkCon">{{item.Remarks}}</span>
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
</div>
</td>
<td colspan="3" style="height: 40px;"> <td colspan="3" style="height: 40px;">
<div> <div>
<span>财务单据：</span> <span>财务单据：</span>
...@@ -1637,6 +1644,7 @@ ...@@ -1637,6 +1644,7 @@
<div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
<div @click="transfer(childItem)">订单转团</div> <div @click="transfer(childItem)">订单转团</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'" <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'> @click='deleteItem(childItem)'>
删除 删除
...@@ -1661,7 +1669,7 @@ ...@@ -1661,7 +1669,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
...@@ -1669,9 +1677,14 @@ ...@@ -1669,9 +1677,14 @@
{{childItem.PlatformOrder}};</span> {{childItem.PlatformOrder}};</span>
{{childItem.Remarks}} {{childItem.Remarks}}
</span> </span>
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div>
</td>
<td colspan="3" style="height: 40px;"> <td colspan="3" style="height: 40px;">
<div> <div>
<span>财务单据：</span> <span>财务单据：</span>
...@@ -1847,6 +1860,7 @@ ...@@ -1847,6 +1860,7 @@
<div class="groupTourOrder_more"> <div class="groupTourOrder_more">
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
<div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div> <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
</div> </div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
...@@ -1868,7 +1882,7 @@ ...@@ -1868,7 +1882,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
...@@ -1877,6 +1891,12 @@ ...@@ -1877,6 +1891,12 @@
</span> </span>
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">OP备注:</span>
<span class="RL-redType RL-remarkCon">{{item.OP_Remarks ? item.OP_Remarks : '无'}}</span>
</div>
</td>
<td colspan="3" style="height: 40px;"> <td colspan="3" style="height: 40px;">
<div> <div>
<span>财务单据：</span> <span>财务单据：</span>
...@@ -2032,7 +2052,18 @@ ...@@ -2032,7 +2052,18 @@
<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>
<el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="OP备注：" class="w280">
<el-input type="textarea" :rows="2" v-model="OPRemarkMsg.OP_Remarks"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="TransferDocuments">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="initOPRemarkMsg">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center> <el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2"></tripDownLoadCommon> <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2"></tripDownLoadCommon>
</el-dialog> </el-dialog>
...@@ -2057,6 +2088,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2057,6 +2088,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
return time.getTime() < endTime.getTime() - 5.64e7; return time.getTime() < endTime.getTime() - 5.64e7;
} }
}, },
OPRemarkMsg: {
OrderId: '',
OP_Remarks: '',
},
zhuanLoading: false,
notUpdate: true, notUpdate: true,
//是否显示操作按钮 //是否显示操作按钮
isShow: true, isShow: true,
...@@ -2387,6 +2423,24 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2387,6 +2423,24 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan updateSalesMan:updateSalesMan
}, },
methods: { methods: {
initOPRemarkMsg(){
this.OPRemarkMsg = {
OP_Remarks: '',
OrderId: '',
}
this.zhuanLoading = false
},
TransferDocuments: function () {
this.apipost('sellorder_get_SetOrderOPRemarks', this.OPRemarkMsg, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.zhuanLoading = false
} else {
this.$message.error(res.data.message);
}
}, null)
},
downLoadFile(obj) { downLoadFile(obj) {
let reg = /^http(s)?:\/\/(.*?)\// let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(obj[0].FullUrl.replace(reg, ''), obj[0].Name); this.downloadFileRename(obj[0].FullUrl.replace(reg, ''), obj[0].Name);
......
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