Skip to content

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

页面修改

parent 6367aa83
Show whitespace changes
Inline Side-by-side
Showing with 236 additions and 185 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ d8a34a3a
......@@ -180,7 +180,6 @@
.productQuerybottomLayer {
overflow: auto;
position: fixed;
/* max-height: 300px; */
z-index: 50;
bottom: 0;
left: 0;
......@@ -1309,29 +1308,7 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height: 150px; min-height: 150px">
<p>
{{ $t("salesModule.UpRemarks") }}
<span class="fr" v-if="remarksMsg.isOrder == '1'">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color: red">
{{ $t("salesModule.OPjinzhi") }}
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="$t('pub.pubRemark')" prop="Remarks">
<el-input v-model="remarksMsg.Remarks" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
style="height: 150px; min-height: 200px">
......@@ -2406,6 +2383,12 @@
</div>
</div>
</div>
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<div class="combottomDiv" v-if="showChangeSales" style="height: 200px">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
......@@ -2445,7 +2428,7 @@
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2762,7 +2745,8 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commissionDialog
commissionDialog,
orderRemark: orderRemark,
},
filters: {
priceFormat(value) {
......@@ -2784,6 +2768,15 @@
},
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.F_InvoiceManagement;
var actionCodeNew = this.$AuthCode.F_Finance_Create;
......@@ -3465,20 +3458,13 @@
})
.then(() => {
return;
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder;
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
......@@ -3486,6 +3472,7 @@
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder;
this.isShowLayerRemarks = true;
}
},
getDetail(obj) {
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ d8a34a3a
......@@ -1103,8 +1103,7 @@
</el-form>
</div>
<!-- 其他类型的修改信息2 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer"
:style="{ height: ScreenHeight }">
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer" :style="{ height: ScreenHeight }">
<p>
修改
<span class="fr">
......@@ -1126,8 +1125,7 @@
<el-select v-model="addMsg.GroupType" filterable :placeholder="$t('pub.pleaseSel')"
@change="gettypechange(addMsg.GroupType)">
<!-- v-if="item.Id != 5" -->
<el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id"
>
<el-option v-for="item in ctlxList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</el-form-item>
......@@ -1694,29 +1692,8 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height: 150px; min-height: 150px">
<p>
修改备注
<span class="fr" v-if="remarksMsg.isOrder == 1" style="margin-right: 0px">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color: red">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="Remarks">
<el-input v-model="remarksMsg.Remarks" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div style="
float: left;
border-radius: 4px;
......@@ -1808,8 +1785,9 @@
<tbody v-for="(item, index) in op.list" :key="index">
<tr>
<td rowspan="3" style="position: relative">
<span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px" v-if="item.standardCurrencyName"
:class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
<span class="TC_neibu"
style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px"
v-if="item.standardCurrencyName" :class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
'TCb2c':item.standardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
'otherPlat':item.standardCurrencyName=='',}">{{item.standardCurrencyName}}结算</span>
<p v-if="item.isUnionOrder == 1" class="GO_union">联</p>
......@@ -2149,13 +2127,7 @@
style="background-color: #a55eea !important; border-color: #a55eea" icon="iconfont icon-beizhu"
@click="getRemarks(item)"></el-button>
</el-tooltip>
<!-- <el-tooltip v-if="S_UpdateOrderMoney" class="item" effect="dark" content="编辑小费" placement="top-start" style="float: left">
<el-button @click="
clickEditTip(item)
" type="primary" style="background-color: #00c6ff !important; border-color: #00c6ff !important"
icon="iconfont icon-bianji-smal">
</el-button>
</el-tooltip> -->
<el-tooltip effect="dark" content="日志" placement="top-start" style="float: left">
<el-popover width="230" trigger="click">
<div class="priceContentDiv">
......@@ -3181,11 +3153,16 @@
</button>
</div>
</el-dialog>
<el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip"
center :before-close="closeChangeMachie">
<el-dialog width="350px" title="编辑小费" :visible.sync="isShowTip" center :before-close="closeChangeMachie">
<EditTip :TipObj="TipObj" @close="isShowTip=false" @success="isShowTip=false,getList()"></EditTip>
</el-dialog>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
</div>
</template>
<script>
......@@ -3195,6 +3172,7 @@
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import EditTip from "./Common/EditTip.vue";
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -3582,6 +3560,7 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
orderRemark: orderRemark,
},
watch: {
fullHeight(val) {
......@@ -3618,7 +3597,16 @@
},
},
methods: {
clickEditTip(item){
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
clickEditTip(item) {
this.isShowTip = true
this.TipObj = JSON.parse(JSON.stringify(item))
this.TipObj.guestNum = item.guestNum
......@@ -4612,6 +4600,7 @@
(err) => {}
);
},
//显示备注弹窗
getRemarks(obj) {
// 华国豪5-5新增
if (moment().format("YYYY-MM-DD") >= obj.startDate) {
......@@ -4622,36 +4611,15 @@
})
.then(() => {
return;
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.isShowLayer2 = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
}
//HK 新加
if (this.IsSupperOrderEdit || IsLookOrder) {
//todo
} else {
this.remarksMsg.isOrder = obj.isOrder;
this.isShowLayerRemarks = true;
}
},
getTypePrice() {
......@@ -5048,33 +5016,7 @@
}
});
},
submitFormRematks(RemarksMsg) {
//提交创建、修改表单
this.$refs[RemarksMsg].validate((valid) => {
if (valid) {
this.apipost(
"sellorder_post_SetOrderRemarks",
this.remarksMsg,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.remarksMsg.Remarks = "";
this.remarksMsg.OrderId = "0";
this.remarksMsg.isOrder = 1;
this.getList();
this.isShowLayerRemarks = false;
} else {
this.isShowLayerRemarks = false;
this.$message.error(res.data.message);
}
},
(err) => {}
);
} else {
return false;
}
});
},
cancelSubmit() {
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
......@@ -5947,7 +5889,7 @@
this.userId = this.getLocalStorage().EmployeeId;
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('S_UpdateOrderMoney') != -1 ){
if (ActionMenuCode.indexOf('S_UpdateOrderMoney') != -1) {
this.S_UpdateOrderMoney = true
}
this.getEmployee();
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ d8a34a3a
......@@ -1461,29 +1461,7 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayerRemarks"
style="height: 150px;min-height:150px;">
<p>修改备注
<span class="fr" v-if="remarksMsg.isOrder==1" style="margin-right:0px;">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color:red;">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="Remarks">
<el-input v-model='remarksMsg.Remarks' type='textarea' maxlength='500'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--<span>{{tuanInfo}}</span>-->
<div
style="float:left; border-radius: 4px; margin: 20px 20px 20px 0; padding: 0 10px; height: 34px; line-height: 34px; background: #D2D2D2; font-size: 14px; color: #333; font-weight: bold;">
{{tuanInfo.config&&tuanInfo.config.LtName}}&nbsp;&nbsp;{{tuanInfo.config&&tuanInfo.config.TCNUM}}&nbsp;&nbsp;<span
......@@ -2307,6 +2285,14 @@
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
......@@ -2317,6 +2303,7 @@
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2783,7 +2770,8 @@
payurlItem: payURL,
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan
updateSalesMan: updateSalesMan,
orderRemark: orderRemark,
},
watch: {
fullHeight(val) {
......@@ -2817,6 +2805,15 @@
}
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
getCountry() {
//获取国家
let msg = {};
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ d8a34a3a
......@@ -1173,27 +1173,11 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height: 150px;min-height:150px;">
<p>{{$t('salesModule.UpRemarks')}}
<span class="fr" v-if="remarksMsg.isOrder=='1'">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color:red;">
{{$t('salesModule.OPjinzhi')}}。
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="$t('pub.pubRemark')" prop="Remarks">
<el-input v-model='remarksMsg.Remarks' type='textarea' maxlength='500'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
......@@ -1860,7 +1844,7 @@
import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
import updateSalesMan from '../commonPage/updateSalesMan.vue'
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2238,7 +2222,8 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commissionDialog
commissionDialog,
orderRemark: orderRemark,
},
watch: {
fullHeight(val) {
......@@ -2272,6 +2257,15 @@
}
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
//跳转至领取合同
goContract(item, sItem) {
let routeData = this.$router.resolve({
......
src/components/orderCommon/order-remark.vue 0 → 100644
View file @ d8a34a3a
<style scoped>
.commonOrderRemarkForm {
position: fixed;
left: 0;
right: 0;
bottom: 0;
z-index: 2;
overflow: auto;
/* max-height: 300px; */
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;
padding: 20px 20px 10px 80px;
}
.commonOrderRemarkForm .title {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
font-family: "PingFangSc-Fine";
font-size: 16px;
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
</style>
<!--订单备注-->
<template>
<div class="commonOrderRemarkForm" style="height:150px;">
<p class="title">
修改备注
<span class="fr" v-if="postMsg.isOrder == 1" style="margin-right: 0px">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('orderRemarkMsg')" />
</span>
<span class="fr" v-else style="color: red">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</p>
<el-form :model="postMsg" ref="orderRemarkMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="Remarks">
<el-input v-model="postMsg.Remarks" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
export default {
props: ["remarksMsg"],
data() {
return {
fullHeight: document.documentElement.clientHeight,
ScreenHeight: 0,
RemarksRules: {
Remarks: [{
required: true,
message: "请输入备注信息",
trigger: "blur",
}],
},
postMsg: {
OrderId: "0",
OldRemarks: "",
Remarks: "",
isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】
},
};
},
methods: {
//取消备注
cancelSubmitRemarks() {
this.postMsg.Remarks = "";
this.postMsg.OrderId = "0";
this.postMsg.isOrder = 1;
//关闭弹窗 调用父页面方法
this.$emit("close");
},
//提交备注信息
submitFormRematks(orderRemarkMsg) {
//提交创建、修改表单
this.$refs[orderRemarkMsg].validate((valid) => {
if (valid) {
this.apipost(
"sellorder_post_SetOrderRemarks",
this.postMsg,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.postMsg.Remarks = "";
this.postMsg.OrderId = "0";
this.postMsg.isOrder = 1;
//调用父页面刷新方法
this.$emit("success");
} else {
this.$message.error(res.data.message);
}
},
(err) => {}
);
} else {
return false;
}
});
},
},
mounted() {
},
watch: {
//监听备注信息编号
remarksMsg: {
immediate: true,
handler(newVal) {
console.log("old", newVal);
this.postMsg.OrderId = this.remarksMsg.OrderId;
this.postMsg.OldRemarks = this.remarksMsg.OldRemarks;
this.postMsg.Remarks = this.remarksMsg.Remarks;
this.postMsg.isOrder = this.remarksMsg.isOrder;
},
deep: true
},
}
};
</script>
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