Skip to content

S
SuperMan
Commit b171d471 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent c58c2cf7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 760 additions and 9 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ b171d471
......@@ -473,6 +473,8 @@
</div>
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品 -->
<czBillModule :FrID='ID' />
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
<huijiBill :ID="ID" :disabled="true" :loopNumN="1" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" />
......@@ -1344,6 +1346,7 @@ import { truncate } from 'fs';
import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
import huijiBill from "./FinancialSubmodule/huijiBill.vue";
import czBillModule from "./FinancialSubmodule/czBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
export default {
data(){
......@@ -1518,6 +1521,7 @@ export default {
'myGuanBill': myGuanBill,
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
'czBillModule':czBillModule,
},
methods:{
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ b171d471
......@@ -120,7 +120,7 @@
methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
if(this.active==1){
// 手配费
// 手配费 收款单参数Handmsg
if(this.$route.query.Handmsg){
this.$router.push({ name: "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:'新增收款单'}})
......@@ -130,6 +130,7 @@
}
}else if(this.active==2){
// 付款单参数czmsg
// 领队报账 预付款冲抵 返款制单
if(this.$route.query.czmsg){
this.$router.push({ name: 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:'新增付款单'}})
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ b171d471
......@@ -560,7 +560,7 @@
</div>
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 -->
<!-- 预付款冲抵 电商商品-->
<czBillModule :FrID='ID' />
<myGuanBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
<myJiPiaoBill :ID="FrID" :FrID='FrID' :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
......
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ b171d471
......@@ -85,11 +85,11 @@
</table>
</div>
</div>
<div v-if="LeaderRefundDetailList && LeaderRefundDetailList.length>0">
<div v-if="LeaderRefundDetailList && LeaderRefundDetailList.length>0 && LeaderState">
<div class="_tit">
<span class="_text">领队领款单据</span>
<div>
<span class="_btn" v-if="tableShow1" @click="tableShow2=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-if="tableShow2" @click="tableShow2=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow2=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
......@@ -120,6 +120,29 @@
</table>
</div>
</div>
<!-- 电商商品 -->
<div v-if="OtherType==9 && ECommerceGoodsModel.Id>0">
<div class="_tit">
<span class="_text">电商商品</span>
<div>
<span class="_btn" v-if="tableShow3" @click="tableShow3=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow3=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow2" class="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th width="50">编号</th>
<th>名称</th>
</tr>
<tr class="_color_b">
<td class="hover_text" @click="goElectricityGoods(ECommerceGoodsModel.Id)" ><span>{{ECommerceGoodsModel.Id}}</span></td>
<td>{{ECommerceGoodsModel.Name}}</td>
</tr>
</table>
</div>
</div>
</div>
</template>
......@@ -131,6 +154,7 @@ export default {
tableShow: true,
tableShow1: true,
tableShow2: true,
tableShow3: true,
tit: '',
details: [],
loading: true,
......@@ -142,19 +166,22 @@ export default {
IsAdvanceFinance:-1,
cdtotal:0,
LeaderRefundDetailList:[],
LeaderState:false,
ECommerceGoodsModel:{},
}
},watch:{
},created(){
this.getDataDes();
},mounted(){
this.getDataDes();
},
methods:{
getDataDes(){
this.apipost('Financial_post_GetDetail', {ID:this.FrID,Type:1}, res => {
this.loading = false
......@@ -162,9 +189,11 @@ export default {
let data=res.data.data;
console.log("data",data)
this.LeaderRefundDetailList=data.LeaderRefundDetailList;
this.LeaderState=true;
this.OtherType=data.OtherType;
this.ReFinanceId=data.ReFinanceId;
this.IsAdvanceFinance=data.IsAdvanceFinance;
this.ECommerceGoodsModel=data.ECommerceGoodsModel;
if(this.OtherType==7){
this.getDetails()
}else{
......@@ -177,6 +206,9 @@ export default {
goDetail(id){
this.$router.push({ name: 'FinancialDocumentsDetail',query:{"id":id,blank:'y',tab:'单据详情'} })
},
goElectricityGoods(id){
this.$router.push({ name: 'ElectricityGoods',query:{"Id":id,unEdit:true,blank:'y'} })
},
getczTableList(){
this.loading = true
let msg={
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ b171d471
......@@ -935,7 +935,7 @@ export default {
this.loading = true;
this.msg.Description=this.Description;
// 预付款冲抵
// 预付款冲抵 电商商品
if(this.czmsgState){
this.msg.ReFinanceId=this.czmsg.ReFinanceId;
this.msg.OtherType=this.czmsg.OtherType;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ b171d471
......@@ -1054,7 +1054,9 @@ export default {
AddFinancial(z){ //保存
if(this.Handmsg!=null){
this.msg.ReFinanceId=this.Handmsg.ReFinanceId;
this.msg.TCNUM=this.Handmsg.TCNUM;
if(this.Handmsg.TCNUM){
this.msg.TCNUM=this.Handmsg.TCNUM
}
}
if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
......
src/components/SalesModule/ElectricityGoods.vue 0 → 100644
View file @ b171d471
<template>
<div class="Feedback">
<ul style="overflow: initial!important">
<li>
<span>
<em>商品名称</em>
</span>
<el-input class='w200' v-model='msg.Name'></el-input>
</li>
<li style="float:right;margin-bottom:10px">
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="getList()"
>
<input v-if="unEdit"
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
</li>
</ul>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="200">名称</th>
<th>制单收入</th>
<th>实收</th>
<th>平台税金</th>
<th>退款</th>
<th>成本</th>
<th>操作人/时间</th>
<th>描述</th>
<th v-if="unEdit">操作</th>
</tr>
<tr v-for="(com,i) in dataList" :key="i">
<td>{{com.Name}}</td>
<td>
<span @click="Gourl(com)" style="text-decoration: underline;">{{com.PreferPrice}}</span>
</td>
<td>{{com.Income}}</td>
<td>{{com.PlatformTax}}</td>
<td>{{com.Refund}}</td>
<td>{{com.Cost}}</td>
<td>
<p>{{com.UpdateByName}}</p>
<p>{{com.UpdateTime}}</p>
</td>
<td>{{com.Description}}</td>
<td v-if="unEdit">
<el-button v-if="userInfo.EmployeeId==com.UpdateBy" @click="SetRules(com)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button v-if="com.PreferPrice==0 && com.Income==0 &&com.PlatformTax==0 &&com.Refund==0 &&com.Cost==0" @click="Delete(com)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
<el-select style="width:100px" size="mini" @change="changeTypeValue(com,typeValue)" v-model="typeValue" placeholder="收款方式">
<el-option label="收款" :value="1"></el-option>
<el-option label="付款" :value="2"></el-option>
<el-option label="成本" :value="3"></el-option>
</el-select>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</table>
<div style="text-align:center">
<el-pagination
background
@current-change="handleCurrentChange"
v-if="dataList.length>0"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
</div>
<el-dialog
title="商品"
:visible.sync="ruleVisible"
width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="名称" prop="Name">
<el-input class='w200' v-model='form.Name'></el-input>
</el-form-item>
<el-form-item label="描述" prop="Description">
<el-input
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="form.Description">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk('form')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import moment from "moment"
import { constants } from 'fs';
export default {
name: 'Feedback',
data (){
return{
typeValue:'',
currentPage:1,
total:0,
dataList:[],
loading:false,
ruleVisible:false,
form:{
Id:0,
Name:'',
Description:'',
},
LineTeamList:[],
EmployeeList:[],
rules:{
Name: [
{ required: true, message: '请输入名称', trigger: 'blur' }
],
Description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
},
msg:{
pageIndex:1,
pageSize:15,
Name:'',
},
userInfo:{},
unEdit:true,
}
},
created(){
this.userInfo = this.getLocalStorage();
},
mounted(){
this.getList();
if(this.$route.query.unEdit){
this.unEdit =false;
}
if(this.$route.query.Id){
this.msg.Id =this.$route.query.Id;
}
},
methods:{
changeTypeValue(com,val){
let Handmsg={};
Handmsg.ReFinanceId=com.Id;
Handmsg.OtherType=9;
var msg=JSON.stringify(Handmsg);
if(val==1){//收款
let routeData = this.$router.resolve({
name: 'ChoiceAddFinancialDocuments',
query: {Handmsg:msg,Type: 1,searchTitle:'电商'}
})
window.open(routeData.href, '_blank')
}
else if(val==2){//退款
let routeData = this.$router.resolve({
name: 'ChoiceAddFinancialDocuments',
query: {czmsg:msg,Type: 2,searchTitle:'电商退款'}
})
window.open(routeData.href, '_blank')
}
else if(val==3){//成本
let routeData = this.$router.resolve({
name: 'ChoiceAddFinancialDocuments',
query: {czmsg:msg,Type: 2,searchTitle:'电商付款'}
})
window.open(routeData.href, '_blank')
}
},
Gourl(com){
this.$router.push({
name: 'ElectricityGoodsDetails',
query: {
ReFinanceId: com.Id,
blank: "y"
}
});
},
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('sellorder_post_DelECommerceGoodsInfo', {Id:item.Id}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
}else{
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
addRule(){
this.ruleVisible=true;
this.form={
Name:'',
Description:'',
Id:0
}
},
SetRules(item){
this.ruleVisible=true;
this.form={
Name:item.Name,
Description:item.Description,
Id:item.Id
}
},
RulesOk(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost(
'sellorder_post_SetECommerceGoodsInfo', this.form,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.ruleVisible=false;
this.Success(res.data.message)
}else{
this.Error(res.data.message)
}
},
err => {
}
)
} else {
}
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apipost("sellorder_get_GetECommerceGoodsPageList", this.msg, res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total=res.data.data.count;
}
});
},
}
}
</script>
<style>
.Feedback ul>li{
display: inline-block;
font-size: 12px;
color: #666;
margin: 20px 30px 0px 0;
}
.Feedback .singeRowTable{
margin-top: 20px;
}
</style>
src/components/SalesModule/ElectricityGoodsDetails.vue 0 → 100644
View file @ b171d471
This diff is collapsed.
src/router/config.js
View file @ b171d471
......@@ -2119,7 +2119,25 @@ export default {
meta: {
title: '自由行订单'
},
},{
},
{
path: '/ElectricityGoods', // 销售 电商商品
name: 'ElectricityGoods',
component: resolve => require(['@/components/SalesModule/ElectricityGoods'], resolve),
meta: {
title: '电商商品'
},
},
{
path: '/ElectricityGoodsDetails', // 销售 电商商品
name: 'ElectricityGoodsDetails',
component: resolve => require(['@/components/SalesModule/ElectricityGoodsDetails'], resolve),
meta: {
title: '电商商品统计详情'
},
},
{
path: '/AmoebaDetail', //阿米巴结算详情
name: 'AmoebaDetail',
component: resolve => require(['@/components/TravelManager/TravelList/AmoebaDetail'], resolve),
......
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