Skip to content

S
SuperMan
Commit 443c9397 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 364fdd29 13f1dc04
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 38 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 443c9397
...@@ -352,6 +352,19 @@ ...@@ -352,6 +352,19 @@
color: #3980C8; color: #3980C8;
font-size: 12px; font-size: 12px;
} }
.FD_remark_list{
margin-top:10px;
color:#E95252;
}
.FD_remark_list span:first-child{
display: inline-block;
width:26px;
vertical-align: top;
}
.FD_remark_list span:last-child{
display: inline-block;
width:90%;
}
</style> </style>
<template> <template>
...@@ -772,6 +785,21 @@ ...@@ -772,6 +785,21 @@
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer"> <viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src"> <img v-for="src in images" :src="src" :key="src">
</viewer> </viewer>
<el-dialog custom-class='w400' title="提示" :visible.sync="finacialDialog" center>
<template>
<el-input type="textarea" v-model="AuditOrRefundMsg.Description" rows="3" resize="none"></el-input>
<div class="FD_remark_list">
<span>注：</span>
<span>驳回后，单据将重新开始审批流程。备注内容将在操作日志里显示</span>
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="finacialDialog=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="setBoHui()">{{$t('pub.sureBtn')}}</button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -790,6 +818,8 @@ import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue"; ...@@ -790,6 +818,8 @@ import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
//驳回弹窗
finacialDialog:false,
ZhiDanRen: -1, ZhiDanRen: -1,
imageOptions:{ imageOptions:{
navbar:false, navbar:false,
...@@ -808,6 +838,7 @@ export default { ...@@ -808,6 +838,7 @@ export default {
}, },
AuditOrRefundMsg:{ AuditOrRefundMsg:{
WorkFlowId:'', WorkFlowId:'',
Description:''
}, },
AuditListData:{ AuditListData:{
AuditList:[] AuditList:[]
...@@ -951,30 +982,20 @@ export default { ...@@ -951,30 +982,20 @@ export default {
}, null) }, null)
}, },
bohui(){ bohui(){
this.AuditOrRefundMsg.WorkFlowId = this.ID; this.finacialDialog = true;
this.$confirm('是否驳回单号'+'“'+this.ID+'”'+'的单据？驳回后，单据将重新开始审批流程。', '提示', { this.AuditOrRefundMsg.WorkFlowId = this.ID;
confirmButtonText: '确定', },
cancelButtonText: '取消', //确定驳回
type: 'warning' setBoHui(){
}).then(() => {
this.apipost('Financial_post_PersonRefund',this.AuditOrRefundMsg,res=>{ this.apipost('Financial_post_PersonRefund',this.AuditOrRefundMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.$message.success(res.data.message); this.Success(res.data.message);
let _this = this; this.finacialDialog = false;
setTimeout(function () { this.Financial_post_GetDetail(this.ID)
_this.MsgBus.$emit('msg','close');
},500)
}else{ }else{
this.resultCode = res.data.resultCode; this.Error(res.data.message);
this.$message.error(res.data.message);
} }
},err=>{}) },err=>{})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
}, },
goPrintPage(type,id,Merge,OrderSource){ goPrintPage(type,id,Merge,OrderSource){
if(type===1){ if(type===1){
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 443c9397
...@@ -907,6 +907,14 @@ export default { ...@@ -907,6 +907,14 @@ export default {
this.transactionDate[0]=this.$route.query.StartDate; this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate; this.transactionDate[1]=this.$route.query.StartDate;
} }
if(this.$route.query.air){
this.msg.AccountType=17;
this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=20;
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
}
},components: { },components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
...@@ -1167,7 +1175,7 @@ export default { ...@@ -1167,7 +1175,7 @@ export default {
} }
accountList.push(obj) accountList.push(obj)
}) })
this.accountList = accountList this.accountList = accountList;
} }
}, err => {}) }, err => {})
} }
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 443c9397
...@@ -647,6 +647,7 @@ Vue.component("TCIDJump", { ...@@ -647,6 +647,7 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
</div> </div>
`, `,
...@@ -679,12 +680,13 @@ Vue.component("TCIDJump", { ...@@ -679,12 +680,13 @@ Vue.component("TCIDJump", {
Vue.component("TCNUMJump", { Vue.component("TCNUMJump", {
// 团队跳转 // 团队跳转
template: `<div> template: `<div>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===2" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
</div>`, </div>`,
props: { props: {
rowData: { rowData: {
...@@ -715,6 +717,17 @@ Vue.component("TCNUMJump", { ...@@ -715,6 +717,17 @@ Vue.component("TCNUMJump", {
query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"} query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"}
}); });
}, },
goAIR(path,rowData){
let StartDate="";
if(rowData.TCNUM.indexOf('AIR')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
this.$router.push({
path: "/" + path,
query: {'air':'air','StartDate':StartDate,"BankID":17,blank: "y"}
});
},
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 443c9397
...@@ -316,9 +316,9 @@ ...@@ -316,9 +316,9 @@
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"><el-input v-model="da.Number" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input> <el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice')" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-select filterable v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
...@@ -354,10 +354,10 @@ ...@@ -354,10 +354,10 @@
<input v-model="detailList.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input> <input v-model="detailList.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td> <td>
<el-input v-model="detailList.Number" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<input v-model="detailList.UnitPrice" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input> <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice')" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
......
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @ 443c9397
...@@ -265,9 +265,9 @@ ...@@ -265,9 +265,9 @@
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"><el-input v-model="da.Number" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input> <el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice')" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-select filterable v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
...@@ -328,10 +328,10 @@ ...@@ -328,10 +328,10 @@
<input v-model="detailList.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input> <input v-model="detailList.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td> <td>
<el-input v-model="detailList.Number" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<input v-model="detailList.UnitPrice" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input> <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice')" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CurrencyId,1),addList(1)" class=" _border_b_1"> <el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 443c9397
...@@ -233,9 +233,9 @@ ...@@ -233,9 +233,9 @@
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"><el-input v-model="da.Number" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px"> <td height="26px">
<input v-model="da.UnitPrice" type="text" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input> <el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice')" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<span class="w80">{{da.currenName}}</span> <span class="w80">{{da.currenName}}</span>
...@@ -264,10 +264,10 @@ ...@@ -264,10 +264,10 @@
<input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input> <input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td> <td>
<el-input v-model="detailList.Number" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<input v-model="detailList.UnitPrice" type="text" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input> <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice')" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
<span class="w110">{{detailList.currenName}}</span> <span class="w110">{{detailList.currenName}}</span>
......
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