|
@@ -196,7 +196,7 @@
|
|
size="mini"
|
|
size="mini"
|
|
type="text"
|
|
type="text"
|
|
@click="handleXp(scope.row)"
|
|
@click="handleXp(scope.row)"
|
|
- > {{ $t('续票预约') }}
|
|
|
|
|
|
+ > <span>续票预约</span>
|
|
</el-button>
|
|
</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -225,7 +225,7 @@
|
|
type="text"
|
|
type="text"
|
|
icon="el-icon-view"
|
|
icon="el-icon-view"
|
|
@click="billSee(scope.row)"
|
|
@click="billSee(scope.row)"
|
|
- > {{ $t('票据预览') }}
|
|
|
|
|
|
+ > 票据预览
|
|
</el-button>
|
|
</el-button>
|
|
<el-button
|
|
<el-button
|
|
v-if="scope.row.bookingworkticket.status== 3 && scope.row.xpxp == 10"
|
|
v-if="scope.row.bookingworkticket.status== 3 && scope.row.xpxp == 10"
|
|
@@ -233,7 +233,7 @@
|
|
type="text"
|
|
type="text"
|
|
icon="el-icon-download"
|
|
icon="el-icon-download"
|
|
@click="handleDownload(scope.row)"
|
|
@click="handleDownload(scope.row)"
|
|
- >{{ $t('下载申请单') }}
|
|
|
|
|
|
+ >下载申请单
|
|
</el-button>
|
|
</el-button>
|
|
<!-- <el-dropdown size="mini">-->
|
|
<!-- <el-dropdown size="mini">-->
|
|
<!-- <span class="el-dropdown-link" >其他操作<i class="el-icon-arrow-down el-icon--right" /></span>-->
|
|
<!-- <span class="el-dropdown-link" >其他操作<i class="el-icon-arrow-down el-icon--right" /></span>-->
|
|
@@ -413,7 +413,7 @@
|
|
<el-dialog v-loading="loadingFlash" element-loading-background="rgba(0,0,0,0.2)" v-dialogDrag :title="pdf.title"
|
|
<el-dialog v-loading="loadingFlash" element-loading-background="rgba(0,0,0,0.2)" v-dialogDrag :title="pdf.title"
|
|
:visible.sync="pdf.open" width="1300px" height="800px" :center="true" append-to-body>
|
|
:visible.sync="pdf.open" width="1300px" height="800px" :center="true" append-to-body>
|
|
<div style="margin-top: -60px;float: right;margin-right: 40px;">
|
|
<div style="margin-top: -60px;float: right;margin-right: 40px;">
|
|
- <el-button size="mini" type="text" @click="openPdf">{{ $t('新页面预览') }}</el-button>
|
|
|
|
|
|
+ <el-button size="mini" type="text" @click="openPdf">新页面预览</el-button>
|
|
</div>
|
|
</div>
|
|
<div style="margin-top: -30px">
|
|
<div style="margin-top: -30px">
|
|
<iframe id="iFrame" class="iframe-html" :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"
|
|
<iframe id="iFrame" class="iframe-html" :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"
|
|
@@ -559,6 +559,7 @@ import Treeselect from "@riophae/vue-treeselect";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
import AddApprove from "../approveinvoice/index"
|
|
import AddApprove from "../approveinvoice/index"
|
|
import {addInvoice} from "@/api/invoice/invoice";
|
|
import {addInvoice} from "@/api/invoice/invoice";
|
|
|
|
+import base from "@/assets/js/base";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "Bookingworkticket",
|
|
name: "Bookingworkticket",
|
|
@@ -1249,26 +1250,29 @@ export default {
|
|
},
|
|
},
|
|
// 预约续票
|
|
// 预约续票
|
|
handleXp(row) {
|
|
handleXp(row) {
|
|
- this.xpForm = row
|
|
|
|
|
|
+ this.xpForm = base.deepClone(row)
|
|
this.xpVisible = true
|
|
this.xpVisible = true
|
|
},
|
|
},
|
|
//提交预约续票
|
|
//提交预约续票
|
|
submitXp() {
|
|
submitXp() {
|
|
this.$refs["xpForm"].validate(valid => {
|
|
this.$refs["xpForm"].validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
- this.form = this.xpForm.bookingworkticket
|
|
|
|
- this.form.tInvoiceWorkcontentList = []
|
|
|
|
|
|
+ let newForm = {}
|
|
|
|
+ newForm = this.xpForm.bookingworkticket
|
|
|
|
+ newForm.tInvoiceWorkcontentList = []
|
|
this.xpForm.bookingworkticket = null
|
|
this.xpForm.bookingworkticket = null
|
|
- this.form.tInvoiceWorkcontentList[0] = this.xpForm
|
|
|
|
- this.form.workStartTime = this.xpForm.workStartTime
|
|
|
|
- this.form.tInvoiceWorkcontentList[0].xpxp = 12 //续票
|
|
|
|
- this.form.status = 0
|
|
|
|
- addBookingworkticket(this.form).then(response => {
|
|
|
|
|
|
+ newForm.tInvoiceWorkcontentList[0] = this.xpForm
|
|
|
|
+ newForm.workStartTime = this.xpForm.workStartTime
|
|
|
|
+ newForm.tInvoiceWorkcontentList[0].xpxp = 12 //续票
|
|
|
|
+ newForm.status = 0
|
|
|
|
+ addBookingworkticket(newForm).then(response => {
|
|
if (response.code == 500) {
|
|
if (response.code == 500) {
|
|
|
|
+ this.getList();
|
|
|
|
+ this.xpVisible = false
|
|
return
|
|
return
|
|
}
|
|
}
|
|
this.approveForm.invoiceId = response.data
|
|
this.approveForm.invoiceId = response.data
|
|
- this.approveForm.userSupId = this.form.userMg
|
|
|
|
|
|
+ this.approveForm.userSupId = newForm.userMg
|
|
addInvoice(this.approveForm).then(response => {
|
|
addInvoice(this.approveForm).then(response => {
|
|
this.msgSuccess("已提交申请");
|
|
this.msgSuccess("已提交申请");
|
|
this.getList();
|
|
this.getList();
|