Skip to content

C
confucius
Commit f73896fb authored by zhengke's avatar zhengke
Browse files
Options

修改报价单显示

parent 6e428441
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 21 deletions
src/components/sale/orderlist.vue
View file @ f73896fb
......@@ -508,6 +508,10 @@
<!--续课申请-->
<continueclass-form v-if="isShowContinueClass" :save-obj="orderObj" @close="closeContinueClassForm"
@success="refreshClassOrder"></continueclass-form>
<!-- 查看报价单 -->
<viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota" @success="refreshView">
</viewquotation-form>
</div>
</template>
......@@ -520,6 +524,8 @@
import myOrderForm from '../../components/sale/myOrder-form'
import classinfoForm from '../../components/course/classinfo-form';
import continueclassForm from '../sale/continueclass-form' //续课申请
import viewquotationForm from '../sale/viewquotation-form'
import {
cancelClassOrder, //取消订单
} from '../../api/sale/sale'
......@@ -536,7 +542,8 @@
classinfoForm,
backclassForm,
moneyForm,
continueclassForm
continueclassForm,
viewquotationForm
},
props: {
//正常订单
......@@ -574,6 +581,8 @@
moneyObj: {},
CommonType: -1, //用于判断是修改提成还是额外奖励
EmployeeList: [], //员工列表
isShowviewQuo:false,
rId:0
}
},
created() {
......@@ -581,14 +590,22 @@
},
mounted() {},
methods: {
closeQuota(){
this.isShowviewQuo=false;
},
refreshView(){
},
//跳转
goQuotation(Id) {
this.$router.push({
path: "/sale/quotation",
query: {
Id: Id
}
});
this.rId=Id;
this.isShowviewQuo=true;
// this.$router.push({
// path: "/sale/quotation",
// query: {
// Id: Id
// }
// });
},
getTkshow(data) {
let Tkshow = false;
......@@ -765,13 +782,26 @@
},
chanceType(obj, type) {
let TCIDARR = []
TCIDARR.push(obj.ClassId)
let orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
TCIDARR.push(obj.ClassId);
var orderObj={}
if(obj.OfferId>0){
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
OtherType:29,
ReFinanceId:obj.OfferId
}
}else{
orderObj = {
OrderID: obj.OrderId,
OrderSource: 17,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
......
src/components/sale/viewquotation-form.vue 0 → 100644
View file @ f73896fb
This diff is collapsed.
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @ f73896fb
......@@ -125,7 +125,8 @@
if(this.$route.query.Handmsg){
this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments',
query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
});
}
// 财务收据
......@@ -133,13 +134,15 @@
let Handmsg=this.$route.query.czmsg;
this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments',
query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
});
}
else{
this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments',
query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}
});
}
}else if(this.active==2){
......@@ -148,12 +151,14 @@
if(this.$route.query.czmsg){
this.$router.push({
path: '/financial/financalDocument/' + path,
query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
});
}else{
this.$router.push({
path: '/financial/financalDocument/' + path,
query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}
});
}
}else if(this.active==4){
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ f73896fb
......@@ -396,7 +396,7 @@
<div class="_explain">
<p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)">
<span style="color:#000">投诉单号：</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==15" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商采购单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==16" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17" @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
......@@ -412,6 +412,9 @@
<span v-if="GetDetail.OtherType==18&&GetDetail.ReFinanceId>0" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
<span @click="goOrderDetails(GetDetail.ReFinanceId)">账单：{{GetDetail.ReFinanceId}}</span>
</span>
<span v-if="GetDetail.OtherType==29&&GetDetail.ReFinanceId>0" style="float: right;color: #000;font-size: 12px;">报价单：
<span style="color:blue;cursor:pointer;text-decoration:underline;" @click="showViewOrder">{{GetDetail.ReFinanceId}}</span>
</span>
</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
<tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
......@@ -841,6 +844,8 @@
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
<classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
</classinfo-form>
<viewquotationForm v-if="isShowviewQuo" :rId="rId" @close="closeQuota">
</viewquotationForm>
</div>
</template>
<script>
......@@ -865,6 +870,7 @@
import {UploadSelfFile} from '../../../api/common/common'
import {getClassNameList} from '../../../api/finance/index'
import classinfoForm from '../../../components/course/classinfo-form';
import viewquotationForm from '../../../components/sale/viewquotation-form';
export default {
data(){
......@@ -945,6 +951,8 @@
huijiShow:true,
classObjOption: null,
isShowClassInfo: false, //是否显示课程信息
isShowviewQuo:false, //是否显示预览报价单
rId:0
}
},
components:{
......@@ -966,6 +974,7 @@
"czBillModule":czBillModule,
'classinfo-form':classinfoForm,
'viewquotationForm':viewquotationForm
},
created(){
this.ID = this.$route.query.id;
......@@ -978,6 +987,10 @@
// }
},
methods:{
//查看报价单
showViewOrder(){
this.isShowviewQuo=true;
},
GetAuth() {
var actionCode = this.$AuthCode.TeamShouZhi;
// this.CheckUserAuth(actionCode, res => {
......@@ -1473,6 +1486,7 @@
let newTime = this.$commonUtils.formatMsgTime2(begTime,enTime);
this.endDate = newTime.replace("前","");
}
this.rId = data.ReFinanceId;
this.FinancialFlowTemplate_post_GetProcessList(data.FrID,data.TemplateType)
if(data.VorcherInos.length>0){
data.VorcherInos.forEach(x=>{
......@@ -1601,6 +1615,10 @@
closeClass() {
this.isShowClassInfo = false
},
//关闭预览弹窗
closeQuota(){
this.isShowviewQuo = false;
},
//刷新
refreshClass() {
......
src/pages/sale/quotation.vue
View file @ f73896fb
......@@ -84,7 +84,7 @@
合计金额
</div>
<div style="font-family:Poppins,Helvetica,sans-serif;font-size:26px;" class="text-weight-bold">
￥{{model.TotalPrice.toFixed(2)}}
￥<span v-if="model.TotalPrice">{{model.TotalPrice.toFixed(2)}}</span>
</div>
<div class="remark-font"
style="padding-bottom: 3rem;margin-bottom: 4rem;border-bottom:1px solid #ebedf3;">
......
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