|
|
@@ -19,6 +19,7 @@
|
|
|
<el-button size="small" type="warning" plain style="margin-right: 8px" :disabled="!form.id" v-if="form.status == '1'"
|
|
|
:loading="saveLoading" @click="revokeSettlementApprovefun">撤销申请
|
|
|
</el-button>
|
|
|
+ <span v-if="form.status == '3'" style="font-size: 12px;padding-right: 10px;" >申请通过</span>
|
|
|
<el-button size="small" type="primary" style="margin-right: 8px" :disabled="!(form.status == '0' || form.status == '4')" v-if="editSave"
|
|
|
:loading="saveLoading" @click="editHandle">编 辑
|
|
|
</el-button>
|
|
|
@@ -207,10 +208,19 @@
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
<el-form-item label="船 名" prop="vesselCnName" >
|
|
|
- <el-input style="width: 100%;" v-model="form.vesselCnName"
|
|
|
- size="small" autocomplete="off"
|
|
|
- :disabled="editSave"
|
|
|
- clearable placeholder="请选择船名" ></el-input>
|
|
|
+ <search-query :datalist="vesselData"
|
|
|
+ :selectValue="form.vesselCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :disabled="editSave"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ placeholder="请选择船名"
|
|
|
+ @remoteMethod="vesselBvesselsListfun"
|
|
|
+ @corpChange="corpChange($event,'vessel')"
|
|
|
+ @corpFocus="vesselBvesselsListfun" >
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
@@ -219,6 +229,7 @@
|
|
|
size="small" autocomplete="off"
|
|
|
:disabled="editSave"
|
|
|
clearable placeholder="请选择航次" ></el-input>
|
|
|
+
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="5">
|
|
|
@@ -366,6 +377,7 @@
|
|
|
import {reportsGetReportData} from "@/api/iosBasicData/reports";
|
|
|
import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
|
|
|
import {getList as getreportsList} from "@/api/iosBasicData/reports";
|
|
|
+ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
|
|
|
|
|
|
export default {
|
|
|
components: {reportContainer, reportformsList, reports, SearchQuery,expand,finstlbillsitems},
|
|
|
@@ -414,6 +426,7 @@
|
|
|
value:'SI'
|
|
|
}
|
|
|
],
|
|
|
+ vesselData:[], // 船名数据
|
|
|
rules: {
|
|
|
corpCnName: [
|
|
|
{required: true, message: '请输入付费对象', trigger: 'blur'},
|
|
|
@@ -576,6 +589,15 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ else if (name == 'vessel') {
|
|
|
+ for(let item of this.vesselData) {
|
|
|
+ if (item.cnName == value) {
|
|
|
+ this.$set(this.form,'vesselId',item.id)
|
|
|
+ this.$set(this.form,'vesselCnName',item.cnName)
|
|
|
+ this.$set(this.form,'vesselEnName',item.enName)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
else {
|
|
|
this.$set(this.form,name,value)
|
|
|
}
|
|
|
@@ -706,6 +728,9 @@
|
|
|
// 账单编号
|
|
|
item.accBillNo = item.billNo
|
|
|
item.currentStlCurCode = item.curCode // 币别
|
|
|
+ item.currentStlExrate = item.exrate // 汇率
|
|
|
+ // quantity
|
|
|
+ // quantityCntrTypesDescr
|
|
|
item.lineNo = Number(index) + 1
|
|
|
item.pType = item.businessType
|
|
|
item.billNo = item.businessBillDivideNo?item.businessBillDivideNo:item.businessBillNo
|
|
|
@@ -763,7 +788,7 @@
|
|
|
type: "warning"
|
|
|
}).then(()=>{
|
|
|
this.pageLoading = true
|
|
|
- this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
|
|
|
+ this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
|
|
|
settlementApprove(this.form).then(res=>{
|
|
|
this.pageLoading = false
|
|
|
this.$message.success('操作成功');
|
|
|
@@ -781,7 +806,7 @@
|
|
|
type: "warning"
|
|
|
}).then(()=>{
|
|
|
this.pageLoading = true
|
|
|
- this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
|
|
|
+ this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
|
|
|
revokeSettlementApprove(this.form).then(res=>{
|
|
|
this.pageLoading = false
|
|
|
this.$message.success('操作成功');
|
|
|
@@ -832,6 +857,12 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 船名
|
|
|
+ vesselBvesselsListfun(cnName){
|
|
|
+ getBvesselsList(1,10,{cnName}).then(res=>{
|
|
|
+ this.vesselData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
// 预览报表
|
|
|
handleReportPreview(url,data){
|
|
|
console.log(url,1670)
|
caojunjie