Skip to content

C
confucius
Commit c5f643f8 authored by Mac's avatar Mac
Browse files
Options

1

parent 6d85745f
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 4 deletions
src/App.vue
View file @ c5f643f8
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_56b72l69rc3.css');
@import url('//at.alicdn.com/t/font_635492_s0q2a5xs0lk.css');
html,
body,
......
src/pages/financial/financalDocument/BasicDocuments.vue
View file @ c5f643f8
......@@ -915,6 +915,17 @@
</p>
<p>业务单据：<span>{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> -->
</div>
<div lass="_explain" v-if="GetDetail.Type==2 && GetDetail.InvoiceType>0" style="flex-direction: column;align-items: flex-start;">
<div style="color: #1273BC;">发票说明：</div>
<div style="display:flex">
<p >发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</p> </p>
<p v-if="GetDetail.InvoiceType == 3" style="margin-left:30px">发票金额： <p style='font-weight: bold;' v-if="GetDetail.InvoiceType == 3">{{GetDetail.InvoiceMoney}}元</p></p>
</div>
<div>
发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
</div>
</div>
</div>
<div class="_fujian_box" v-if="GetDetail.VorcherInos&&GetDetail.VorcherInos.length>0">
<div class="_fujian_zhankai cursorpointer" v-if="!fujianShow" @click="fujianShow = true">
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ c5f643f8
......@@ -807,6 +807,7 @@
:color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon">
</my-GZ-Bill>
<div class="_explain">
<p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)">
......@@ -962,7 +963,19 @@
</el-popover>
</div>
</div>
<div lass="_explain" v-if="GetDetail.Type==2 && GetDetail.InvoiceType>0" style="flex-direction: column;align-items: flex-start;">
<div style="color: #1273BC;">发票说明：</div>
<div style="display:flex">
<p >发票类型：<p style='font-weight: bold;'>{{GetDetail.InvoiceTypeName}}</p> </p>
<p v-if="GetDetail.InvoiceType == 3" style="margin-left:30px">发票金额： <p style='font-weight: bold;' v-if="GetDetail.InvoiceType == 3">{{GetDetail.InvoiceMoney}}元</p></p>
</div>
<div>
发票备注：{{GetDetail.InvoiceRemark == null || GetDetail.InvoiceRemark==''?'无':GetDetail.InvoiceRemark}}
</div>
</div>
</div>
<my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
:isPrintPage="false" :width="widthSon" :color="colorSon"></my-HB-Bill>
<!-- <myDJieBill v-if="GetDetail.DijieBathFinanceList && GetDetail.DijieBathFinanceList.length" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"/> -->
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ c5f643f8
......@@ -883,6 +883,21 @@
outline: none;" class="iconfont icon-zhuanhuan1" @click="getExchange(scope.row)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="发票修改" placement="top">
<!-- <i v-if="scope.row.isExchange" style="width: 30px;-->
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-fapiao" v-if="Finance_InvoiceUpdate==true && scope.row.Type==2" @click="setdaju(scope.row)">
</i>
</el-tooltip>
</span>
</div>
</template>
......@@ -916,6 +931,38 @@
</div>
</template>
</el-dialog>
<el-dialog custom-class='w400' title="修改发票信息" :visible.sync="xgfpBox" center>
<template>
<el-form label-width="100px">
<el-form-item label="发票类型：">
<el-select filterable v-model='modifydjfp.InvoiceType' class="w135 _border_b_1" @change="$forceUpdate()">
<el-option v-for='item in getInvoiceList' :label='item.Name' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="发票金额" v-if="modifydjfp.InvoiceType==3">
<el-input v-model='modifydjfp.InvoiceMoney' type="number" placeholder="发票金额" class="w135 _border_b_1" @input="$forceUpdate()"></el-input>
</el-form-item>
<el-form-item label="发票说明" >
<el-input
type="textarea"
placeholder="请输入发票相关的信息"
v-model="modifydjfp.InvoiceRemark"
show-word-limit
@input="$forceUpdate()"
>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="xgfpBox=false">取消</button>
<button class="normalBtn" type="primary" @click="setfp()">修改</button>
</div>
</template>
</el-dialog>
</div>
</template>
<script>
......@@ -937,6 +984,7 @@
import {
getSchoolPage
} from '../../../api/school/index'
import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
export default {
data() {
return {
......@@ -947,6 +995,7 @@
searchList: [],
widthSon: '700px',
colorSon: "#f5f5f5",
Finance_InvoiceUpdate:false,
msg: {
pageIndex: 1,
pageSize: 5,
......@@ -1056,7 +1105,13 @@
rowsPerPage: 12,
SName: "",
Status: '-1'
}
},
modifydjfp:{
},
xgfpBox:false,
getInvoiceList:[],
}
},
created() {
......@@ -1100,6 +1155,15 @@
this.transactionDate[0] = this.$route.query.StartDate;
this.transactionDate[1] = this.$route.query.StartDate;
}
var localStorageData = window.localStorage["loginUserInfo"];
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'Finance_InvoiceUpdate') {
this.Finance_InvoiceUpdate = true
}
})
}
},
components: {
"my-Bill": myBill,
......@@ -1124,7 +1188,7 @@
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.AccountType_post_GetList();
this.get_GetInvoiceTypeEnumList()
var that = this;
that.MsgBus.$on('getRecQuery', function (FrID) {
that.zhuanjiaoMsg.CreateBy = '';
......@@ -1133,8 +1197,21 @@
that.zhuanjiaoMsg.FrIDList.push(FrID);
that.zhuanjiaoBox = true;
});
},
methods: {
get_GetInvoiceTypeEnumList(){
this.apipost('Financial_get_GetInvoiceTypeEnumList', {}, res => {
if (res.data.resultCode == 1) {
this.getInvoiceList=res.data.data
this.getInvoiceList.forEach(x=>{
x.Id = Number(x.Id)
})
}
}, err => {})
},
getExchange(rowData) {
this.zhuanjiaoMsg.CreateBy = '';
this.zhuanjiaoMsg.RB_CreateByName = '';
......@@ -1142,6 +1219,7 @@
this.zhuanjiaoMsg.FrIDList.push(rowData.FrID);
this.zhuanjiaoBox = true;
},
customCompFunc(params) {},
sortChange(param) {
//自己写实现
......@@ -1161,6 +1239,33 @@
this.Error(res.data.message);
}
}, err => {})
},
setdaju(row){//获取发票详情
this.apipost('Financial_get_GetFinanceInvoiceInfo', {FrId:row.FrID}, res => {
if (res.data.resultCode == 1) {
this.modifydjfp = res.data.data
this.xgfpBox = true;
} else {
this.Error(res.data.message);
}
}, err => {})
},
//发票的修改
setfp(){
if(this.modifydjfp.InvoiceMoney ==null || this.modifydjfp.InvoiceMoney==''){
this.modifydjfp.InvoiceMoney=0
}
if(this.modifydjfp.InvoiceRemark ==null ){
this.modifydjfp.InvoiceRemark=''
}
this.apipost('Financial_get_SetFinanceInvoiceInfo', this.modifydjfp, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.xgfpBox = false;
} else {
this.Error(res.data.message);
}
}, err => {})
},
remoteMethod(query) { // 转交人模糊查询
if (query !== '' || this.addShow) {
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ c5f643f8
......@@ -683,6 +683,7 @@
</el-option>
</el-select>
</span></p>
<template v-if="GetDetail.FrID!=0">
<p v-if="GetDetail.OrderSource==9&&GetDetail.SourceID>0">{{$t("fnc.gnpiaowu")}}：<span
class="_jump_page _font_bold"
......@@ -702,7 +703,39 @@
</div>
</template>
</div>
<div class="" style="justify-content: flex-start;">
<p>发票状态：</p>
<span>
<el-select filterable v-model='msg.InvoiceType' class="w135 _border_b_1" @change="admin_get_Depart_IdGetList2(msg.InvoiceType)">
<el-option v-for='item in getInvoiceList' :label='item.Name' :value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</p>
<p v-if="msg.InvoiceType==3" style="margin-left:30px">
发票金额:
<el-input v-model='msg.InvoiceMoney' type="number" placeholder="发票金额" class="w135 _border_b_1" style="margin-left:10px" @input="$forceUpdate()"></el-input>
</p>
</div>
<div style="justify-content: flex-start;align-items: flex-start;">
<p>发票备注:</p>
<el-input
type="textarea"
placeholder="请输入发票相关的信息"
v-model="msg.InvoiceRemark"
show-word-limit
style="width:400px;margin-left:10px"
@input="$forceUpdate()"
>
</el-input>
</div>
</div>
<div class="_remark">
<p>{{$t('system.label_info')}}</p>
<textarea v-model="Description">
......@@ -837,6 +870,9 @@
RB_BranchName:'',
RB_DepartName:'',
OrderSource : 17,
InvoiceType:1,
InvoiceMoney:'0',
InvoiceRemark:'',
},
detailList: {
ID: 0,
......@@ -892,6 +928,7 @@
Status: 0,
},
departmentList: [],
getInvoiceList:[],
CompanyList: [],
orderObj: null,
IsUploadPic: 0,
......@@ -1136,6 +1173,9 @@
if (this.msg.AccountNumber === '') return this.$message.error(this.$t('rule.qxzfkdzhanghu'));
} else {
}
if(this.msg.InvoiceMoney == ''){
this.msg.InvoiceMoney = '0'
}
// if(this.msg.ClientID=='')return this.$message.error('请选择客户名称!');
// if(this.msg.IsPublic!=2 && this.IsLeader!=0){
......@@ -1580,7 +1620,16 @@
this.msg = JSON.parse(JSON.stringify(data));
this.msg.ClientType = this.msg.ClientType == 0 ? '' : this.msg.ClientType;
this.msg.ClientID = this.msg.ClientID == 0 ? '' : this.msg.ClientID;
if(!this.msg.InvoiceType || this.msg.InvoiceType==0){
this.msg.InvoiceType = 1
}
if(!this.msg.InvoiceMoney ){
this.msg.InvoiceMoney = 0
}
if(!this.msg.InvoiceRemark){
this.msg.InvoiceRemark = ''
}
if (id || id === 0) {
if (!this.orderObj && id > 0) {
this.msg.RB_Branch_Id = this.msg.RB_Branch_Id
......@@ -1609,6 +1658,7 @@
}
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
this.get_GetInvoiceTypeEnumList()
this.msg.PayDate = this.msg.PayDate;
this.msg.detailList = [];
this.FinancialFlowTemplate_post_GetProcessList(data.TemplateId);
......@@ -1729,6 +1779,10 @@
}
})
},
admin_get_Depart_IdGetList2(bid){
this.msg.InvoiceType = bid
this.$forceUpdate()
},
admin_get_DepartmentGetList(Bid, T) {
if (Bid == 0) {
this.chosenPeople = [];
......@@ -1756,6 +1810,19 @@
})
},
get_GetInvoiceTypeEnumList(){
this.apipost('Financial_get_GetInvoiceTypeEnumList', {}, res => {
if (res.data.resultCode == 1) {
this.getInvoiceList=res.data.data
this.getInvoiceList.forEach(x=>{
x.Id = Number(x.Id)
})
}
}, err => {})
},
getCompany() { //公司
getSchoolPage(this.schoolMsg).then(res => {
let data = res.Data.PageData;
......
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