|
|
@@ -419,7 +419,7 @@
|
|
|
<div style="display: flex">
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
- size="small"
|
|
|
+ size="mini"
|
|
|
@click="reconciliation"
|
|
|
:disabled="notChange"
|
|
|
v-if="queryParams.fBillstatus < '4'"
|
|
|
@@ -427,18 +427,18 @@
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- size="small"
|
|
|
+ size="mini"
|
|
|
@click="confirmReconciliation"
|
|
|
:disabled="notChange"
|
|
|
v-if="queryParams.fBillstatus < '4'"
|
|
|
>确认对账</el-button
|
|
|
>
|
|
|
- <el-button type="warning" size="small" @click="handleExportItems"
|
|
|
+ <el-button type="warning" size="mini" @click="handleExportItems"
|
|
|
>导出</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="success"
|
|
|
- size="small"
|
|
|
+ size="mini"
|
|
|
@click="backrRconciliation"
|
|
|
v-if="queryParams.fBillstatus === '6'"
|
|
|
>撤销对账</el-button
|
|
|
@@ -446,12 +446,33 @@
|
|
|
<!-- <el-button type="info" size="small" @click="exportData">导出</el-button>-->
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
- size="small"
|
|
|
+ size="mini"
|
|
|
:disabled="disappear"
|
|
|
v-if="queryParams.fBillstatus === '4'"
|
|
|
@click="backApproval"
|
|
|
- >撤销审批</el-button
|
|
|
+ >撤销审批</el-button>
|
|
|
+ <el-button v-if="approve === true" size="mini" @click="goApproval">审批</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ v-if="queryParams.fBillstatus >= '3'"
|
|
|
+ @click="addOrUpdateHandle()"
|
|
|
+ >查看审批流</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="submitForm(typevalue)"
|
|
|
+ :disabled="notChange"
|
|
|
+ >保 存</el-button
|
|
|
+ >
|
|
|
+ <el-button v-if="cancelButton === true" size="mini" @click="cancel"
|
|
|
+ >返 回</el-button
|
|
|
+ >
|
|
|
+ <el-button v-if="cancelButton === false" size="mini" @click="homePage"
|
|
|
+ >返 回</el-button
|
|
|
+ >
|
|
|
+ <el-button @click="addPage" size="mini">新 增</el-button>
|
|
|
</div>
|
|
|
<div style="margin: 0 12px">
|
|
|
<el-button
|
|
|
@@ -640,25 +661,6 @@
|
|
|
ref="ApprovalComments"
|
|
|
@refreshDataList="returnData"
|
|
|
></approval-comments>
|
|
|
- <el-button v-if="approve === true" @click="goApproval">审批</el-button>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- v-if="queryParams.fBillstatus >= '3'"
|
|
|
- @click="addOrUpdateHandle()"
|
|
|
- >查看审批流</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- @click="submitForm(typevalue)"
|
|
|
- :disabled="notChange"
|
|
|
- >保 存</el-button
|
|
|
- >
|
|
|
- <el-button v-if="cancelButton === true" @click="cancel"
|
|
|
- >取 消</el-button
|
|
|
- >
|
|
|
- <el-button v-if="cancelButton === false" @click="homePage"
|
|
|
- >取消</el-button
|
|
|
- >
|
|
|
</div>
|
|
|
<!-- 添加或修改财务数据主对话框 -->
|
|
|
<el-dialog
|
|
|
@@ -1189,6 +1191,10 @@ export default {
|
|
|
value: "2",
|
|
|
label: "车队",
|
|
|
},
|
|
|
+ {
|
|
|
+ value: "3",
|
|
|
+ label: "船务",
|
|
|
+ },
|
|
|
],
|
|
|
typevalue: "",
|
|
|
tableDate: [
|
|
|
@@ -1587,6 +1593,16 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ addPage(){
|
|
|
+ MessageBox.confirm("是否已保存？",{
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }
|
|
|
+ ).then(()=> {
|
|
|
+ this.handleAdd()
|
|
|
+ })
|
|
|
+ },
|
|
|
full() {
|
|
|
this.dialogFull = !this.dialogFull;
|
|
|
},
|
|
|
@@ -1780,6 +1796,7 @@ export default {
|
|
|
fFeesName: "", //结算单位
|
|
|
fCorpid: "", //结算单位ID
|
|
|
};
|
|
|
+ console.log(this.approval)
|
|
|
getFee(this.approval.billId).then((response) => {
|
|
|
this.Operator = response.data.tFee.createBy;
|
|
|
if (response.data.feeDoList != 0) {
|
|
|
@@ -1953,6 +1970,7 @@ export default {
|
|
|
this.msgSuccess("操作成功");
|
|
|
this.getList();
|
|
|
});
|
|
|
+ this.handleAdd()
|
|
|
} else if (Cookies.get("sysType") == 2) {
|
|
|
confirmFleet(formDate).then((response) => {
|
|
|
this.open = false;
|
|
|
@@ -2806,7 +2824,7 @@ export default {
|
|
|
updateFee(formData).then((response) => {
|
|
|
console.log(response);
|
|
|
this.queryParams = response.data.tFee;
|
|
|
- this.queryParams.fSystemType = response.data.tFee.fsystemType;
|
|
|
+ // this.queryParams.fSystemType = response.data.tFee.fsystemType;
|
|
|
this.msgSuccess("新增成功");
|
|
|
// this.DzfeeList = []
|
|
|
// this.open = false;
|
wengyuwen