|
@@ -5,6 +5,8 @@
|
|
|
:data="data"
|
|
|
:page.sync="page"
|
|
|
:permission="permissionList"
|
|
|
+ id="out-table"
|
|
|
+ :header-cell-class-name="headerClassName"
|
|
|
:before-open="beforeOpen"
|
|
|
v-model="form"
|
|
|
ref="crud"
|
|
@@ -17,28 +19,124 @@
|
|
|
@current-change="currentChange"
|
|
|
@size-change="sizeChange"
|
|
|
@refresh-change="refreshChange"
|
|
|
+ @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 292)"
|
|
|
+ @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 292)"
|
|
|
@on-load="onLoad">
|
|
|
<template slot="menuLeft">
|
|
|
<el-button type="danger"
|
|
|
size="small"
|
|
|
icon="el-icon-delete"
|
|
|
plain
|
|
|
- v-if="permission.blines_delete"
|
|
|
@click="handleDelete">删 除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
+ <template slot="remarks" slot-scope="scope">
|
|
|
+ <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
|
|
|
+ <small slot="more">...</small>
|
|
|
+ </avue-text-ellipsis>
|
|
|
+ </template>
|
|
|
+ <template slot="carrierNameForm">
|
|
|
+ <search-query ref="SearchQuery"
|
|
|
+ :datalist="carrierData"
|
|
|
+ title="船公司"
|
|
|
+ :filterable="true"
|
|
|
+ :clearable="true"
|
|
|
+ :remote="true"
|
|
|
+ :forParameter="{key:'id',label:'cnName',value:'cnName'}"
|
|
|
+ @remoteMethod="shippingCompanyfun" @corpChange="corpChange" >
|
|
|
+ 插槽
|
|
|
+ </search-query>
|
|
|
+ </template>
|
|
|
+ <template slot="extendedDataArr" slot-scope="scope">
|
|
|
+ <span style="color: #1e9fff" @click="extendedDataview(scope.row)">
|
|
|
+ {{scope.row.extendedDataArr.length}}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ <template slot-scope="{type,disabled,row}" slot="extendedDataArrForm">
|
|
|
+ <el-button type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="dialogVisible = true">EDI CODE
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+
|
|
|
</avue-crud>
|
|
|
+
|
|
|
+ <el-dialog
|
|
|
+ title="EDI CODE"
|
|
|
+ :visible.sync="dialogVisible"
|
|
|
+ width="50%"
|
|
|
+ append-to-body
|
|
|
+ :destroy-on-close="true"
|
|
|
+ :modal-append-to-body="false"
|
|
|
+ :before-close="handleClose">
|
|
|
+ <div>
|
|
|
+ <el-button type="primary"
|
|
|
+ size="small"
|
|
|
+ :disabled="extendedDisabled"
|
|
|
+ @click="extendedDataAdd">新增
|
|
|
+ </el-button>
|
|
|
+ <el-table
|
|
|
+ :data="form.extendedDataArr"
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="name"
|
|
|
+ label="名称">
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <el-input v-if="row.edit" size="mini" v-model="row.name" placeholder="请输入名称"></el-input>
|
|
|
+ <span v-else>{{row.name}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="value"
|
|
|
+ label="键值">
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <el-input v-if="row.edit" size="mini" v-model="row.value" placeholder="请输入键值"></el-input>
|
|
|
+ <span v-else>{{row.value}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="mini"
|
|
|
+ :disabled="extendedDisabled"
|
|
|
+ @click="extendedDataEdit(scope.$index, scope.row)">{{scope.row.edit?'保存':'编辑'}}</el-button>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ :disabled="extendedDisabled"
|
|
|
+ @click="extendedDataDelete(scope.$index, scope.row)">删除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="dialogVisible = false;extendedDisabled = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="dialogVisible = false;extendedDisabled = false">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
</basic-container>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- import {blinesList, blinesDetail, blinesSubmit, update, blinesRemove} from "@/api/iosBasicData/blines";
|
|
|
+ import {blinesList, blinesDetail, blinesSubmit, blinesRemove} from "@/api/iosBasicData/blines";
|
|
|
import {mapGetters} from "vuex";
|
|
|
+ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
|
|
|
|
|
|
export default {
|
|
|
+ components: { SearchQuery},
|
|
|
data() {
|
|
|
return {
|
|
|
- form: {},
|
|
|
+ // 船公司数据
|
|
|
+ carrierData:[],
|
|
|
+ // 扩展数据弹窗
|
|
|
+ dialogVisible:false,
|
|
|
+ extendedDisabled:false,
|
|
|
+
|
|
|
+ form: {
|
|
|
+ extendedDataArr:[],
|
|
|
+ },
|
|
|
query: {},
|
|
|
loading: true,
|
|
|
page: {
|
|
@@ -47,7 +145,8 @@
|
|
|
total: 0
|
|
|
},
|
|
|
selectionList: [],
|
|
|
- option: {
|
|
|
+ option:{},
|
|
|
+ optionBack: {
|
|
|
height:'auto',
|
|
|
calcHeight: 30,
|
|
|
tip: false,
|
|
@@ -60,87 +159,6 @@
|
|
|
dialogClickModal: false,
|
|
|
column: [
|
|
|
{
|
|
|
- label: "主键",
|
|
|
- prop: "id",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入主键",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "创建人 Id",
|
|
|
- prop: "createUser",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入创建人 Id",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "创建人",
|
|
|
- prop: "createUserName",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入创建人",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "创建部门 Id",
|
|
|
- prop: "createDept",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入创建部门 Id",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "创建部门",
|
|
|
- prop: "createDeptName",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入创建部门",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "创建时间",
|
|
|
- prop: "createTime",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入创建时间",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "修改人 Id",
|
|
|
- prop: "updateUser",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入修改人 Id",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "修改人",
|
|
|
- prop: "updateUserName",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入修改人",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "修改时间",
|
|
|
- prop: "updateTime",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入修改时间",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
label: "航线编码",
|
|
|
prop: "code",
|
|
|
rules: [{
|
|
@@ -170,65 +188,119 @@
|
|
|
{
|
|
|
label: "船公司 Id",
|
|
|
prop: "carrierId",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入船公司 Id",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ // rules: [{
|
|
|
+ // required: true,
|
|
|
+ // message: "请输入船公司 Id",
|
|
|
+ // trigger: "blur"
|
|
|
+ // }]
|
|
|
},
|
|
|
{
|
|
|
label: "船公司名称",
|
|
|
prop: "carrierName",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入船公司名称",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ width:100,
|
|
|
+ formslot:true,
|
|
|
+ // rules: [{
|
|
|
+ // required: true,
|
|
|
+ // message: "请输入船公司名称",
|
|
|
+ // trigger: "blur"
|
|
|
+ // }]
|
|
|
},
|
|
|
{
|
|
|
label: "扩展数据",
|
|
|
- prop: "extendedData",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入JSON 对象数组,用于不查询的扩展数据, 例如:[{name: key1, value: value1}]",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ prop: "extendedDataArr",
|
|
|
+ formslot:true,
|
|
|
+ // rules: [{
|
|
|
+ // required: true,
|
|
|
+ // message: "请输入JSON 对象数组,用于不查询的扩展数据, 例如:[{name: key1, value: value1}]",
|
|
|
+ // trigger: "blur"
|
|
|
+ // }]
|
|
|
},
|
|
|
{
|
|
|
label: "版本",
|
|
|
prop: "version",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入版本",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
},
|
|
|
{
|
|
|
- label: "状态(0 正常 1停用)",
|
|
|
+ label: "状态",
|
|
|
prop: "status",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入状态(0 正常 1停用)",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ type:'select',
|
|
|
+ dicData:[{
|
|
|
+ label:'启用',
|
|
|
+ value:0
|
|
|
+ },{
|
|
|
+ label:'停用',
|
|
|
+ value:1
|
|
|
+ }],
|
|
|
},
|
|
|
{
|
|
|
label: "是否已删除(0 否 1是)",
|
|
|
prop: "isDeleted",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入是否已删除(0 否 1是)",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
},
|
|
|
+ {
|
|
|
+ label: "主键",
|
|
|
+ prop: "id",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "创建人 Id",
|
|
|
+ prop: "createUser",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "创建人",
|
|
|
+ prop: "createUserName",
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "创建部门 Id",
|
|
|
+ prop: "createDept",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "创建部门",
|
|
|
+ prop: "createDeptName",
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "创建时间",
|
|
|
+ prop: "createTime",
|
|
|
+ width: 160,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改人 Id",
|
|
|
+ prop: "updateUser",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改人",
|
|
|
+ prop: "updateUserName",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改时间",
|
|
|
+ prop: "updateTime",
|
|
|
+ width: 160,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
{
|
|
|
label: "备注",
|
|
|
prop: "remarks",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入备注",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ span:24,
|
|
|
+ type: 'textarea',
|
|
|
+ width: "180",
|
|
|
+ slot: true,
|
|
|
+
|
|
|
},
|
|
|
]
|
|
|
},
|
|
@@ -239,10 +311,10 @@
|
|
|
...mapGetters(["permission"]),
|
|
|
permissionList() {
|
|
|
return {
|
|
|
- addBtn: this.vaildData(this.permission.blines_add, false),
|
|
|
- viewBtn: this.vaildData(this.permission.blines_view, false),
|
|
|
- delBtn: this.vaildData(this.permission.blines_delete, false),
|
|
|
- editBtn: this.vaildData(this.permission.blines_edit, false)
|
|
|
+ // addBtn: this.vaildData(this.permission.blines_add, false),
|
|
|
+ // viewBtn: this.vaildData(this.permission.blines_view, false),
|
|
|
+ // delBtn: this.vaildData(this.permission.blines_delete, false),
|
|
|
+ // editBtn: this.vaildData(this.permission.blines_edit, false)
|
|
|
};
|
|
|
},
|
|
|
ids() {
|
|
@@ -253,8 +325,63 @@
|
|
|
return ids.join(",");
|
|
|
}
|
|
|
},
|
|
|
+ async created() {
|
|
|
+ this.option = await this.getColumnData(this.getColumnName(292), this.optionBack);
|
|
|
+ },
|
|
|
methods: {
|
|
|
+ // 扩展数据表格点击查询详情
|
|
|
+ extendedDataview(row){
|
|
|
+ this.form = row
|
|
|
+ this.extendedDisabled = true
|
|
|
+ this.dialogVisible = true
|
|
|
+ },
|
|
|
+ // 扩展数据弹窗关闭
|
|
|
+ handleClose(done){
|
|
|
+ this.$confirm('确认关闭?')
|
|
|
+ .then(_ => {
|
|
|
+ done();
|
|
|
+ })
|
|
|
+ .catch(_ => {});
|
|
|
+ },
|
|
|
+ // 扩展数据添加
|
|
|
+ extendedDataAdd(){
|
|
|
+ this.form.extendedDataArr.map(item=>{
|
|
|
+ item.edit = false
|
|
|
+ })
|
|
|
+ this.form.extendedDataArr.push({
|
|
|
+ edit:true
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 扩展数据编辑
|
|
|
+ extendedDataEdit(index,row) {
|
|
|
+ row.edit = !row.edit
|
|
|
+ },
|
|
|
+ // 扩展数据删除
|
|
|
+ extendedDataDelete(index,row) {
|
|
|
+ this.form.extendedDataArr.splice(index,1)
|
|
|
+ },
|
|
|
+
|
|
|
+ // 获取船公司数据
|
|
|
+ shippingCompanyfun(cnName){
|
|
|
+ // getBunitsList(1, 10,{cnName}).then(res=>{
|
|
|
+ // this.unitNoData = res.data.data.records
|
|
|
+ // })
|
|
|
+ },
|
|
|
+ // 船公司选中的回调
|
|
|
+ corpChange(value){
|
|
|
+ // for(let item of this.unitNoData) {
|
|
|
+ // if (item.id == value) {
|
|
|
+ // this.form.unitNo = item.cnName
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ },
|
|
|
+
|
|
|
rowSave(row, done, loading) {
|
|
|
+ row.extendedDataArr.map(item=>{
|
|
|
+ delete item.edit
|
|
|
+ })
|
|
|
+ row.extendedData = JSON.stringify(row.extendedDataArr)
|
|
|
+ delete row.extendedDataArr
|
|
|
blinesSubmit(row).then(() => {
|
|
|
this.onLoad(this.page);
|
|
|
this.$message({
|
|
@@ -268,7 +395,12 @@
|
|
|
});
|
|
|
},
|
|
|
rowUpdate(row, index, done, loading) {
|
|
|
- update(row).then(() => {
|
|
|
+ row.extendedDataArr.map(item=>{
|
|
|
+ delete item.edit
|
|
|
+ })
|
|
|
+ row.extendedData = JSON.stringify(row.extendedDataArr)
|
|
|
+ delete row.extendedDataArr
|
|
|
+ blinesSubmit(row).then(() => {
|
|
|
this.onLoad(this.page);
|
|
|
this.$message({
|
|
|
type: "success",
|
|
@@ -362,10 +494,54 @@
|
|
|
this.loading = false;
|
|
|
this.selectionClear();
|
|
|
});
|
|
|
- }
|
|
|
+ },
|
|
|
+ //自定义列保存
|
|
|
+ async saveColumnTwo(ref, option, optionBack, code) {
|
|
|
+ /**
|
|
|
+ * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
|
|
|
+ * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
|
|
|
+ * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
|
|
|
+ */
|
|
|
+ const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
|
|
|
+ if (inSave) {
|
|
|
+ this.$message.success("保存成功");
|
|
|
+ //关闭窗口
|
|
|
+ this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //自定义列重置
|
|
|
+ async resetColumnTwo(ref, option, optionBack, code) {
|
|
|
+ this[option] = this[optionBack];
|
|
|
+ const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
|
|
|
+ if (inSave) {
|
|
|
+ this.$message.success("重置成功");
|
|
|
+ this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 更改表格颜色
|
|
|
+ headerClassName(tab){
|
|
|
+ //颜色间隔
|
|
|
+ let back = ""
|
|
|
+ if (tab.columnIndex >= 0 && tab.column.level === 1) {
|
|
|
+ if (tab.columnIndex % 2 === 0) {
|
|
|
+ back = "back-one"
|
|
|
+ } else if (tab.columnIndex % 2 === 1) {
|
|
|
+ back = "back-two"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return back;
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style>
|
|
|
+<style scoped>
|
|
|
+::v-deep#out-table .back-one {
|
|
|
+ background: #ecf5ff !important;
|
|
|
+}
|
|
|
+::v-deep#out-table .back-two {
|
|
|
+ background: #ecf5ff !important;
|
|
|
+}
|
|
|
</style>
|