Skip to content

S
SuperMan
Commit 6c2ab960 authored by 吴春's avatar 吴春
Browse files
Options

1

parent 791581d6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 22 deletions
src/components/administrative/model/ChangeThePriceMessage.vue
View file @ 6c2ab960
......@@ -410,10 +410,10 @@
<template slot-scope="scope">
<span
><template v-if="scope.row.ApplyForState==1">
待主管审核
待{{scope.row.ApplyType=="2"?"OP":"主管"}}审核
</template>
<template v-else-if="scope.row.ApplyForState==2">
主管审核通过
{{scope.row.ApplyType=="2"?"OP":"主管"}}审核通过
</template>
<template v-else-if="scope.row.ApplyForState==3">
审核通过
......
src/components/index.vue
View file @ 6c2ab960
......@@ -1289,6 +1289,7 @@
pageSize: 5,
total: 0,
total2: 0,
ApplyType:0,
},
ExamineThePriceVisible: false, //审核改价提醒
ChangeThePriceList: [],
......@@ -1966,13 +1967,15 @@
(localStorage.getItem("ChangeThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetChangeThePrice()
this.ExamineThePriceMsg.ApplyType=2;
this.GetExaminePriceOrderPageList()
}
}
},
created() {
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()
let Month = DateTime.getMonth()+1
let Months = Month > 9 ? Month : '0' + Month
let day = new Date(Year, Month, 0).getDate()
let DepartETime = Year + '-' + Months + '-' + day
......@@ -2028,12 +2031,14 @@
"CarSingle_post_GetExaminePriceOrderPageList", this.ExamineThePriceMsg,
res => {
if (res.data.resultCode == 1) {
console.log("我进来啦结果...",res.data.data);
if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
if (!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
// localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd")));
this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
console.log("我进来啦this.ChangeThePriceObj.ExamineThePriceData",this.ChangeThePriceObj.ExamineThePriceData);
this.ExamineThePriceVisible = true
} else {
this.ExamineThePriceVisible = false
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 6c2ab960
......@@ -191,7 +191,7 @@
</template>
<template v-if="pagesTitle == '审核'">
<el-button
v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&userInfo.EmployeeId==1)"
v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&(userInfo.EmployeeId==1||userInfo.RB_Department_Id==2))"
size="mini"
type="primary"
@click="ckChangePrice(scope.row, 2)"
......@@ -210,7 +210,7 @@
</el-table-column>
<template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请'||pagesTitle=='查看')
&&(item.SaleRemarks||item.OP_Remarks||item.ApplyForState
||(userInfo.EmployeeId==1&&item.ManagerExamineName))">
||((userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName))">
<div style="padding:10px;">
<div>
<p style="font-size: 13px;" v-if="item.SaleRemarks">
......@@ -228,19 +228,19 @@
</div>
<div style="margin-top: 10px;" v-if="item.ApplyForState==4">
<span v-if="item.ManagerRefuseReason" style="margin-right: 20px;">
主管审核意见：<span style="color: red;">{{item.ManagerRefuseReason}}</span>
{{item.ApplyType=="2"?"OP":"主管"}}审核意见：<span style="color: red;">{{item.ManagerRefuseReason}}</span>
</span>
<span v-if="item.RefuseReason">
总经理审核意见：<span style="color: red;">{{item.RefuseReason}}</span>
{{item.ApplyType=="2"?"会计":"总经理"}}审核意见：<span style="color: red;">{{item.RefuseReason}}</span>
</span>
</div>
<div style="margin-top: 10px;" v-if="item.ApplyForState
||(item.ApplyForState==1&&item.ManagerExamineName)
||item.ApplyForState==2||item.ApplyForState==4
||(userInfo.EmployeeId==1&&item.ManagerExamineName)">
||((userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName)">
<template v-if="item.ApplyForState">
<span>
申请改价金额：<span style="color: red;">{{item.ApplyForMoney}}</span>
申请改价金额：<span style="color: red;">{{item.ApplyForMoney}}</span> <el-tag type="success" effect="dark" v-if="item.ApplyType=='2'">汇差改价</el-tag>
</span>
<span style="margin-left: 20px;">
申请时间：<span style="color: red;">{{item.ApplyCreateTimeStr}}</span>
......@@ -250,11 +250,11 @@
</span>
</template>
<span style="margin-left: 20px;" v-if="item.ApplyForState==1&&item.ManagerExamineName">
<el-tag type="warning" effect="dark">待主管 {{item.ManagerExamineName}} 审核</el-tag>
<el-tag type="warning" effect="dark">待{{item.ApplyType=="2"?"OP":"主管"}}{{item.ManagerExamineName}} 审核</el-tag>
</span>
<span style="margin-left: 20px;" v-if="pagesTitle=='申请'&&item.ApplyForState==2">
<el-tag type="warning" effect="dark">待徐总审核</el-tag>
<span v-if="item.ManagerExamineBy>0" style="color:#13879b;">主管（{{item.ManagerExamineName}} /{{item.ManagerExamineTimeStr
<el-tag type="warning" effect="dark">待{{item.ApplyType=="2"?"会计":"总经理"}}{{item.ExamineByName}}审核</el-tag>
<span v-if="item.ManagerExamineBy>0" style="color:#13879b;">{{item.ApplyType=="2"?"OP":"主管"}}（{{item.ManagerExamineName}} /{{item.ManagerExamineTimeStr
}}）已审核</span>
</span>
<span v-if="item.ApplyForState==4" style="margin-left: 20px;">
......@@ -266,10 +266,10 @@
改价状态：<span style="color: red;"
>
<template v-if="item.ApplyForState==1">
待主管审核
待{{item.ApplyType=="2"?"OP":"主管"}}审核
</template>
<template v-else-if="item.ApplyForState==2">
主管审核通过
{{item.ApplyType=="2"?"OP":"主管"}}审核通过
</template>
<template v-else-if="item.ApplyForState==3">
审核通过
......@@ -279,7 +279,7 @@
</template>
</span>
</span>
<span v-if="userInfo.EmployeeId==1&&item.ManagerExamineName" style="margin-left: 20px;">
<span v-if="(userInfo.EmployeeId==1||userInfo.RB_Department_Id==2)&&item.ManagerExamineName" style="margin-left: 20px;">
审核人：
<span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span>
<span v-if="item.ManagerExamineTimeStr">/ {{item.ManagerExamineTimeStr}}</span>
......@@ -543,7 +543,7 @@
</template>
<template v-if="pagesTitle == '审核'">
<el-button
v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&userInfo.EmployeeId==1)"
v-if="scope.row.ApplyForState == 1||(scope.row.ApplyForState == 2&&(userInfo.EmployeeId==1||userInfo.RB_Department_Id==2))"
size="mini"
type="primary"
@click="ckChangePrice(scope.row, 2)"
......@@ -575,10 +575,10 @@
</div>
<div style="padding:0 0 10px 0;" v-if="changePriceObj.ApplyForState==4">
<span v-if="changePriceObj.ManagerRefuseReason" style="margin-right: 20px;">
主管审核意见：<span style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
{{item.ApplyType=="2"?"OP":"主管"}}审核意见：<span style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
</span>
<span v-if="changePriceObj.RefuseReason">
总经理审核意见：<span style="color: red;">{{changePriceObj.RefuseReason}}</span>
{{item.ApplyType=="2"?"会计":"总经理"}}审核意见：<span style="color: red;">{{changePriceObj.RefuseReason}}</span>
</span>
</div>
<div slot="footer" class="dialog-footer"
......@@ -614,6 +614,14 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="isHaveJapanMoney==1">
<el-form-item label="改价类型" prop="" >
<el-radio-group v-model="changePriceMsg.ApplyType" >
<el-radio label="1">正常改价</el-radio>
<el-radio label="2">汇差改价<span style="color:red;">（由于汇率造成的帐未平，实际已全额收款）</span></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
......@@ -765,7 +773,8 @@ export default {
setPlatDialog: false, //是否显示弹出框
outerVisible: false,
outerVisible2: false,
ApplyForMoney: 0
ApplyForMoney: 0,
ApplyType: '',
},
msg: {
OrderId: "",
......@@ -851,6 +860,7 @@ export default {
cancelRemark: "",
cancelOrderId: 0,
uploadOrderId: 0,
isHaveJapanMoney:0,
loading: false,
fileList: [],
GuestFile: "",
......@@ -932,6 +942,16 @@ export default {
let that = this
if(this.titlePrice == "申请改价"||this.titlePrice == "修改改价"){
this.changePriceMsg.ApplyForState=1
if(this.isHaveJapanMoney==0){
this.changePriceMsg.ApplyType="1"
}else{
console.log("this.changePriceMsg.ApplyType",this.changePriceMsg.ApplyType);
if (this.changePriceMsg.ApplyType!="1"&&this.changePriceMsg.ApplyType!="2"){
this.$message.error("请选择改价类型");
return;
}
}
let text = ''
if(this.changePriceMsg.Money!=this.getChangePriceObj()){
......@@ -983,6 +1003,7 @@ export default {
},
// 申请接口
SetOrderChangePrice(){
this.loading = true
this.apipost(
"CarSingle_post_SetOrderChangePrice",
......@@ -1008,11 +1029,36 @@ export default {
if (type == 2) this.titlePrice = "应收总金额改价审核";
if (type == 3) this.titlePrice = "改价详情";
this.changePriceObj = item
this.isHaveJapanMoney=0;
this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
this.changePriceMsg.OrderId = item.OrderId;
this.changePriceMsg.OrderType = item.OrderType;
// this.changePriceMsg.PreferPrice = item.PreferPrice;
// this.changePriceMsg.Money = item.Money;
if(this.changePriceMsg.ID>0){
this.changePriceMsg.ApplyType= String(item.ApplyType);
}else{
this.changePriceMsg.ApplyType=""
}
this.apipost(
"CarSingle_post_GetIsHaveJapanMoney",
{"OrderId":item.OrderId,"OrderType":item.OrderType},
res => {
this.loading = false
if (res.data.resultCode == 1) {
this.isHaveJapanMoney=res.data.data.IsHaveJapanMoney;
}
if(this.isHaveJapanMoney==1){
if(this.changePriceMsg.ID>0){
this.changePriceMsg.ApplyType= String(item.ApplyType);
}else{
this.changePriceMsg.ApplyType=""
}
}else{
this.changePriceMsg.ApplyType="1"
}
}
)
console.log("this.changePriceMsg.ApplyType",this.changePriceMsg.ApplyType);
this.changePriceMsg.setPlatDialog = false;
if (!type || type == 1) this.changePriceMsg.outerVisible = true;
if (type == 2 || type == 3) this.changePriceMsg.outerVisible2 = true;
......@@ -1058,7 +1104,7 @@ export default {
} else {
name = "groupTourOrderByTuan";
}
if(this.userInfo.EmployeeId==1){
if(this.userInfo.EmployeeId==1||this.userInfo.RB_Department_Id==2){
name = "RegistrationList";
}
this.$router.push({
......@@ -1230,6 +1276,7 @@ export default {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.userInfo = this.getLocalStorage();
console.log("this.userInfo",this.userInfo);
// 判断是否销售
if (ActionMenuCode.indexOf("S_CheckBranchOrder") != -1) {
this.S_CheckBranchOrder = true;
......
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