|
@@ -25,9 +25,20 @@
|
|
|
@on-load="onLoad">
|
|
|
<template slot="remarks" slot-scope="scope">
|
|
|
<avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
|
|
|
- <small slot="more">...</small>
|
|
|
+ <small slot="more">...</small>
|
|
|
</avue-text-ellipsis>
|
|
|
</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>
|
|
|
<template slot="menuLeft">
|
|
|
<el-button type="danger"
|
|
|
size="small"
|
|
@@ -37,6 +48,63 @@
|
|
|
</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>
|
|
|
|
|
@@ -47,7 +115,14 @@
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- form: {},
|
|
|
+ // 扩展数据弹窗
|
|
|
+ dialogVisible:false,
|
|
|
+
|
|
|
+ extendedDisabled:false,
|
|
|
+
|
|
|
+ form: {
|
|
|
+ extendedDataArr:[]
|
|
|
+ },
|
|
|
query: {},
|
|
|
loading: true,
|
|
|
page: {
|
|
@@ -64,6 +139,7 @@
|
|
|
tip: false,
|
|
|
searchShow: true,
|
|
|
searchMenuSpan: 6,
|
|
|
+ labelWidth:120,
|
|
|
border: true,
|
|
|
index: true,
|
|
|
viewBtn: true,
|
|
@@ -71,89 +147,9 @@
|
|
|
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: "箱型 ISO 代码,20GP,40HC etc.",
|
|
|
+ label: "箱型 ISO 代码",
|
|
|
prop: "code",
|
|
|
+ width: 100,
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
message: "请输入箱型 ISO 代码,20GP,40HC etc.",
|
|
@@ -161,7 +157,7 @@
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
- label: "箱型 95 码,22G1, 45R1 etc.",
|
|
|
+ label: "箱型 95 码",
|
|
|
prop: "code95",
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -179,7 +175,7 @@
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
- label: "箱型 GP, HC, COLOAD etc.",
|
|
|
+ label: "箱型 GP",
|
|
|
prop: "cntrType",
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -188,7 +184,7 @@
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
- label: "尺码 V20, V40, COLOAD etc.",
|
|
|
+ label: "尺码 V20",
|
|
|
prop: "cntrSize",
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -224,7 +220,7 @@
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
- label: "净重,即货重 KGS",
|
|
|
+ label: "净重",
|
|
|
prop: "netWeight",
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -233,7 +229,7 @@
|
|
|
}]
|
|
|
},
|
|
|
{
|
|
|
- label: "毛重,即最大总重 KGS",
|
|
|
+ label: "毛重",
|
|
|
prop: "grossWeight",
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -262,78 +258,130 @@
|
|
|
{
|
|
|
label: "是否普柜",
|
|
|
prop: "isGeneral",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入是否普柜",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ type:'select',
|
|
|
+ dicData:[{
|
|
|
+ label:'否',
|
|
|
+ value:0
|
|
|
+ },{
|
|
|
+ label:'是',
|
|
|
+ value:1
|
|
|
+ }],
|
|
|
},
|
|
|
{
|
|
|
label: "是否冻柜",
|
|
|
prop: "isReefer",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入是否冻柜",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ type:'select',
|
|
|
+ dicData:[{
|
|
|
+ label:'否',
|
|
|
+ value:0
|
|
|
+ },{
|
|
|
+ label:'是',
|
|
|
+ value:1
|
|
|
+ }],
|
|
|
},
|
|
|
{
|
|
|
label: "是否危柜",
|
|
|
prop: "isDanger",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入是否危柜",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ type:'select',
|
|
|
+ dicData:[{
|
|
|
+ label:'否',
|
|
|
+ value:0
|
|
|
+ },{
|
|
|
+ label:'是',
|
|
|
+ value:1
|
|
|
+ }],
|
|
|
},
|
|
|
{
|
|
|
- label: "JSON 对象数组,用于不查询的扩展数据",
|
|
|
- prop: "extendedData",
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入JSON 对象数组,用于不查询的扩展数据, 例如:[{name: key1, value: value1}]",
|
|
|
- trigger: "blur"
|
|
|
- }]
|
|
|
+ label: "扩展数据",
|
|
|
+ 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"
|
|
|
- }]
|
|
|
- },
|
|
|
- {
|
|
|
- label: "备注",
|
|
|
- prop: "remarks",
|
|
|
- type: 'textarea',
|
|
|
- width: "180",
|
|
|
- slot: true,
|
|
|
- rules: [{
|
|
|
- required: true,
|
|
|
- message: "请输入备注",
|
|
|
- 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",
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改人 Id",
|
|
|
+ prop: "updateUser",
|
|
|
+ hide:true,
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改人",
|
|
|
+ prop: "updateUserName",
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "修改时间",
|
|
|
+ prop: "updateTime",
|
|
|
+ display:false,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "备注",
|
|
|
+ prop: "remarks",
|
|
|
+ span:24,
|
|
|
+ type: 'textarea',
|
|
|
+ width: "180",
|
|
|
+ slot: true,
|
|
|
+ },
|
|
|
]
|
|
|
},
|
|
|
data: []
|
|
@@ -343,10 +391,10 @@
|
|
|
...mapGetters(["permission"]),
|
|
|
permissionList() {
|
|
|
return {
|
|
|
- addBtn: this.vaildData(this.permission.bcntrtypes_add, false),
|
|
|
- viewBtn: this.vaildData(this.permission.bcntrtypes_view, false),
|
|
|
- delBtn: this.vaildData(this.permission.bcntrtypes_delete, false),
|
|
|
- editBtn: this.vaildData(this.permission.bcntrtypes_edit, false)
|
|
|
+ // addBtn: this.vaildData(this.permission.bcntrtypes_add, false),
|
|
|
+ // viewBtn: this.vaildData(this.permission.bcntrtypes_view, false),
|
|
|
+ // delBtn: this.vaildData(this.permission.bcntrtypes_delete, false),
|
|
|
+ // editBtn: this.vaildData(this.permission.bcntrtypes_edit, false)
|
|
|
};
|
|
|
},
|
|
|
ids() {
|
|
@@ -361,7 +409,45 @@
|
|
|
this.option = await this.getColumnData(this.getColumnName(291), 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)
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
rowSave(row, done, loading) {
|
|
|
+ row.extendedDataArr.map(item=>{
|
|
|
+ delete item.edit
|
|
|
+ })
|
|
|
+ row.extendedData = JSON.stringify(row.extendedDataArr)
|
|
|
+ delete row.extendedDataArr
|
|
|
bcntrtypesSubmit(row).then(() => {
|
|
|
this.onLoad(this.page);
|
|
|
this.$message({
|
|
@@ -375,6 +461,11 @@
|
|
|
});
|
|
|
},
|
|
|
rowUpdate(row, index, done, loading) {
|
|
|
+ row.extendedDataArr.map(item=>{
|
|
|
+ delete item.edit
|
|
|
+ })
|
|
|
+ row.extendedData = JSON.stringify(row.extendedDataArr)
|
|
|
+ delete row.extendedDataArr
|
|
|
bcntrtypesSubmit(row).then(() => {
|
|
|
this.onLoad(this.page);
|
|
|
this.$message({
|