Commit 5038e0d3 authored by youjie's avatar youjie

no message

parent 93471306
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
机票未绑团查看 机票未绑团查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true"> <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价查看 订单改价查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
...@@ -1247,6 +1247,7 @@ ...@@ -1247,6 +1247,7 @@
}, },
data() { data() {
return { return {
ChangeThePriceList: [],
ChangeThePriceData:[], ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒 ChangeThePriceVisible: false,//改价提醒
UnboundDate: {}, UnboundDate: {},
...@@ -1873,24 +1874,33 @@ ...@@ -1873,24 +1874,33 @@
} }
// 获取改价提醒 // 获取改价提醒 每月1到10号提示
if(!localStorage.getItem("ChangeThePriceDataTime")|| let DateTime = new Date();
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){ let Year = DateTime.getFullYear()
this.GetChangeThePrice() let Month = DateTime.getMonth()+1
}else{ let Months = Month>9?Month:'0'+Month
// if(localStorage.getItem("ChangeThePriceData")){ let StartDate = Year+'-'+Months+'-01'
// this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData")) let DateList = []
// } for(let i=0;i<10;i++){
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
} }
// 两小时请求一次改价提醒 this.ChangeThePriceList = DateList.filter(x=>{
setInterval(()=>{ return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
if(!this.ChangeThePriceVisible){ })
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
this.GetChangeThePrice() this.GetChangeThePrice()
}else{
clearInterval()
} }
},7200000) // 两小时请求一次改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
}else{
clearInterval()
}
},7200000)
}
}, },
created() { created() {
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) { if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
......
...@@ -35,6 +35,20 @@ ...@@ -35,6 +35,20 @@
<span>{{ scope.row.OrderId }}</span> <span>{{ scope.row.OrderId }}</span>
</p> </p>
<p>{{ scope.row.CreateTimeStr }}</p> <p>{{ scope.row.CreateTimeStr }}</p>
<p v-if="scope.row.PlatformMoney">
<span>在途金额:</span>
<span style="color: red;">
{{ scope.row.PlatformMoney }}
</span>
</p>
<p style="font-size: 13px;" v-if="scope.row.SaleRemarks">
<span>销售备注:</span>
<span style="color: red;">{{ scope.row.SaleRemarks? scope.row.SaleRemarks:'无' }}</span>
</p>
<p style="font-size: 13px;" v-if="scope.row.OP_Remarks">
<span>OP备注:</span>
<span style="color: red;">{{ scope.row.OP_Remarks? scope.row.OP_Remarks:'无' }}</span>
</p>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -240,13 +254,16 @@ ...@@ -240,13 +254,16 @@
type="primary" @click="setChangePrice">保存</button> --> type="primary" @click="setChangePrice">保存</button> -->
</div> </div>
<el-form label-width="100px"> <el-form label-width="120px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="申请总金额"> <el-form-item label="订单应收总金额">
<span rows="6">{{ changePriceMsg.PreferPrice }}</span> <span rows="6">
{{changePriceMsg.Money2}}
</span>
</el-form-item></el-col </el-form-item></el-col
> >
<el-col :span="8"> <el-col :span="8">
<el-form-item label="申请理由"> <el-form-item label="申请理由">
<span rows="6">{{ changePriceMsg.ApplyForReason }} </span> <span rows="6">{{ changePriceMsg.ApplyForReason }} </span>
...@@ -254,6 +271,11 @@ ...@@ -254,6 +271,11 @@
> >
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4">
<el-form-item label="申请总金额">
<span rows="6">{{ changePriceMsg.PreferPrice }}</span>
</el-form-item></el-col
>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总金额" prop="Money"> <el-form-item label="应收总金额" prop="Money">
<el-input <el-input
...@@ -405,9 +427,11 @@ export default { ...@@ -405,9 +427,11 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.changePriceMsg.Money2 = data.Money;
this.changePriceMsg.Money = data.Money; this.changePriceMsg.Money = data.Money;
this.changePriceMsg.ApplyForState = data.ApplyForState; this.changePriceMsg.ApplyForState = data.ApplyForState;
this.changePriceMsg.ApplyForReason = data.ApplyForReason; this.changePriceMsg.ApplyForReason = data.ApplyForReason;
this.changePriceMsg.PreferPrice = item.ApplyForMoney;
if (type == 0) { if (type == 0) {
this.changePriceMsg.PreferPrice = item.ApplyForMoney; this.changePriceMsg.PreferPrice = item.ApplyForMoney;
} else { } else {
......
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