【store】查看主表封装-暂存

PC/UI.WinIn.FasterZ.Store/README.md

@@ -123,4 +123,28 @@ validType           type仅等于input时：实时keyUp校验，类型如下：
 pointNumberFixed    组合上方validType值仅等于pointNumber时：
                     小数点后方保留位数,如不填写默认为100位
 <validType>+<pointNumberFixed>示例：
-{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
+{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
+
+[urlOpion示例]
+// 添加页面需要配置位置
+// 示例数据
+export const TestSchool = {
+    baseURL:'TestSchool/base',//主表-列表
+    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
+    // detailInfoName:'asnNbr',//主表-明细查看详情的title名称
+    detailListURL:'TestStudentDetail/base',//明细-列表,
+    masterId:'masterId',//明细获取主表信息的masterId,默认依次为[默认配置defalutMasterId,固定值masterId]
+    masterName:'studentName'//明细获取主表信息的title名称
+    // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
+    // deleteURL:null,//删除特殊URL
+    // addURL:null,//新增特殊URL
+    // editURL:null,//编辑特殊URL
+    // exportURL:'exportURL',//导出特殊URL
+    <!-- 20231124 有主表的子列表 查看详情的主表信息处理 -->
+    //有主表的子表单页的主表信息接口,默认为当前的[detailURL]去掉[-Detail]
+    // mainShowMasterUrl:null,
+    //有主表的子表单页的主表链接参数，默认依次为[默认配置defalutMasterId,上方配置中masterId,固定值masterId]
+    // mainShowMasterId:'masterId',
+    //有主表的子表单页的主表路由[用于显示列转义]，默认为[当前路由]去掉[Detail]
+    // masterRoute:null,
+}

PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue

@@ -49,6 +49,7 @@
         @handleClick="handleClick"
       >
         <template slot-scope="scope">
+          <!-- 详情 -->
           <curren-descriptions
             border
             v-if="scope.value == 'xq'"
@@ -59,6 +60,17 @@
             :propsData="propsData"
           >
           </curren-descriptions>
+          <!-- 主表信息 -->
+          <curren-descriptions
+            border
+            v-if="scope.value == 'masterInfo'"
+            :column="column"
+            :direction="direction"
+            :colon="false"
+            :tabsDesTions="masterColums"
+            :propsData="propsData.masterInfo"
+          >
+          </curren-descriptions>
           <!-- 明细 包含分页 头部按钮等 -->
           <tablePagination
             ref="tablePaginationForMX_Ref"
@@ -104,11 +116,12 @@
             </template>		
           </umyTable>
           <!-- 自定义扩展 -->
-          <umyTable
+          <!-- <umyTable
             v-if="
               scope.value == zdyValue && 
               scope.value != 'xq' &&
               scope.value != 'mx' && 
+              scope.value != 'masterInfo' &&
               scope.value != 'hz' &&
               scope.value != 'zwlcj'
             "
@@ -127,7 +140,7 @@
             <template>
               <slot></slot>
             </template>		
-          </umyTable>
+          </umyTable> -->
         </template>
       </curren-tabs>
     </div>
@@ -171,6 +184,10 @@ import pagination from "@/components/Pagination"
 import rowDrop from "@/components/rowDrop/index.vue"
 import * as allUrlOption from '@/utils/baseData/urlOption'
 import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { 
+  initApiColumnsForDto,
+  sliceStrEndDelete
+} from '@/utils/index'
 export default {
   name: 'currenTabel-drawer',
   components: {
@@ -309,7 +326,8 @@ export default {
       // 带有特殊扩展tabs页的
       if (this.dropdownTabsData.length !== 0) {
         return this.dropdownTabsData
-      } else {
+      } 
+      else {
         // 正常普通 详情，明细，汇总
         // if (Object.keys(this.propsData).length != 0) {
         if (Object.keys(this.propsData)) {
@@ -317,6 +335,14 @@ export default {
             label: "详情",
             name: 'xq'
           }]
+          if(this.propsData.masterInfo && this.propsData.masterInfo.length > 0){
+            this.initDropdownTabsData.push({
+              label: "主表信息",
+              name: 'masterInfo'
+            })
+            let _master_name = this.URLOption.masterRoute || sliceStrEndDelete(this.$route.name,'Detail')
+            this.masterColums = initApiColumnsForDto(this.propsData.masterInfo,_master_name,this)
+          }
           // 明细可以为空数组，前端分页使用
           if(this.propsData.details){
             this.initDropdownTabsData.push({
@@ -343,9 +369,9 @@ export default {
       detailHeaderButton:null,//明细-上方按钮
       detailInfoTableData:null,//明细-查看详情弹窗数据
       detailInfoTitle:null,//明细-查看详情弹窗title
-      otherData:[], // 切换tabs页赋值
-      zdyTableColumns:[], // 自定义表头
-      zdyValue:'', // 自定义展现值
+      // otherData:[], // 切换tabs页赋值
+      // zdyTableColumns:[], // 自定义表头
+      // zdyValue:'', // 自定义展现值
       // firstTabs:'xq',
       initDropdownTabsData:[
         {
@@ -375,10 +401,14 @@ export default {
         MaxResultCount: 20,
       },
       totalCountForDetail:0,
+       //明细-查看主表的连接id
+      URLOption:allUrlOption[this.$route.name],
       //明细-查看主表的连接id
-      URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',
+      URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',
       //明细-列表
       URLOption_detailList:allUrlOption[this.$route.name].detailListURL,
+      // 有主表的子表列，主表信息的表头
+      masterColums:null
     }
   },
   methods: {
@@ -574,7 +604,7 @@ export default {
     // tabs 切换页
     handleClick (val) {
       this.$emit("currenTabsChange", val);//父级获取当前的tab内容
-      this.zdyValue = val.name
+      // this.zdyValue = val.name
       this.dropdownTabsData.forEach( item => {
         if (item.name == val.name) {
           let parent = this.$parent
@@ -582,12 +612,12 @@ export default {
           // 详情 明细 汇总
           parent.firstTabs = val.name
           if (val.name == 'xq' || val.name == 'mx' || val.name == 'hz') {
-            this.zdyTableColumns = []
-            this.otherData = []
+            // this.zdyTableColumns = []
+            // this.otherData = []
             parent.tableLoading = false
           } else {
-            this.zdyTableColumns = []
-            this.otherData = []
+            // this.zdyTableColumns = []
+            // this.otherData = []
             // this.firstTabs = val.name
             // 其他自定义tab页
             // if (item.functionName == 'getListByItemcode') {

PC/UI.WinIn.FasterZ.Store/src/components/filterForDetailPage/index.vue

@@ -120,219 +120,216 @@
             </el-table> -->
         </el-dialog>
     </div>
-    </template>
-    <script>
-    import currenDescriptions from "@/components/currenDescriptions"
-    import { tableMixins } from "@/mixins/TableMixins";
-    import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
-    import { LoadingMixins } from "@/mixins/LoadingMixins";
-    import { mixins } from "@/mixins/mixins";
-    import { filterSelectMixins } from '@/mixins/filter-Select'
-    import {getListDesById,getPageListForDetail} from "@/api/wms-api"
-    export default {
-        name: 'filterForDetailPage',
-        mixins: [
-            tableMixins,
-            TableHeaderMixins,
-            mixins,
-            filterSelectMixins,
-            LoadingMixins
-        ],
-        components:{
-            currenDescriptions
-        },
-        props: {
-            // 已app-main高度为100%  需要减掉的高度
-            setUTableHeight: {
-                type: Number,
-                default: 340
-            },
-            // 是否显示序号
-            isShowIndex:{
-                type: Boolean,
-                default: false
-            },
-            // 复选框
-            tableSelection: {
-                type: Boolean,
-                default: false
-            },
-            cellStyle: {
-                type: Function,
-                default: () => {
-                    return Function;
-                }
-            },
-            // 超出内容是否提示
-            showOverflowTooltip:{
-                type: Boolean,
-                default: false,
-            },
-            // 删除api
-            DeleteApi: {
-                type: String,
-                default: null
-            },
-            // 主表数据-表头
-            parentColumns:{
-                type: Array,
-                default: null
-            },
-            showHandleButtons:{
-                type:Array,
-                default:() => {
-                    //'add','edit'暂未处理操作 'delete'暂时隐藏
-                    // showParent查看主表信息，fresh刷新，filter筛选，field字段设置
-                    return ['showParent','fresh','filter','field'];
-                }
-            },
-            // 父级展现列数，默认为2列展现
-            column: {
+</template>
+<script>
+import currenDescriptions from "@/components/currenDescriptions"
+import { tableMixins } from "@/mixins/TableMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { mixins } from "@/mixins/mixins";
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import {getListDesById,getPageListForDetail} from "@/api/wms-api"
+import { initApiColumnsForDto } from '@/utils/index'
+export default {
+    name: 'filterForDetailPage',
+    mixins: [
+        tableMixins,
+        TableHeaderMixins,
+        mixins,
+        filterSelectMixins,
+        LoadingMixins
+    ],
+    components:{
+        currenDescriptions
+    },
+    props: {
+        // 已app-main高度为100%  需要减掉的高度
+        setUTableHeight: {
             type: Number,
-            default: 2
-            },
-            // 父级展示方式，默认水平分布
-            direction: {
+            default: 340
+        },
+        // 是否显示序号
+        isShowIndex:{
+            type: Boolean,
+            default: false
+        },
+        // 复选框
+        tableSelection: {
+            type: Boolean,
+            default: false
+        },
+        cellStyle: {
+            type: Function,
+            default: () => {
+                return Function;
+            }
+        },
+        // 超出内容是否提示
+        showOverflowTooltip:{
+            type: Boolean,
+            default: false,
+        },
+        // 删除api
+        DeleteApi: {
             type: String,
-            default: 'horizontal'
-            },
-            rowMaxHeight:{
-            type:String,
-            default:'calc(90vh - 450px)'
-            },
+            default: null
         },
-        data () {
-            return {
-                dialogShow:true,
-                // URLOption_detailList:allUrlOption[this.$route.name].detailListURL,//明细-列表
-                // URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',//明细-查看主表的连接id
-                // URLOption_masterName:allUrlOption[this.$route.name].masterName,//明细-列表//明细-查看主表的连接title名称
-                // URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,//明细-查看主表
-                currenButtonData: [],//头部按钮
-                operaButtons:[],//操作列按钮
-                showParentDialog:false,//显示父级数据弹窗
-                showParentTitle:null,//显示父级数据弹窗-title
-                showParentTableData:null,//显示父级数据弹窗-数据
-                showParentLoading:false,//显示父级数据弹窗-加载
-                listColumns:[],//表头数据
+        // 主表数据-表头
+        parentColumns:{
+            type: Array,
+            default: null
+        },
+        showHandleButtons:{
+            type:Array,
+            default:() => {
+                //'add','edit'暂未处理操作 'delete'暂时隐藏
+                // showParent查看主表信息，fresh刷新，filter筛选，field字段设置
+                return ['showParent','fresh','filter','field'];
             }
         },
-        activated(){
-            // 解决切换页面的时候，遮罩层消失的问题
+        // 父级展现列数，默认为2列展现
+        column: {
+        type: Number,
+        default: 2
+        },
+        // 父级展示方式，默认水平分布
+        direction: {
+        type: String,
+        default: 'horizontal'
+        },
+        rowMaxHeight:{
+        type:String,
+        default:'calc(90vh - 450px)'
+        },
+    },
+    data () {
+        return {
+            dialogShow:true,
+            currenButtonData: [],//头部按钮
+            operaButtons:[],//操作列按钮
+            showParentDialog:false,//显示父级数据弹窗
+            showParentTitle:null,//显示父级数据弹窗-title
+            showParentTableData:null,//显示父级数据弹窗-数据
+            showParentLoading:false,//显示父级数据弹窗-加载
+            listColumns:[],//表头数据
+        }
+    },
+    activated(){
+        // 解决切换页面的时候，遮罩层消失的问题
+        this.dialogShow = false
+        this.$nextTick(() => {
+            this.dialogShow = true
+        });
+    },
+    mounted(){
+        this.paging()
+        this.initHandleButtons()
+    },
+    methods: {
+        rowDropForDetail(data,type){
+            this.listColumns = data
+            this.$emit("rowDropForDetail", data,type)
+        },
+        // 初始化显示按钮
+        initHandleButtons(){
+            // 头部按钮
+            let _arr_header = []
+            if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
+            if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
+            if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
+            if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
+            this.currenButtonData = _arr_header
+
+            // 操作列按钮
+            let _arr_op = []
+            if(this.showHandleButtons.indexOf('edit') >= 0){_arr_op.push('edit')}
+            if(this.showHandleButtons.indexOf('delete') >= 0){_arr_op.push('delete')}
+            if(this.showHandleButtons.indexOf('showParent') >= 0){_arr_op.push('showParent')}
+            this.operaButtons = _arr_op
+        },
+        // 关闭明细查询弹窗
+        closeDialog(data){
             this.dialogShow = false
-            this.$nextTick(() => {
-                this.dialogShow = true
-            });
+            this.$emit("closeDialog", data)
+        },
+        // 获取列表
+        paging(callback){
+            this.Loading.tableLoading = true;
+            this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+            getPageListForDetail(this.PageListParams,this.URLOption_detailList)
+                .then(res=>{
+                    // 表头处理
+                    let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+                    let _Columns = initApiColumnsForDto(res.items[0],_parentName,this)
+                    this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
+                    // 页面数据处理
+                    if(res){
+                        this.Loading.tableLoading = false
+                        this.tableData = []
+                        res.items.forEach(item=>{
+                            item.deleteTipVisible = false
+                            this.tableData.push(item)
+                        })
+                        this.totalCount = res.totalCount
+                    }
+                    this.pagingCallback(callback)
+                })
+                .catch(err=>{
+                    this.Loading.tableLoading = false
+                    this.$message.error("数据获取失败")
+                })
         },
-        mounted(){
-            this.paging()
-            this.initHandleButtons()
+        // 查看主表信息
+        showParentHandleForDetail(data){
+            this.showParentTitle = `${data[this.URLOption_masterName] || ''} 主表信息`
+            this.showParentDialog = true
+            this.showParentLoading = true
+            getListDesById(this.URLOption_parent,data[this.URLOption_masterId])
+                .then(res => {
+                    this.showParentTableData = res
+                    this.showParentLoading = false
+                })
+                .catch(err => {
+                    this.showParentLoading = false
+                    this.$message.error("主表信息获取失败!")
+                })
         },
-        methods: {
-            rowDropForDetail(data,type){
-                this.listColumns = data
-                this.$emit("rowDropForDetail", data,type)
-            },
-            // 初始化显示按钮
-            initHandleButtons(){
-                // 头部按钮
-                let _arr_header = []
-                if(this.showHandleButtons.indexOf('add') >= 0){_arr_header.push(this.defaultAddBtn())}
-                if(this.showHandleButtons.indexOf('field') >= 0){_arr_header.push(this.defaultFieldSettingBtn())}
-                if(this.showHandleButtons.indexOf('fresh') >= 0){_arr_header.push(this.defaultFreshBtn())}
-                if(this.showHandleButtons.indexOf('filter') >= 0){_arr_header.push(this.defaultFilterBtn())}
-                this.currenButtonData = _arr_header
+        // 编辑
+        editHandleForDetail(data){
+            console.log(data)
+        },
+        // 删除
+        deleteHandleForDetail(data){
+            this.Loading.appMainLoading = true
+            data.deleteTipVisible = false
+            // interfaceApi[this.DeleteApi](data.id).then(res => {
+            //     this.$successMsg('删除成功!')
+            //     this.oldSkipCount = 1
+            //     this.Loading.appMainLoading = false
+            //     this.paging()
+            // }).catch(err => {
+            //     this.Loading.appMainLoading = false
+            //     this.$message.error("删除失败!")
+            // })
+        },
+    }
+}
+</script>
+<style lang="scss">
+.filterForDetailPage {
     
-                // 操作列按钮
-                let _arr_op = []
-                if(this.showHandleButtons.indexOf('edit') >= 0){_arr_op.push('edit')}
-                if(this.showHandleButtons.indexOf('delete') >= 0){_arr_op.push('delete')}
-                if(this.showHandleButtons.indexOf('showParent') >= 0){_arr_op.push('showParent')}
-                this.operaButtons = _arr_op
-            },
-            // 关闭明细查询弹窗
-            closeDialog(data){
-                this.dialogShow = false
-                this.$emit("closeDialog", data)
-            },
-            // 获取列表
-            paging(callback){
-                this.Loading.tableLoading = true;
-                this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-                getPageListForDetail(this.PageListParams,this.URLOption_detailList)
-                    .then(res=>{
-                        // 表头处理
-                        let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-                        let _Columns = this.initApiColumnsForDto(res.items[0],_parentName)
-                        this.listColumns = this.initTableColumns(_Columns,'detailPage_api')
-                        // 页面数据处理
-                        if(res){
-                            this.Loading.tableLoading = false
-                            this.tableData = []
-                            res.items.forEach(item=>{
-                                item.deleteTipVisible = false
-                                this.tableData.push(item)
-                            })
-                            this.totalCount = res.totalCount
-                        }
-                        this.pagingCallback(callback)
-                    })
-                    .catch(err=>{
-                        this.Loading.tableLoading = false
-                        this.$message.error("数据获取失败")
-                    })
-            },
-            // 查看主表信息
-            showParentHandleForDetail(data){
-                this.showParentTitle = `${data[this.URLOption_masterName] || ''} 主表信息`
-                this.showParentDialog = true
-                this.showParentLoading = true
-                getListDesById(this.URLOption_parent,data[this.URLOption_masterId])
-                    .then(res => {
-                        this.showParentTableData = res
-                        this.showParentLoading = false
-                    })
-                    .catch(err => {
-                        this.showParentLoading = false
-                        this.$message.error("主表信息获取失败!")
-                    })
-            },
-            // 编辑
-            editHandleForDetail(data){
-                console.log(data)
-            },
-            // 删除
-            deleteHandleForDetail(data){
-                this.Loading.appMainLoading = true
-                data.deleteTipVisible = false
-                // interfaceApi[this.DeleteApi](data.id).then(res => {
-                //     this.$successMsg('删除成功!')
-                //     this.oldSkipCount = 1
-                //     this.Loading.appMainLoading = false
-                //     this.paging()
-                // }).catch(err => {
-                //     this.Loading.appMainLoading = false
-                //     this.$message.error("删除失败!")
-                // })
-            },
+    .mainTable-dialog{
+        .el-dialog{
+            height: calc(100% - 100px);
         }
     }
-    </script>
-    <style lang="scss">
-    .filterForDetailPage {
-        
-        .mainTable-dialog{
-            .el-dialog{
-                height: calc(100% - 100px);
-            }
-        }
-        .el-dialog__body{
-            min-height: 200px;
-            padding-bottom: 20px !important;
-        }
-        }
-        .filterForDetailPage-list{
-        height: calc(100%);
-        overflow: auto;
+    .el-dialog__body{
+        min-height: 200px;
+        padding-bottom: 20px !important;
+    }
     }
-    </style>
+    .filterForDetailPage-list{
+    height: calc(100%);
+    overflow: auto;
+}
+</style>

PC/UI.WinIn.FasterZ.Store/src/mixins/TableMixins.js

@@ -1,11 +1,13 @@
-import i18n from "@/lang"
 import {
   getPageList,
   getDetailed,
   postDelete,
   ApiTypeDelete
 } from '@/api/wms-api'
-import { zhApiColumnsLable,firstWordSizeChange } from '@/utils/index'
+import { 
+  initApiColumnsForDto,
+  sliceStrEndDelete
+} from '@/utils/index'
 export const tableMixins = {
   data() {
     return {
@@ -103,9 +105,22 @@ export const tableMixins = {
       }
       // 编辑 api
       else if (item.name == "editFromApi") {
-        this.addEditApiType = 'edit'
-        this.editFromApiRowData = row
-        this.displayDialog.addEditApiDialog = true;
+        // this.addEditApiType = 'edit'
+        // this.editFromApiRowData = row
+        // this.displayDialog.addEditApiDialog = true;
+        
+        let _url = this.URLOption_detail ? this.URLOption_detail : this.URLOption_base
+        this.Loading.tableLoading = true
+        getDetailed(row.id, _url)
+          .then(res=>{
+            this.addEditApiType = 'edit'
+            this.editFromApiRowData = res
+            this.displayDialog.addEditApiDialog = true;
+            this.Loading.tableLoading = false
+          })
+          .catch(err=>{
+            this.Loading.tableLoading = false
+          })
       }
       // 删除
       else if (item.name == "delete"){
@@ -158,95 +173,6 @@ export const tableMixins = {
     //   if(detailsTable && detailsTable[this.$route.name])this.apiColumns_DetailsTable = this.initTableColumns(detailsTable[this.$route.name],'detail_api')
       // if(detailsPage && detailsPage[this.$route.name])this.apiColumns_DetailsPage = this.initTableColumns(detailsPage[this.$route.name],'detailPage_api')
     // },
-    // get-dto-column-type接口表头类型初始化
-    initApiColumnsForDto(list,titleName){
-      let data = this.$store.getters.dtoColumnTypes
-      let _coloums = data[titleName].S
-      let _Columns_Table = []
-      if(_coloums){
-        let _data = _coloums.dtoList
-        _data.forEach(item=>{
-          // 如果list接口存在数据 ，与list接口返回字段比较处理,list接口存在的话则追加
-          let _if = firstWordSizeChange(item.name) != 'details'
-          if(list){
-            _if = firstWordSizeChange(item.name) in list && firstWordSizeChange(item.name) != 'details'
-          }
-          if(_if){
-            _Columns_Table.push(item)
-          }
-        })
-      }
-      if(list){
-        _Columns_Table = _Columns_Table.concat(this.specialAddColumns(list,titleName))
-      }
-      return _Columns_Table
-    },
-    // 添加特殊字段（api中没有的字段特殊处理）
-    specialAddColumns(list,titleName){
-      let _apiName = titleName
-      let _special_list=[]
-      // creationTime
-      if('creationTime' in list){
-        _special_list.push(
-          {
-            "name": "CreationTime",
-            "apiBaseType": "datetime",
-            "baseApiName": _apiName + 'CreationTime',
-            "label": zhApiColumnsLable(_apiName + 'CreationTime') || i18n.t('columNames.CreationTime'),
-            "prop": "creationTime",
-          }
-        )
-      }
-      // creatorId
-      if('creatorId' in list){
-        _special_list.push(
-          {
-            "name": "CreatorId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'CreatorId',
-            "label": zhApiColumnsLable(_apiName + 'CreatorId') || i18n.t('columNames.CreatorId'),
-            "prop": "creatorId",
-          }
-        )
-      }
-      // lastModificationTime
-      if('lastModificationTime' in list){
-        _special_list.push(
-          {
-            "name": "LastModificationTime",
-            "apiBaseType": "datetime",
-            "baseApiName": _apiName + 'LastModificationTime',
-            "label": zhApiColumnsLable(_apiName + 'LastModificationTime') || i18n.t('columNames.LastModificationTime'),
-            "prop": "lastModificationTime",
-          }
-        )
-      }
-      // lastModifierId
-      if('lastModifierId' in list){
-        _special_list.push(
-          {
-            "name": "LastModifierId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'LastModifierId',
-            "label": zhApiColumnsLable(_apiName + 'LastModifierId') || i18n.t('columNames.LastModifierId'),
-            "prop": "lastModifierId",
-          }
-        )
-      }
-      // tenantId
-      if('tenantId' in list){
-        _special_list.push(
-          {
-            "name": "TenantId",
-            "apiBaseType": "string",
-            "baseApiName": _apiName + 'TenantId',
-            "label": zhApiColumnsLable(_apiName + 'TenantId') || i18n.t('columNames.TenantId'),
-            "prop": "tenantId",
-          }
-        )
-      }
-      return _special_list
-    },
     //渲染数据
     paging(callback,repeat) {
       this.Loading.tableLoading = true;
@@ -255,7 +181,7 @@ export const tableMixins = {
         .then(res=>{
           // 表头处理
           let _list = res.items && res.items.length > 0 ? res.items[0] : null
-          let _Columns = this.initApiColumnsForDto(_list,this.$route.name)
+          let _Columns = initApiColumnsForDto(_list,this.$route.name,this)
           this.apiColumns_Table = this.initTableColumns(_Columns)
           this.apiColumns_DesTions = _Columns
             // 页面数据处理
@@ -312,30 +238,54 @@ export const tableMixins = {
       this.Loading.DrawerLoading = true
       this.displayDialog.detailsDialog = true;
       let _url = this.URLOption_detail ? this.URLOption_detail : this.URLOption_base
-      getDetailed(val.id, _url)
-        .then(res=>{
-          // 打印使用的全部数据存储
-          this.tableDataDetails = JSON.parse(JSON.stringify(res))
-          // 数据处理
-          this.propsData = res
-          if (res.details) {
-            // 表头处理
-            let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
-            this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(res.details[0],_parentName),'detail_api')
-            if(this.$refs.currenDrawer_Ref){
-              this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
-                this.inlineDialogCallback()
-              },()=>{
-                this.Loading.DrawerLoading = false
-              })
-            }
-          }else{
-            this.Loading.DrawerLoading = false
-          }
-        })
-        .catch(err=>{
+      // 有主表信息子表(表头处理)
+      if(!this.URLOption.isMaster && this.URLOption.hasDetail){
+        let _showMasterUrl = this.URLOption.mainShowMasterUrl
+        if(!this.URLOption.mainShowMasterUrl){
+          _showMasterUrl = sliceStrEndDelete(this.URLOption_detail,'-Detail')
+        }
+        Promise.all([
+          getDetailed(val.id, _url),
+          getDetailed(val[this.URLOption.mainShowMasterId || this.URLOption.masterId || this.allUrlOption.defalutMasterId || 'masterId'], _showMasterUrl)
+        ]).then((res) => {
+          let _allRes = JSON.parse(JSON.stringify(res[0]))
+          _allRes.masterInfo = res[1]
+          this.initInlineHttpBack(_allRes)
+        }).catch(()=>{
           this.Loading.DrawerLoading = false
         })
+      }
+      // 没有主表信息
+      else{
+        getDetailed(val.id, _url)
+          .then(res=>{
+            this.initInlineHttpBack(res)
+          })
+          .catch(err=>{
+            this.Loading.DrawerLoading = false
+          })
+      }
+    },
+    // 查看详情获取返回值后处理
+    initInlineHttpBack(res){
+      // 打印使用的全部数据存储
+      this.tableDataDetails = JSON.parse(JSON.stringify(res))
+      // 数据处理
+      this.propsData = res
+      if (res.details) {
+        // 表头处理
+        let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+        this.apiColumns_DetailsTable = this.initTableColumns(initApiColumnsForDto(res.details[0],_parentName,this),'detail_api')
+        if(this.$refs.currenDrawer_Ref){
+          this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
+            this.inlineDialogCallback()
+          },()=>{
+            this.Loading.DrawerLoading = false
+          })
+        }
+      }else{
+        this.Loading.DrawerLoading = false
+      }
     },
     // 前端分页处理
     // detailListPageFromFE(data){

PC/UI.WinIn.FasterZ.Store/src/mixins/mixins.js

@@ -8,6 +8,9 @@ import { getLoginName } from "@/utils/auth"
 export const mixins = {
   data() {
     return {
+      allUrlOption:allUrlOption,
+      // 当前路由配置
+      URLOption:allUrlOption[this.$route.name],
       //主表-列表
       URLOption_base:allUrlOption[this.$route.name].baseURL,
       //主表-明细
@@ -23,7 +26,7 @@ export const mixins = {
       //明细-查看主表
       URLOption_parent:allUrlOption[this.$route.name].parentURL ? allUrlOption[this.$route.name].parentURL : allUrlOption[this.$route.name].detailURL,
       //明细-查看主表的连接id
-      URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId',
+      URLOption_masterId:allUrlOption[this.$route.name].masterId || allUrlOption.defalutMasterId || 'masterId',
       //明细-查看主表的连接title名称
       URLOption_masterName:allUrlOption[this.$route.name].masterName,
       // 列表-明细-查看详情标题名称
@@ -65,7 +68,6 @@ export const mixins = {
           name: "determine"
         },
       ],
-
       addEditApiType: null,//Api新增编辑方式(add,edit) 
       editFromApiRowData:null,//Api编辑方式的默认值
     }

PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js

@@ -1,3 +1,6 @@
+// 默认配置
+export const defalutMasterId = 'masterID'
+
 // 示例数据
 export const TestSchool = {
     baseURL:'TestSchool/base',//主表-列表
@@ -17,189 +20,235 @@ export const TestSchool = {
 export const ExportCustomUserSetting = {
     baseURL:'ExportCustomUserSetting/base',//主表-列表
     detailURL:'app/export-custom-user-setting',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const ArriveNotice = {
     baseURL:'ArriveNotice/base',//主表-列表
     detailURL:'app/arrive-notice',//主表-明细 + 明细-查看主表
     detailListURL:'ArriveNoticeDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ArriveNoticeDetail = {
     baseURL:'ArriveNoticeDetail/base',//主表-列表
     detailURL:'app/arrive-notice-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ContainerBindNote = {
     baseURL:'ContainerBindNote/base',//主表-列表
     detailURL:'app/container-bind-note',//主表-明细 + 明细-查看主表
     detailListURL:'ContainerBindNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ContainerBindNoteDetail = {
     baseURL:'ContainerBindNoteDetail/base',//主表-列表
     detailURL:'app/container-bind-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const CountAdjustNote = {
     baseURL:'CountAdjustNote/base',//主表-列表
     detailURL:'app/count-adjust-note',//主表-明细 + 明细-查看主表
     detailListURL:'CountAdjustNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const CountAdjustNoteDetail = {
     baseURL:'CountAdjustNoteDetail/base',//主表-列表
     detailURL:'app/count-adjust-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const CountNote = {
     baseURL:'CountNote/base',//主表-列表
     detailURL:'app/count-note',//主表-明细 + 明细-查看主表
     detailListURL:'CountNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const CountNoteDetail = {
     baseURL:'CountNoteDetail/base',//主表-列表
     detailURL:'app/count-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const CountPlan = {
     baseURL:'CountPlan/base',//主表-列表
     detailURL:'app/count-plan',//主表-明细 + 明细-查看主表
     detailListURL:'CountPlanDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const CountPlanDetail = {
     baseURL:'CountPlanDetail/base',//主表-列表
     detailURL:'app/count-plan-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const CustomerAsn = {
     baseURL:'CustomerAsn/base',//主表-列表
     detailURL:'app/customer-asn',//主表-明细 + 明细-查看主表
     detailListURL:'CustomerAsnDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const CustomerAsnDetail = {
     baseURL:'CustomerAsnDetail/base',//主表-列表
     detailURL:'app/customer-asn-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const CustomerReturnNote = {
     baseURL:'CustomerReturnNote/base',//主表-列表
     detailURL:'app/customer-return-note',//主表-明细 + 明细-查看主表
     detailListURL:'CustomerReturnNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const CustomerReturnNoteDetail = {
     baseURL:'CustomerReturnNoteDetail/base',//主表-列表
     detailURL:'app/customer-return-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const DeliverNote = {
     baseURL:'DeliverNote/base',//主表-列表
     detailURL:'app/deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'DeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const DeliverNoteDetail = {
     baseURL:'DeliverNoteDetail/base',//主表-列表
     detailURL:'app/deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const DeliverPlan = {
     baseURL:'DeliverPlan/base',//主表-列表
     detailURL:'app/deliver-plan',//主表-明细 + 明细-查看主表
     detailListURL:'DeliverPlanDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const DeliverPlanDetail = {
     baseURL:'DeliverPlanDetail/base',//主表-列表
     detailURL:'app/deliver-plan-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const DeliverRequest = {
     baseURL:'DeliverRequest/base',//主表-列表
     detailURL:'app/deliver-request',//主表-明细 + 明细-查看主表
     detailListURL:'DeliverRequestDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const DeliverRequestDetail = {
     baseURL:'DeliverRequestDetail/base',//主表-列表
     detailURL:'app/deliver-request-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const DocumentSetting = {
     baseURL:'DocumentSetting/base',//主表-列表
     detailURL:'app/document-setting',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const InspectAbnormalNote = {
     baseURL:'InspectAbnormalNote/base',//主表-列表
     detailURL:'app/inspect-abnormal-note',//主表-明细 + 明细-查看主表
     detailListURL:'InspectAbnormalNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const InspectAbnormalNoteDetail = {
     baseURL:'InspectAbnormalNoteDetail/base',//主表-列表
     detailURL:'app/inspect-abnormal-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const InspectNote = {
     baseURL:'InspectNote/base',//主表-列表
     detailURL:'app/inspect-note',//主表-明细 + 明细-查看主表
     detailListURL:'InspectNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const InspectNoteDetail = {
     baseURL:'InspectNoteDetail/base',//主表-列表
     detailURL:'app/inspect-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const InspectNoteSummaryDetail = {
     baseURL:'InspectNoteSummaryDetail/base',//主表-列表
     detailURL:'app/inspect-note-summary-detail',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const InspectNotice = {
     baseURL:'InspectNotice/base',//主表-列表
     detailURL:'app/inspect-notice',//主表-明细 + 明细-查看主表
     detailListURL:'InspectNoticeDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const InspectNoticeDetail = {
     baseURL:'InspectNoticeDetail/base',//主表-列表
     detailURL:'app/inspect-notice-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const InspectNoticeSummaryDetail = {
     baseURL:'InspectNoticeSummaryDetail/base',//主表-列表
     detailURL:'app/inspect-notice-summary-detail',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const InventoryTransferNote = {
     baseURL:'InventoryTransferNote/base',//主表-列表
     detailURL:'app/inventory-transfer-note',//主表-明细 + 明细-查看主表
     detailListURL:'InventoryTransferNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const InventoryTransferNoteDetail = {
     baseURL:'InventoryTransferNoteDetail/base',//主表-列表
     detailURL:'app/inventory-transfer-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 // todo
@@ -207,251 +256,312 @@ export const IPurchaseOrderRepository = {
     baseURL:'IPurchaseOrderRepository/base',//主表-列表
     detailURL:'app/i-purchase-order-repository',//主表-明细 + 明细-查看主表
     detailListURL:'IPurchaseOrderDetailRepository/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 // todo
 export const IPurchaseOrderDetailRepository = {
     baseURL:'IPurchaseOrderDetailRepository/base',//主表-列表
     detailURL:'app/i-purchase-order-detail-repository',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const IsolationNote = {
     baseURL:'IsolationNote/base',//主表-列表
     detailURL:'app/isolation-note',//主表-明细 + 明细-查看主表
     detailListURL:'IsolationNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const IsolationNoteDetail = {
     baseURL:'IsolationNoteDetail/base',//主表-列表
     detailURL:'app/isolation-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const IssueNote = {
     baseURL:'IssueNote/base',//主表-列表
     detailURL:'app/issue-note',//主表-明细 + 明细-查看主表
     detailListURL:'IssueNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const IssueNoteDetail = {
     baseURL:'IssueNoteDetail/base',//主表-列表
     detailURL:'app/issue-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const IssueNoteToMes = {
     baseURL:'IssueNoteToMes/base',//主表-列表
     detailURL:'app/issue-note-to-mes',//主表-明细 + 明细-查看主表
     detailListURL:'IssueNoteDetailToMes/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const IssueNoteDetailToMes = {
     baseURL:'IssueNoteDetailToMes/base',//主表-列表
     detailURL:'app/issue-note-detail-to-mes',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisContainer = {
     baseURL:'JisContainer/base',//主表-列表
     detailURL:'app/jis-container',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const JisDeliverNote = {
     baseURL:'JisDeliverNote/base',//主表-列表
     detailURL:'app/jis-deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'JisDeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisDeliverNoteDetail = {
     baseURL:'JisDeliverNoteDetail/base',//主表-列表
     detailURL:'app/jis-deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OuterJisL7DeliverNote = {
     baseURL:'OuterJisL7DeliverNote/base',//主表-列表
     detailURL:'app/outer-jis-l7Deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'OuterJisL7DeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OuterJisL7DeliverNoteDetail = {
     baseURL:'OuterJisL7DeliverNoteDetail/base',//主表-列表
     detailURL:'app/outer-jis-l7Deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisProduct = {
     baseURL:'JisProduct/base',//主表-列表
     detailURL:'app/jis-product',//主表-明细 + 明细-查看主表
     detailListURL:'JisProductDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisProductDetail = {
     baseURL:'JisProductDetail/base',//主表-列表
     detailURL:'app/jis-product-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisProductReceiptNote = {
     baseURL:'JisProductReceiptNote/base',//主表-列表
     detailURL:'app/jis-product-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'JisProductReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisProductReceiptNoteDetail = {
     baseURL:'JisProductReceiptNoteDetail/base',//主表-列表
     detailURL:'app/jis-product-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisProductRecycleNote = {
     baseURL:'JisProductRecycleNote/base',//主表-列表
     detailURL:'app/jis-product-recycle-note',//主表-明细 + 明细-查看主表
     detailListURL:'JisProductRecycleNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisProductRecycleNoteDetail = {
     baseURL:'JisProductRecycleNoteDetail/base',//主表-列表
     detailURL:'app/jis-product-recycle-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisProductReturnNote = {
     baseURL:'JisProductReturnNote/base',//主表-列表
     detailURL:'app/jis-product-return-note',//主表-明细 + 明细-查看主表
     detailListURL:'JisProductReturnNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisProductReturnNoteDetail = {
     baseURL:'JisProductReturnNoteDetail/base',//主表-列表
     detailURL:'app/jis-product-return-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const JisProductTransferNote = {
     baseURL:'JisProductTransferNote/base',//主表-列表
     detailURL:'app/jis-product-transfer-note',//主表-明细 + 明细-查看主表
     detailListURL:'JisProductTransferNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const JisProductTransferNoteDetail = {
     baseURL:'JisProductTransferNoteDetail/base',//主表-列表
     detailURL:'app/jis-product-transfer-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const MaterialRequest = {
     baseURL:'MaterialRequest/base',//主表-列表
     detailURL:'app/material-request',//主表-明细 + 明细-查看主表
     detailListURL:'MaterialRequestDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const MaterialRequestDetail = {
     baseURL:'MaterialRequestDetail/base',//主表-列表
     detailURL:'app/material-request-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OfflineSettlementNote = {
     baseURL:'OfflineSettlementNote/base',//主表-列表
     detailURL:'app/offline-settlement-note',//主表-明细 + 明细-查看主表
     detailListURL:'OfflineSettlementNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OfflineSettlementNoteDetail = {
     baseURL:'OfflineSettlementNoteDetail/base',//主表-列表
     detailURL:'app/offline-settlement-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OuterJisDeliverNote = {
     baseURL:'OuterJisDeliverNote/base',//主表-列表
     detailURL:'app/outer-jis-deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'OuterJisDeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OuterJisDeliverNoteDetail = {
     baseURL:'OuterJisDeliverNoteDetail/base',//主表-列表
     detailURL:'app/outer-jis-deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OuterJisReplaceNote = {
     baseURL:'OuterJisReplaceNote/base',//主表-列表
     detailURL:'app/outer-jis-replace-note',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const OuterJisUnplannedIssueNote = {
     baseURL:'OuterJisUnplannedIssueNote/base',//主表-列表
     detailURL:'app/outer-jis-unplanned-issue-note',//主表-明细 + 明细-查看主表
     detailListURL:'OuterJisUnplannedIssueNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OuterJisUnplannedIssueNoteDetail = {
     baseURL:'OuterJisUnplannedIssueNoteDetail/base',//主表-列表
     detailURL:'app/outer-jis-unplanned-issue-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OuterJisUnplannedReceiptNote = {
     baseURL:'OuterJisUnplannedReceiptNote/base',//主表-列表
     detailURL:'app/outer-jis-unplanned-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'OuterJisUnplannedReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OuterJisUnplannedReceiptNoteDetail = {
     baseURL:'OuterJisUnplannedReceiptNoteDetail/base',//主表-列表
     detailURL:'app/outer-jis-unplanned-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const OuterPillarDeliverNote = {
     baseURL:'OuterPillarDeliverNote/base',//主表-列表
     detailURL:'app/outer-pillar-deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'OuterPillarDeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const OuterPillarDeliverNoteDetail = {
     baseURL:'OuterPillarDeliverNoteDetail/base',//主表-列表
     detailURL:'app/outer-pillar-deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PillarDeliverNote = {
     baseURL:'PillarDeliverNote/base',//主表-列表
     detailURL:'app/pillar-deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'PillarDeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PillarDeliverNoteDetail = {
     baseURL:'PillarDeliverNoteDetail/base',//主表-列表
     detailURL:'app/pillar-deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PreparationPlan = {
     baseURL:'PreparationPlan/base',//主表-列表
     detailURL:'app/preparation-plan',//主表-明细 + 明细-查看主表
     detailListURL:'PreparationPlanDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PreparationPlanDetail = {
     baseURL:'PreparationPlanDetail/base',//主表-列表
     detailURL:'app/preparation-plan-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ProductionPlan = {
     baseURL:'ProductionPlan/base',//主表-列表
     detailURL:'app/production-plan',//主表-明细 + 明细-查看主表
     detailListURL:'ProductionPlanDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ProductionPlanDetail = {
     baseURL:'ProductionPlanDetail/base',//主表-列表
     detailURL:'app/production-plan-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 // todo:
@@ -459,310 +569,385 @@ export const ProductL7PartsNote = {
     baseURL:'ProductL7PartsNote/base',//主表-列表
     detailURL:'app/product-l7-parts-note',//主表-明细 + 明细-查看主表
     detailListURL:'ProductL7PartsNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ProductL7PartsNoteDetail = {
     baseURL:'ProductL7PartsNoteDetail/base',//主表-列表
     detailURL:'app/product-l7-parts-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ProductReceiptLog = {
     baseURL:'ProductReceiptLog/base',//主表-列表
     detailURL:'app/product-receipt-log',//主表-明细 + 明细-查看主表
     detailListURL:'ProductReceiptLogDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ProductReceiptLogDetail = {
     baseURL:'ProductReceiptLogDetail/base',//主表-列表
     detailURL:'app/product-receipt-log-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ProductReceiptNote = {
     baseURL:'ProductReceiptNote/base',//主表-列表
     detailURL:'app/product-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'ProductReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ProductReceiptNoteDetail = {
     baseURL:'ProductReceiptNoteDetail/base',//主表-列表
     detailURL:'app/product-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ProductRecycleNote = {
     baseURL:'ProductRecycleNote/base',//主表-列表
     detailURL:'app/product-recycle-note',//主表-明细 + 明细-查看主表
     detailListURL:'ProductRecycleNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ProductRecycleNoteDetail = {
     baseURL:'ProductRecycleNoteDetail/base',//主表-列表
     detailURL:'app/product-recycle-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PurchaseOrder = {
     baseURL:'PurchaseOrder/base',//主表-列表
     detailURL:'app/purchase-order',//主表-明细 + 明细-查看主表
-    // detailInfoName:'asnNbr',//主表-明细查看详情的title名称
     detailListURL:'PurchaseOrderDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
-    // masterName:'asnNbr'//明细获取主表信息的title名称
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PurchaseOrderDetail = {
     baseURL:'PurchaseOrderDetail/base',//主表-列表
     detailURL:'app/purchase-order-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PurchaseReceiptNote = {
     baseURL:'PurchaseReceiptNote/base',//主表-列表
     detailURL:'app/purchase-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'PurchaseReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PurchaseReceiptNoteDetail = {
     baseURL:'PurchaseReceiptNoteDetail/base',//主表-列表
     detailURL:'app/purchase-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PurchaseReturnNote = {
     baseURL:'PurchaseReturnNote/base',//主表-列表
     detailURL:'app/purchase-return-note',//主表-明细 + 明细-查看主表
     detailListURL:'PurchaseReturnNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PurchaseReturnNoteDetail = {
     baseURL:'PurchaseReturnNoteDetail/base',//主表-列表
     detailURL:'app/purchase-return-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const PutawayNote = {
     baseURL:'PutawayNote/base',//主表-列表
     detailURL:'app/putaway-note',//主表-明细 + 明细-查看主表
     detailListURL:'PutawayNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const PutawayNoteDetail = {
     baseURL:'PutawayNoteDetail/base',//主表-列表
     detailURL:'app/putaway-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ReceiptAbnormalNote = {
     baseURL:'ReceiptAbnormalNote/base',//主表-列表
     detailURL:'app/receipt-abnormal-note',//主表-明细 + 明细-查看主表
     detailListURL:'ReceiptAbnormalNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ReceiptAbnormalNoteDetail = {
     baseURL:'ReceiptAbnormalNoteDetail/base',//主表-列表
     detailURL:'app/receipt-abnormal-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ReworkNote = {
     baseURL:'ReworkNote/base',//主表-列表
     detailURL:'app/rework-note',//主表-明细 + 明细-查看主表
     detailListURL:'ReworkNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ReworkNoteDetail = {
     baseURL:'ReworkNoteDetail/base',//主表-列表
     detailURL:'app/rework-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SaleOrder = {
     baseURL:'SaleOrder/base',//主表-列表
     detailURL:'app/sale-order',//主表-明细 + 明细-查看主表
     detailListURL:'SaleOrderDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SaleOrderDetail = {
     baseURL:'SaleOrderDetail/base',//主表-列表
     detailURL:'app/sale-order-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ScrapNote = {
     baseURL:'ScrapNote/base',//主表-列表
     detailURL:'app/scrap-note',//主表-明细 + 明细-查看主表
     detailListURL:'ScrapNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ScrapNoteDetail = {
     baseURL:'ScrapNoteDetail/base',//主表-列表
     detailURL:'app/scrap-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const ScrapOutNote = {
     baseURL:'ScrapOutNote/base',//主表-列表
     detailURL:'app/scrap-out-note',//主表-明细 + 明细-查看主表
     detailListURL:'ScrapOutNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const ScrapOutNoteDetail = {
     baseURL:'ScrapOutNoteDetail/base',//主表-列表
     detailURL:'app/scrap-out-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SingleDoorPanelCustomerReturnNote = {
     baseURL:'SingleDoorPanelCustomerReturnNote/base',//主表-列表
     detailURL:'app/single-door-panel-customer-return-note',//主表-明细 + 明细-查看主表
     detailListURL:'SingleDoorPanelCustomerReturnNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SingleDoorPanelCustomerReturnNoteDetail = {
     baseURL:'SingleDoorPanelCustomerReturnNoteDetail/base',//主表-列表
     detailURL:'app/single-door-panel-customer-return-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SingleDoorPanelDeliverNote = {
     baseURL:'SingleDoorPanelDeliverNote/base',//主表-列表
     detailURL:'app/single-door-panel-deliver-note',//主表-明细 + 明细-查看主表
     detailListURL:'SingleDoorPanelDeliverNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SingleDoorPanelDeliverNoteDetail = {
     baseURL:'SingleDoorPanelDeliverNoteDetail/base',//主表-列表
     detailURL:'app/single-door-panel-deliver-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SingleDoorPanelProductAdjustNote = {
     baseURL:'SingleDoorPanelProductAdjustNote/base',//主表-列表
     detailURL:'app/single-door-panel-product-adjust-note',//主表-明细 + 明细-查看主表
     detailListURL:'SingleDoorPanelProductAdjustNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SingleDoorPanelProductAdjustNoteDetail = {
     baseURL:'SingleDoorPanelProductAdjustNoteDetail/base',//主表-列表
     detailURL:'app/single-door-panel-product-adjust-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SingleDoorPanelProductReceiptNote = {
     baseURL:'SingleDoorPanelProductReceiptNote/base',//主表-列表
     detailURL:'app/single-door-panel-product-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'SingleDoorPanelProductReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SingleDoorPanelProductReceiptNoteDetail = {
     baseURL:'SingleDoorPanelProductReceiptNoteDetail/base',//主表-列表
     detailURL:'app/single-door-panel-product-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SingleDoorPanelProductTransferNote = {
     baseURL:'SingleDoorPanelProductTransferNote/base',//主表-列表
     detailURL:'app/single-door-panel-product-transfer-note',//主表-明细 + 明细-查看主表
     detailListURL:'SingleDoorPanelProductTransferNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SingleDoorPanelProductTransferNoteDetail = {
     baseURL:'SingleDoorPanelProductTransferNoteDetail/base',//主表-列表
     detailURL:'app/single-door-panel-product-transfer-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const StockReturnNote = {
     baseURL:'StockReturnNote/base',//主表-列表
     detailURL:'app/stock-return-note',//主表-明细 + 明细-查看主表
     detailListURL:'StockReturnNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const StockReturnNoteDetail = {
     baseURL:'StockReturnNoteDetail/base',//主表-列表
     detailURL:'app/stock-return-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SupplierAsn = {
     baseURL:'SupplierAsn/base',//主表-列表
     detailURL:'app/supplier-asn',//主表-明细 + 明细-查看主表
     detailListURL:'SupplierAsnDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const SupplierAsnDetail = {
     baseURL:'SupplierAsnDetail/base',//主表-列表
     detailURL:'app/supplier-asn-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const SupplierEvaluation = {
     baseURL:'SupplierEvaluation/base',//主表-列表
     detailURL:'app/supplier-evaluation',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const TracebackNote = {
     baseURL:'TracebackNote/base',//主表-列表
     detailURL:'app/traceback-note',//主表-明细 + 明细-查看主表
     detailListURL:'TracebackNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const TracebackNoteDetail = {
     baseURL:'TracebackNoteDetail/base',//主表-列表
     detailURL:'app/traceback-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const TracebackProduct = {
     baseURL:'TracebackProduct/base',//主表-列表
     detailURL:'app/traceback-product',//主表-明细 + 明细-查看主表
+    hasDetail:false,
 }
 
 export const UnplannedIssueNote = {
     baseURL:'UnplannedIssueNote/base',//主表-列表
     detailURL:'app/unplanned-issue-note',//主表-明细 + 明细-查看主表
     detailListURL:'UnplannedIssueNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const UnplannedIssueNoteDetail = {
     baseURL:'UnplannedIssueNoteDetail/base',//主表-列表
     detailURL:'app/unplanned-issue-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const UnplannedReceiptNote = {
     baseURL:'UnplannedReceiptNote/base',//主表-列表
     detailURL:'app/unplanned-receipt-note',//主表-明细 + 明细-查看主表
     detailListURL:'UnplannedReceiptNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const UnplannedReceiptNoteDetail = {
     baseURL:'UnplannedReceiptNoteDetail/base',//主表-列表
     detailURL:'app/unplanned-receipt-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const WarehouseTransferNote = {
     baseURL:'WarehouseTransferNote/base',//主表-列表
     detailURL:'app/warehouse-transfer-note',//主表-明细 + 明细-查看主表
     detailListURL:'WarehouseTransferNoteDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const WarehouseTransferNoteDetail = {
     baseURL:'WarehouseTransferNoteDetail/base',//主表-列表
     detailURL:'app/warehouse-transfer-note-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }
 
 export const WorkOrder = {
     baseURL:'WorkOrder/base',//主表-列表
     detailURL:'app/work-order',//主表-明细 + 明细-查看主表
     detailListURL:'WorkOrderDetail/base',//明细-列表,
-    masterId:'masterID',//明细获取主表信息的masterId
+    hasDetail:true, 
+    isMaster:true
 }
 
 export const WorkOrderDetail = {
     baseURL:'WorkOrderDetail/base',//主表-列表
     detailURL:'app/work-order-detail',//主表-明细 + 明细-查看主表
+    hasDetail:true, 
+    isMaster:false 
 }

PC/UI.WinIn.FasterZ.Store/src/utils/index.js

@@ -3,11 +3,12 @@
  */
  import {fileStorage, getPageList } from '@/api/wms-api'
  import store from '@/store'
+ import i18n from "@/lang"
  
  /**
-  * @param {string} url
-  * @returns {Object}
-  */
+ * @param {string} url
+ * @returns {Object}
+ */
  export function getQueryObject(url) {
    url = url == null ? window.location.href : url
    const search = url.substring(url.lastIndexOf('?') + 1)
@@ -25,9 +26,9 @@
  
  // 返回utf8字符串的字节长度
  /**
-  * @param {string} input value
-  * @returns {number} output value
-  */
+ * @param {string} input value
+ * @returns {number} output value
+ */
  export function byteLength(str) {
    // returns the byte length of an utf8 string
    let s = str.length
@@ -41,9 +42,9 @@
  }
  
  /**
-  * @param {Array} actual
-  * @returns {Array}
-  */
+ * @param {Array} actual
+ * @returns {Array}
+ */
  export function cleanArray(actual) {
    const newArray = []
    for (let i = 0; i < actual.length; i++) {
@@ -55,9 +56,9 @@
  }
  
  /**
-  * @param {Object} json
-  * @returns {Array}
-  */
+ * @param {Object} json
+ * @returns {Array}
+ */
  export function param(json) {
    if (!json) return ''
    return cleanArray(
@@ -69,9 +70,9 @@
  }
  
  /**
-  * @param {string} url
-  * @returns {Object}
-  */
+ * @param {string} url
+ * @returns {Object}
+ */
  export function param2Obj(url) {
    const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
    if (!search) {
@@ -91,9 +92,9 @@
  }
  
  /**
-  * @param {string} val
-  * @returns {string}
-  */
+ * @param {string} val
+ * @returns {string}
+ */
  export function html2Text(val) {
    const div = document.createElement('div')
    div.innerHTML = val
@@ -101,11 +102,11 @@
  }
  
  /**
-  * Merges two objects, giving the last one precedence
-  * @param {Object} target
-  * @param {(Object|Array)} source
-  * @returns {Object}
-  */
+ * Merges two objects, giving the last one precedence
+ * @param {Object} target
+ * @param {(Object|Array)} source
+ * @returns {Object}
+ */
  export function objectMerge(target, source) {
    if (typeof target !== 'object') {
      target = {}
@@ -125,9 +126,9 @@
  }
  
  /**
-  * @param {HTMLElement} element
-  * @param {string} className
-  */
+ * @param {HTMLElement} element
+ * @param {string} className
+ */
  // export function toggleClass(element, className) {
  //   if (!element || !className) {
  //     return
@@ -145,11 +146,11 @@
  // }
  
  /**
-  * @param {Function} func
-  * @param {number} wait
-  * @param {boolean} immediate
-  * @return {*}
-  */
+ * @param {Function} func
+ * @param {number} wait
+ * @param {boolean} immediate
+ * @return {*}
+ */
  export function debounce(func, wait, immediate) {
    let timeout, args, context, timestamp, result
    // console.log('我在防抖函数里面')
@@ -186,12 +187,12 @@
  }
  
  /**
-  * This is just a simple version of deep copy
-  * Has a lot of edge cases bug
-  * If you want to use a perfect deep copy, use lodash's _.cloneDeep
-  * @param {Object} source
-  * @returns {Object}
-  */
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source
+ * @returns {Object}
+ */
  export function deepClone(source) {
    if (!source && typeof source !== 'object') {
      throw new Error('error arguments', 'deepClone')
@@ -208,16 +209,16 @@
  }
  
  /**
-  * @param {Array} arr
-  * @returns {Array}
-  */
+ * @param {Array} arr
+ * @returns {Array}
+ */
  export function uniqueArr(arr) {
    return Array.from(new Set(arr))
  }
  
  /**
-  * @returns {string}
-  */
+ * @returns {string}
+ */
  export function createUniqueString() {
    const timestamp = +new Date() + ''
    const randomNum = parseInt((1 + Math.random()) * 65536) + ''
@@ -225,29 +226,29 @@
  }
  
  /**
-  * Check if an element has a class
-  * @param {HTMLElement} elm
-  * @param {string} cls
-  * @returns {boolean}
-  */
+ * Check if an element has a class
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ * @returns {boolean}
+ */
  export function hasClass(ele, cls) {
    return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
  }
  
  /**
-  * Add class to element
-  * @param {HTMLElement} elm
-  * @param {string} cls
-  */
+ * Add class to element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
  export function addClass(ele, cls) {
    if (!hasClass(ele, cls)) ele.className += ' ' + cls
  }
  
  /**
-  * Remove class from element
-  * @param {HTMLElement} elm
-  * @param {string} cls
-  */
+ * Remove class from element
+ * @param {HTMLElement} elm
+ * @param {string} cls
+ */
  export function removeClass(ele, cls) {
    if (hasClass(ele, cls)) {
      const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
@@ -274,10 +275,10 @@
  
  // 判断是否存在某个父级元素，层级不定
  /**
-  * @param {*} obj 当前节点，如点击事件返回的e.target
-  * @param {*} searchName 要查找是否存在的父级节点class
-  * @returns 
-  */
+ * @param {*} obj 当前节点，如点击事件返回的e.target
+ * @param {*} searchName 要查找是否存在的父级节点class
+ * @returns 
+ */
  export function getParentNode(obj,searchName) {
    let node = obj;
    let ofDiv = true;
@@ -322,11 +323,11 @@
  
  // 匹配正则返回值
  /** 具体参数详细，可参照README.md的[表单组件补充:currenForm]说明
-  * @param {*} type      需要匹配的正则类型
-  * @param {*} defaultValue     当前传入值（即需要校验值）
-  * @param {*} fixedNum  如果type为pointNumber，需要保留小数点后的位数
-  * @returns 
-  */
+ * @param {*} type      需要匹配的正则类型
+ * @param {*} defaultValue     当前传入值（即需要校验值）
+ * @param {*} fixedNum  如果type为pointNumber，需要保留小数点后的位数
+ * @returns 
+ */
  export function getMatchRegConformValue(type,defaultValue,fixedNum){
    let value = defaultValue ? String(defaultValue) : ''
    let _conformValue = ""
@@ -414,8 +415,8 @@
  // faster-new
  // 转义及读取api接口返回的表头信息 
  export function zhApiColumnsLable (data,list) {
-    let _list = list ? list : store.getters.columZHList
-    return _list ? _list[data] : data
+   let _list = list ? list : store.getters.columZHList
+   return _list ? _list[data] : data
  }
  
  // 首字母转换 type='Lower'(小写，默认) Upper（大写）
@@ -428,4 +429,102 @@
        return str.substring(0,1).toUpperCase() + str.substring(1,str.length);
      
    }
+ }
+ 
+ //  get-dto-column-type接口表头类型初始化
+ export function initApiColumnsForDto (list,titleName,that) {
+   let data = that.$store.getters.dtoColumnTypes
+   console.log(417,data,titleName)
+   let _coloums = data[titleName].S
+   let _Columns_Table = []
+   if(_coloums){
+     let _data = _coloums.dtoList
+     _data.forEach(item=>{
+       // 如果list接口存在数据 ，与list接口返回字段比较处理,list接口存在的话则追加
+       let _if = firstWordSizeChange(item.name) != 'details'
+       if(list){
+         _if = firstWordSizeChange(item.name) in list && firstWordSizeChange(item.name) != 'details'
+       }
+       if(_if){
+         _Columns_Table.push(item)
+       }
+     })
+   }
+   if(list){
+     _Columns_Table = _Columns_Table.concat(specialAddColumns(list,titleName))
+   }
+   return _Columns_Table
+ }
+ 
+ // 特殊字段转义处理（api中没有的字段特殊处理）
+ export function specialAddColumns(list,titleName){
+   let _apiName = titleName
+   let _special_list=[]
+   // creationTime
+   if('creationTime' in list){
+     _special_list.push(
+       {
+         "name": "CreationTime",
+         "apiBaseType": "datetime",
+         "baseApiName": _apiName + 'CreationTime',
+         "label": zhApiColumnsLable(_apiName + 'CreationTime') || i18n.t('columNames.CreationTime'),
+         "prop": "creationTime",
+       }
+     )
+   }
+   // creatorId
+   if('creatorId' in list){
+     _special_list.push(
+       {
+         "name": "CreatorId",
+         "apiBaseType": "string",
+         "baseApiName": _apiName + 'CreatorId',
+         "label": zhApiColumnsLable(_apiName + 'CreatorId') || i18n.t('columNames.CreatorId'),
+         "prop": "creatorId",
+       }
+     )
+   }
+   // lastModificationTime
+   if('lastModificationTime' in list){
+     _special_list.push(
+       {
+         "name": "LastModificationTime",
+         "apiBaseType": "datetime",
+         "baseApiName": _apiName + 'LastModificationTime',
+         "label": zhApiColumnsLable(_apiName + 'LastModificationTime') || i18n.t('columNames.LastModificationTime'),
+         "prop": "lastModificationTime",
+       }
+     )
+   }
+   // lastModifierId
+   if('lastModifierId' in list){
+     _special_list.push(
+       {
+         "name": "LastModifierId",
+         "apiBaseType": "string",
+         "baseApiName": _apiName + 'LastModifierId',
+         "label": zhApiColumnsLable(_apiName + 'LastModifierId') || i18n.t('columNames.LastModifierId'),
+         "prop": "lastModifierId",
+       }
+     )
+   }
+   // tenantId
+   if('tenantId' in list){
+     _special_list.push(
+       {
+         "name": "TenantId",
+         "apiBaseType": "string",
+         "baseApiName": _apiName + 'TenantId',
+         "label": zhApiColumnsLable(_apiName + 'TenantId') || i18n.t('columNames.TenantId'),
+         "prop": "tenantId",
+       }
+     )
+   }
+   return _special_list
+ }
+ 
+ // 从字段中删除最后某字段
+ export function sliceStrEndDelete(str,deleteStr){
+   let _d_l = str.length - deleteStr.length
+   return str.slice(0,_d_l)
  }