Commit 3e8f9c29 authored by youjie's avatar youjie

页面修改

parent b271bfc6
......@@ -405,6 +405,15 @@
<el-form-item :label="$t('fnc.mbmiaoshu')">
<el-input v-model="addMsg.DescribeInfo" class="w450" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="使用端">
<el-select filterable multiple v-model='addMsg.PortTypeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in PortTypeList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
<div class="approval_page_content">
<div class="approval_person_content">
......@@ -566,6 +575,7 @@ export default {
components: { Treeselect },
data(){
return{
PortTypeList: [],
PropertyTypeList:[],
xingzhenState:false,
DepartmentList:[],
......@@ -575,6 +585,8 @@ export default {
TemplateId:0,
radio:1,
addMsg:{
PortTypeList: [],
PortType: '',
Id:0,
Name:'',
DescribeInfo:'',
......@@ -775,8 +787,21 @@ export default {
this.getRole()
this.getEmployeeList();
this.getDepartment();
this.getPortType()
},
methods:{
getPortType(){
this.apipost(
"Template_post_GetPortTypeEnumList",
{},
res => {
if (res.data.resultCode == 1) {
this.PortTypeList=res.data.data;
}
},
err => {}
);
},
getPropertyType(){
this.apipost(
"FinancialFlowTemplate_post_GetPropertyTypeList",
......@@ -884,7 +909,8 @@ export default {
this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
this.addMsg.PropertyType= data.PropertyType;
this.addMsg.PortTypeList = data.PortType!=''?data.PortType.split(','):[];
this.addMsg.PortType= data.PortType;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
......@@ -972,6 +998,11 @@ export default {
}
},
saveApproval(){ // 保存数据
if(this.addMsg.PortTypeList&&this.addMsg.PortTypeList.length>0){
this.addMsg.PortType = this.addMsg.PortTypeList.join(',')
}else{
this.addMsg.PortType = ''
}
if(this.xingzhenState){
if(!this.addMsg.PropertyType || this.addMsg.PropertyType=='' ){
this.Error("请选择审批类型!");
......@@ -1058,6 +1089,8 @@ export default {
this.addMsg.TemplateSorce=2;
}
this.addMsg = {
PortTypeList: this.addMsg.PortTypeList,
PortType: this.addMsg.PortType,
PropertyType:'',
Id:this.addMsg.Id,
Name:this.addMsg.Name,
......
This diff is collapsed.
......@@ -41,6 +41,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(1,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(1,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -100,6 +101,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(2,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(2,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(2,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -159,6 +161,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(3,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(3,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(3,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -218,6 +221,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(5,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(5,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(5,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -278,6 +282,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button"
class="normalBtn" value="新增收款" @click="goUrl(14,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(14,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -339,13 +344,25 @@
</el-carousel-item>
</el-carousel>
</div>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
</div>
</template>
<script>
import offset from '../../public/offset.vue';
export default {
components: { offset },
data() {
return {
Handmsg: {
OtherType: 7,
ReFinanceId: 0,
Rate: 0,
TCNUM: '',
czState: true,
},
queryObj:null,
cdState: false,
LineId:0,
picIsShow: false,
picObj: [],
......@@ -363,6 +380,53 @@
}
},
methods: {
isOffset(_orderSource, _type){
this.goUrl(_orderSource, _type,'Offset')
},
// 制作单据
makeAdocument(row, index, num, name,Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据,再制成本或退款单据!')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
}else{
type = num
}
this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num;
if (name == "Hand") {
this.BillMakingMsg.OtherType = 62;
} else {
this.BillMakingMsg.OtherType = 61;
}
let text = "";
let query = {};
if (num == 1) {
text = "收款";
} else if (num == 2) {
text = "付款";
}
query = {
blank: "y",
tab: `新增${text}单据`,
Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg),
};
this.queryObj = query
if(!Offset){
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
});
}
},
//跳转到财务页面
goFinaceURL(id) {
this.$router.push({
......@@ -438,7 +502,7 @@
})
this.picIsShow = true;
},
goUrl(_orderSource, _type) {
goUrl(_orderSource, _type,Offset) {
let TCIDARR = []
let id = [];
if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId){
......@@ -480,6 +544,25 @@
TCIDList: TCIDARR
}
id = id.length > 0 ? JSON.stringify(id) : null;
// 冲抵
if(Offset){
orderObj.TCIDList = [this.$route.query.id]
let query = {
'czmsg': this.Handmsg,
'Type': _type,
'path': 'teamRevenueExpenditure',
'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
'searchTitle': '分摊'
};
this.queryObj = query
this.cdState = true
return
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
......
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