Commit 4de35dd8 authored by youjie's avatar youjie

no message

parent 95b97307
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
let opContents = x.querySelectorAll(".query-box ul li"); let opContents = x.querySelectorAll(".query-box ul li");
if (opContents && opContents.length > 0) { if (opContents && opContents.length > 0) {
this.navWidth = document.querySelector(".flexParent").offsetWidth - opContents[opContents this.navWidth = document.querySelector(".flexParent").offsetWidth - opContents[opContents
.length - 1].offsetWidth - 50 .length - 1].offsetWidth - 160
} else { } else {
this.navWidth = document.querySelector(".flexParent").offsetWidth - 20; this.navWidth = document.querySelector(".flexParent").offsetWidth - 20;
} }
......
...@@ -233,8 +233,10 @@ ...@@ -233,8 +233,10 @@
</tr> </tr>
</table> </table>
<p class="sfd_tit clearfix">付款单 <p class="sfd_tit clearfix">付款单
<!-- <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="预付款冲抵" class="normalBtn" @click="OpenOrder2(2,'Offset')"> -->
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2)"> <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2)"></p> <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2)">
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable"> <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr> <tr>
<th width="100">单号</th> <th width="100">单号</th>
...@@ -363,12 +365,20 @@ ...@@ -363,12 +365,20 @@
<el-button size="mini" style="background:#E95252;color:#fff;border:none" @click="addFinancialOrder">确 定</el-button> <el-button size="mini" style="background:#E95252;color:#fff;border:none" @click="addFinancialOrder">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 预付款冲抵 -->
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"
@success="cdState=false,dialogVisible=false"></offset>
</div> </div>
</template> </template>
<script> <script>
import offset from '../public/offset.vue';
export default { export default {
components: { offset },
data() { data() {
return { return {
Offset:null,
queryObj:null,
cdState: false,
qjGroupId:-1, qjGroupId:-1,
F_Finance_Create:false,//制单权限 F_Finance_Create:false,//制单权限
userInfo:{}, userInfo:{},
...@@ -514,7 +524,12 @@ export default { ...@@ -514,7 +524,12 @@ export default {
} }
}, null) }, null)
}, },
OpenOrder2(num){ OpenOrder2(num,Offset){
if(Offset){
this.Offset = Offset
}else{
this.Offset = null
}
this.checkd=false; this.checkd=false;
this.checkList=[]; this.checkList=[];
this.checkListAll=[]; this.checkListAll=[];
...@@ -579,30 +594,54 @@ export default { ...@@ -579,30 +594,54 @@ export default {
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR TCIDList: TCIDARR
} }
if (this.type === 1) { // if (this.type === 1) {
this.$router.push({ // this.$router.push({
name: 'ChoiceAddFinancialDocuments', // name: 'ChoiceAddFinancialDocuments',
query:{ // query:{
"Type": 1, // "Type": 1,
"companyID": this.OutBranchId, // "companyID": this.OutBranchId,
"path": "", // "path": "",
'blank': 'y', // 'blank': 'y',
'orderObj': JSON.stringify(orderObj) // 'orderObj': JSON.stringify(orderObj)
} // }
}); // });
// this.dialogVisible=false;
// } else if (this.type === 2) {
// this.$router.push({
// name: 'ChoiceAddFinancialDocuments',
// query:{
// "Type": 2,
// "companyID": this.OutBranchId,
// "path": "",
// 'blank': 'y',
// 'orderObj': JSON.stringify(orderObj)
// }
// });
// }
if(!this.Offset){
this.dialogVisible=false; this.dialogVisible=false;
} else if (this.type === 2) {
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query:{
"Type": 2, "Type": this.type,
"companyID": this.OutBranchId, "companyID": this.OutBranchId,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj)
} }
}); });
this.dialogVisible=false; }else{
let query = {};
query = {
path: 'SaleOrderModule',
companyID: this.OutBranchId,
visaType: true,
blank: 'y',
orderObj: JSON.stringify(orderObj),
Type: this.type,
}
this.queryObj = query
this.cdState = true
} }
}, },
......
...@@ -153,8 +153,9 @@ ...@@ -153,8 +153,9 @@
this.queryObj.orderObj = JSON.stringify(this.tradeObj) this.queryObj.orderObj = JSON.stringify(this.tradeObj)
} }
let query = this.queryObj let query = this.queryObj
this.$emit('success')
this.close() this.close()
this.$store.commit("ChoiceAddFinancialDocuments"); // this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({ this.$router.push({
path: "/ChoiceAddFinancialDocuments", path: "/ChoiceAddFinancialDocuments",
query 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