|
@@ -37,9 +37,21 @@
|
|
|
</el-col>
|
|
|
<el-col :span="fold?6:8">
|
|
|
<el-form-item label="委托人">
|
|
|
- <el-input placeholder="请输入委托人" clearable
|
|
|
- size="small" style="width:100%" v-model="query.corpCnName">
|
|
|
- </el-input>
|
|
|
+ <!--<el-input placeholder="请输入委托人" clearable-->
|
|
|
+ <!-- size="small" style="width:100%" v-model="query.corpCnName">-->
|
|
|
+ <!--</el-input>-->
|
|
|
+ <search-query :datalist="corpData"
|
|
|
+ :selectValue="query.corpCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ placeholder="请输入委托人"
|
|
|
+ @remoteMethod="corpBcorpslistByType"
|
|
|
+ @corpChange="corpChange($event,'corpCnName')"
|
|
|
+ @corpFocus="corpBcorpslistByType" >
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="fold?6:8" >
|
|
@@ -227,9 +239,18 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-show="fold">
|
|
|
<el-form-item label="创建部门">
|
|
|
- <el-input placeholder="请输入创建部门" clearable
|
|
|
- size="small" style="width:100%" v-model="query.createDeptName">
|
|
|
- </el-input>
|
|
|
+ <!--<el-input placeholder="请输入创建部门" clearable-->
|
|
|
+ <!-- size="small" style="width:100%" v-model="query.createDeptName">-->
|
|
|
+ <!--</el-input>-->
|
|
|
+ <tree-select v-model="query.createDeptName" filterable
|
|
|
+ :data="createDeptData"
|
|
|
+ :props="{}"
|
|
|
+ nodeKey="title"
|
|
|
+ size="small"
|
|
|
+ :multiple="false"
|
|
|
+ placeholder="请选择创建部门"
|
|
|
+ @input="corpChange($event,'createDeptName')">
|
|
|
+ </tree-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-show="fold">
|
|
@@ -267,9 +288,21 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6" v-show="fold">
|
|
|
<el-form-item label="收货人">
|
|
|
- <el-input placeholder="请输入收货人" clearable
|
|
|
- size="small" style="width:100%" v-model="query.hConsigneeCnName">
|
|
|
- </el-input>
|
|
|
+ <!--<el-input placeholder="请输入收货人" clearable-->
|
|
|
+ <!-- size="small" style="width:100%" v-model="query.hConsigneeCnName">-->
|
|
|
+ <!--</el-input>-->
|
|
|
+ <search-query :datalist="hConsigneeData"
|
|
|
+ :selectValue="query.hConsigneeCnName"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :buttonIf="false"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ placeholder="请选择收货人"
|
|
|
+ @remoteMethod="hConsigneeBcorpslistByType"
|
|
|
+ @corpChange="corpChange($event,'hConsigneeCnName')"
|
|
|
+ @corpFocus="hConsigneeBcorpslistByType" >
|
|
|
+ </search-query>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -432,15 +465,19 @@ import {getBvesselsList} from "@/api/iosBasicData/bvessels";
|
|
|
import {getBcorpslistByType,getBcorpsDetail} from "@/api/iosBasicData/bcorps";
|
|
|
import {bportsList} from "@/api/iosBasicData/bports";
|
|
|
import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
+import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
|
|
|
+import { getDeptTree } from "@/api/system/dept";
|
|
|
|
|
|
export default {
|
|
|
- components:{SearchQuery, feesTemplateItems, billsDetails,SplitList},
|
|
|
+ components:{TreeSelect, SearchQuery, feesTemplateItems, billsDetails,SplitList},
|
|
|
data() {
|
|
|
return {
|
|
|
ediData:[], // 获取的 edi 数据
|
|
|
// 展开和收回
|
|
|
fold:false,
|
|
|
maxShow:3,
|
|
|
+ corpData:[], //委托人
|
|
|
+ hConsigneeData:[], // 收货人
|
|
|
// 船名
|
|
|
vesselData:[],
|
|
|
// 船公司
|
|
@@ -453,6 +490,7 @@ import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
cyData:[],
|
|
|
// 订舱代理
|
|
|
bookingAgentData:[],
|
|
|
+ coluaccDeptData:[], // 部门数据
|
|
|
// 单据类型
|
|
|
billTypeData:[
|
|
|
{
|
|
@@ -1130,6 +1168,18 @@ import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
handleClick(tab, event){
|
|
|
this.onLoad(this.page, this.query);
|
|
|
},
|
|
|
+ // 获取委托人数据
|
|
|
+ corpBcorpslistByType(cnName){
|
|
|
+ getBcorpslistByType(1,10,{cnName}).then(res=>{
|
|
|
+ this.corpData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取收货人数据
|
|
|
+ hConsigneeBcorpslistByType(cnName){
|
|
|
+ getBcorpslistByType(1,10,{cnName}).then(res=>{
|
|
|
+ this.hConsigneeData = res.data.data.records
|
|
|
+ })
|
|
|
+ },
|
|
|
// 获取船名
|
|
|
vesselBvesselsListfun(enName){
|
|
|
getBvesselsList(1,10,{enName}).then(res=>{
|
|
@@ -1169,6 +1219,12 @@ import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
this.bookingAgentData = res.data.data.records
|
|
|
})
|
|
|
},
|
|
|
+ // 获取核算部分数据 // 机构管理接口
|
|
|
+ coluaccDeptLzylistfun(){
|
|
|
+ getDeptTree().then(res=>{
|
|
|
+ this.coluaccDeptData = res.data.data
|
|
|
+ })
|
|
|
+ },
|
|
|
// 获取业务状态字典数据
|
|
|
billStatusWorkDictsfun(){
|
|
|
getWorkDicts('bill_status').then(res=>{
|
|
@@ -1393,6 +1449,23 @@ import {blinesList} from "@/api/iosBasicData/blines";
|
|
|
this.$message.warning("请选择至少一条数据");
|
|
|
return;
|
|
|
}
|
|
|
+ // 已经提交请核的提示不让删除
|
|
|
+ let sumArr = []
|
|
|
+ const h = this.$createElement
|
|
|
+ for (let item of this.selectionList) {
|
|
|
+ if (item.status == 1) {
|
|
|
+ sumArr.push(h('p', `序号${item.$index + 1}的数据已经提交请核请勿删除`))
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(sumArr.length != 0) {
|
|
|
+ this.$confirm('提示', {
|
|
|
+ message:h('div', sumArr),
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.$confirm("确定将选择数据删除?", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|