From 262b478ca21669117ab67b5d1f8ea248108f7620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 3 Aug 2023 16:59:51 +0800 Subject: [PATCH] =?UTF-8?q?api=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addEditFromApiPop/index.vue | 223 ++++--- .../addEditFromApiPop/index_mst.vue | 312 +++++++++ .../src/components/currenTableFlex/index.vue | 604 +++++++++--------- Code/Fe/src/components/umyTable/index.vue | 198 ++++-- Code/Fe/src/store/modules/definition.js | 2 +- Code/Fe/src/views/demo/demo_api_handle.vue | 222 +++---- 6 files changed, 1018 insertions(+), 543 deletions(-) create mode 100644 Code/Fe/src/components/addEditFromApiPop/index_mst.vue diff --git a/Code/Fe/src/components/addEditFromApiPop/index.vue b/Code/Fe/src/components/addEditFromApiPop/index.vue index ec8858d..a23a87a 100644 --- a/Code/Fe/src/components/addEditFromApiPop/index.vue +++ b/Code/Fe/src/components/addEditFromApiPop/index.vue @@ -11,88 +11,108 @@ style="width:calc(100% - 28px);left:14px;top:14px;height:calc(100% - 28px)" v-loading="Loading.addEditApiLoading" > - +
- -
{{formTitle}}
- - - - + +
+
{{formTitle}} 【主表信息】
+ + - - - - - - - - - + - - + :prop="item.prop" + v-if="item.label.toUpperCase() != 'DETAILS'" + > + + + + + - - - - - - - + + + + + + + + + + + + +
+ +
+
{{formTitle}} 【子表信息】
+ + +
+
取 消 @@ -128,9 +148,13 @@ import { ApiTypePost, ApiTypePut } from "@/api/wms-api" import { LoadingMixins } from "@/mixins/LoadingMixins"; import { tableMixins } from "@/mixins/TableMixins" +import currenTableFlex from "@/components/currenTableFlex" +import * as allUrlOption from '@/utils/baseData/urlOption' +import { timeAgo } from "@/filters"; export default { name:"addEditFromApiPop", mixins:[ LoadingMixins,tableMixins ], + components: { currenTableFlex }, props: { // 编辑行数据 editRowData:{ @@ -156,10 +180,13 @@ export default { editSubmitUrl:{ type: String, default: null - } + }, }, data () { return { + //明细-列表 + URLOption_detailList:allUrlOption[this.$route.name].detailListURL, + // 当前的dto currentDtos:this.$store.getters.dtoColumnTypes[this.$route.name], active:0,//显示内容：0表单 1成功 2失败 show:true, @@ -167,6 +194,9 @@ export default { formData:{},//表单数据 formItemData:null,//表单item配置 formRules: {},//表单验证 + flexTableData:null,//子表table + // flexTableColumns:null,//子表table列 + flexTableColumns: null, } }, mounted(){ @@ -191,6 +221,22 @@ export default { }else{ this.formData = {} } + // 子表数据 + let _list = this.formItemData.filter(item=>{ + return item.prop.toUpperCase() == 'DETAILS' + }) + if(_list && _list.length > 0){ + if(this.handleType == 'edit'){ + this.flexTableData = this.formData[_list[0].prop] + }else{ + this.flexTableData = [] + } + } + // 子表数据列 + let _detailApi = this.URLOption_detailList.slice(0,this.URLOption_detailList.lastIndexOf('/')) + let _detailDtos = this.$store.getters.dtoColumnTypes[_detailApi].S.dtoList + this.flexTableColumns = _detailDtos + // 表单验证格式化 this.formRules={} _dtoList.forEach(item=>{ @@ -229,6 +275,7 @@ export default { this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules) return } + this.formData.details = this.flexTableData this.Loading.addEditApiLoading = true if (valid) { // 新增 @@ -294,7 +341,7 @@ export default { width: 100%; } ::v-deep .addEditFrom{ - height: calc(100% - 120px); + height: calc(100%); overflow: auto; } ::v-deep .el-form-item__label{ @@ -309,4 +356,22 @@ export default { padding-top: 15px; text-align: right; } + .centerInnerContent{ + height: calc(100% - 60px); + overflow: auto; + display: flex; + + .leftMainForm{ + width: 50%; + flex-shrink: 0; + height: calc(100% - 60px); + } + + .rightDetailTable{ + height: calc(100% - 60px); + width: calc(50%); + padding-left:40px; + border-left: #ddd solid 1px; + } + } \ No newline at end of file diff --git a/Code/Fe/src/components/addEditFromApiPop/index_mst.vue b/Code/Fe/src/components/addEditFromApiPop/index_mst.vue new file mode 100644 index 0000000..ec8858d --- /dev/null +++ b/Code/Fe/src/components/addEditFromApiPop/index_mst.vue @@ -0,0 +1,312 @@ + + + + \ No newline at end of file diff --git a/Code/Fe/src/components/currenTableFlex/index.vue b/Code/Fe/src/components/currenTableFlex/index.vue index 623f910..1cd5760 100644 --- a/Code/Fe/src/components/currenTableFlex/index.vue +++ b/Code/Fe/src/components/currenTableFlex/index.vue @@ -1,308 +1,322 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue index 9a6aed1..2e62716 100644 --- a/Code/Fe/src/components/umyTable/index.vue +++ b/Code/Fe/src/components/umyTable/index.vue @@ -13,11 +13,118 @@ style="width: 100%" :cell-style="cellStyle" use-virtual - :row-height="50" :height="uTableHeight" header-row-class-name="uTableHeader" > + + + {{itemButton.label}} - - - @@ -271,6 +324,11 @@ export default { }, }, props: { + // table内表单数据是否可编辑 + isEditable:{ + type: Boolean, + default: false + }, // 操作列按钮（左侧） buttonOperationList_left:{ type: Array, @@ -788,6 +846,32 @@ export default { if(type == 'detail')this.showDetailInfo(row) if(type == 'json')this.showJsonTable(row) }, + // 可编辑表单：获取枚举、布尔 + getItemEnums(item){ + let _option = [] + // 布尔 + if(item.apiBaseType == 'boolean'){ + _option = [{ + value: true, + label: '是' + },{ + value: false, + label: '否' + },] + } + if(item.isEnums){ + _option = item.enums_list + } + return _option + }, + // 可编辑表单：值更改函数 + changeValue(prop,item,val) { + this.$emit("changeValue", prop, item, val) + }, + // 可编辑表单：值清除函数 + clearValue(prop,item,val) { + this.$emit("clearValue", prop, item, val) + }, }, }; @@ -805,8 +889,8 @@ export default { } ::v-deep .el-table__fixed { display: block-inline !important; - height: auto !important; - bottom: 13px !important; + height: 100% !important; + // bottom: 13px !important; .el-table__fixed-header-wrapper { z-index: auto !important; } diff --git a/Code/Fe/src/store/modules/definition.js b/Code/Fe/src/store/modules/definition.js index b6b8dc7..74365e6 100644 --- a/Code/Fe/src/store/modules/definition.js +++ b/Code/Fe/src/store/modules/definition.js @@ -74,7 +74,7 @@ export function initDtoTypesAndEnums(res,typeName,apiName) { } } d.baseApiName = apiName + d.name - d.label = zhApiColumnsLable(apiName + d.name,res.types) || d.name + d.label = zhApiColumnsLable(apiName + d.name) || d.name d.prop = firstWordSizeChange(d.name) }) return _dtos diff --git a/Code/Fe/src/views/demo/demo_api_handle.vue b/Code/Fe/src/views/demo/demo_api_handle.vue index d4566cb..3cc2e1b 100644 --- a/Code/Fe/src/views/demo/demo_api_handle.vue +++ b/Code/Fe/src/views/demo/demo_api_handle.vue @@ -1,112 +1,112 @@ - - \ No newline at end of file +
+ + + + + + + +
+ + + \ No newline at end of file