diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js
index 08062ff..6d83859 100644
--- a/PC/InterFace.Dash/public/config.js
+++ b/PC/InterFace.Dash/public/config.js
@@ -1,6 +1,6 @@
// dev_win
-// window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
-window.SITE_CONFIG['base'] = 'http://192.168.0.180:60068'
+window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:60068'
+// window.SITE_CONFIG['base'] = 'http://192.168.0.180:60068'
window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization'
// window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration'
diff --git a/PC/InterFace.Dash/src/App.vue b/PC/InterFace.Dash/src/App.vue
index 3e9b966..8595665 100644
--- a/PC/InterFace.Dash/src/App.vue
+++ b/PC/InterFace.Dash/src/App.vue
@@ -17,7 +17,14 @@ localStorage.setItem('isSinglePage',window.SITE_CONFIG['isSinglePage'])
localStorage.setItem('userNameOrEmailAddress',window.SITE_CONFIG['userNameOrEmailAddress'])
localStorage.setItem('client_secret',window.SITE_CONFIG['client_secret'])
localStorage.setItem('menuHiddenConfig',window.SITE_CONFIG['menuHiddenConfig'])
-
+// 获取浏览器语言
+const language_brow = (navigator.language || navigator.browserLanguage)
+console.log(21,language_brow)
+if(language_brow.indexOf('zh')){
+ localStorage.setItem('browserLanguage','zh-Hans')
+}else{
+ localStorage.setItem('browserLanguage','en')
+}
// localStorage.setItem('user',window.SITE_CONFIG['user'])
// localStorage.setItem('print',window.SITE_CONFIG['print'])
// localStorage.setItem('warehouseCode',window.SITE_CONFIG['warehouseCode'])
diff --git a/PC/InterFace.Dash/src/api/wms-interface.js b/PC/InterFace.Dash/src/api/wms-interface.js
index 1a56926..a7b6ee8 100644
--- a/PC/InterFace.Dash/src/api/wms-interface.js
+++ b/PC/InterFace.Dash/src/api/wms-interface.js
@@ -8,7 +8,10 @@ export function getInterfaceBoard() {
return request({
method:'get',
url: base_api + colum_url,
- params:{CultureName:'zh-Hans'}
+ params:{
+ CultureName:localStorage.getItem('browserLanguage'),
+ OnlyDynamics:false
+ }
// params:{IncludeLocalizationResources:true}
})
}
@@ -33,8 +36,9 @@ export async function getApiEnumList() {
// 获取dto列数据
export async function getDtoColumnType(api) {
+ if(!api)return
return request({
method:'post',
- url: base_api + '/api/'+ api +'/base/get-dto-column-type',
+ url: base_api + '/api/'+ api +'/get-dto-column-type',
})
}
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
index e268c7f..4cbc7e9 100644
--- a/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
+++ b/PC/InterFace.Dash/src/components/filterForDetailPage/index.vue
@@ -127,6 +127,7 @@ import { filterSelectMixins } from '@/mixins/filter-Select'
// import { TestSchoolDetailList,TestSchoolDetailList_delete } from "@/api/wms-interface"
import * as interfaceApi from "@/api/wms-interface"
import {getListDesById,getPageListForDetail} from "@/api/wms-api"
+import { getDtoColumnType } from "@/api/wms-interface"
import * as allUrlOption from '@/utils/baseData/urlOption'
export default {
name: 'filterForDetailPage',
@@ -174,10 +175,10 @@ props: {
default: null
},
// 列表数据-表头
- listColumns:{
- type: Array,
- default: null
- },
+ // listColumns:{
+ // type: Array,
+ // default: null
+ // },
// 主表数据-表头
parentColumns:{
type: Array,
@@ -215,6 +216,7 @@ data () {
showParentTitle:null,//显示父级数据弹窗-title
showParentTableData:null,//显示父级数据弹窗-数据
showParentLoading:false,//显示父级数据弹窗-加载
+ listColumns:[],//表头数据
}
},
mounted(){
@@ -251,22 +253,32 @@ methods: {
paging(callback){
this.Loading.tableLoading = true
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
- getPageListForDetail(this.PageListParams,this.URLOption_detailList)
- // interfaceApi[this.URLOption_detailList](this.PageListParams)
- .then(result => {
+ Promise.all([
+ getDtoColumnType(this.URLOption_detailList),
+ getPageListForDetail(this.PageListParams,this.URLOption_detailList)
+ ]).then((allData) => {
+ // 表头处理
+ if(allData[0]){
+ let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+ let _Columns = this.initApiColumnsForDto(allData[0],allData[1].items[0],_parentName)
+ this.listColumns = this.initTableColumns(_Columns)
+ }
+ // 页面数据处理
+ if(allData[1]){
this.Loading.tableLoading = false
this.tableData = []
- result.items.forEach(item=>{
+ allData[1].items.forEach(item=>{
item.deleteTipVisible = false
this.tableData.push(item)
})
- this.totalCount = result.totalCount
this.pagingCallback(callback)
- })
- .catch(err => {
- this.Loading.tableLoading = false
- this.$message.error("数据获取失败")
- })
+ this.totalCount = allData[1].totalCount
+ }
+ this.pagingCallback(callback)
+ }).catch(()=>{
+ this.Loading.tableLoading = false
+ this.$message.error("数据获取失败")
+ })
},
// 查看主表信息
showParentHandleForDetail(data){
diff --git a/PC/InterFace.Dash/src/components/umyTable/index copy.vue b/PC/InterFace.Dash/src/components/umyTable/index copy.vue
new file mode 100644
index 0000000..73207f1
--- /dev/null
+++ b/PC/InterFace.Dash/src/components/umyTable/index copy.vue
@@ -0,0 +1,996 @@
+
+
+
+
+
+
+
+ 操作
+
+
+ {{itemButton.label}}
+
+
+
+
+
+ 操作
+
+
+ {{itemButton.label}}
+
+
+
+
+
+
+
+ {{ item.label }}
+ *
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
+ {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
+
+
+ {{ scope.row[item.prop]? scope.row[item.prop][item.showProp]: "" | formatDate }}
+
+
+ {{ scope.row[item.prop] | formatDate }}
+
+
+
+ {{ propsData[item.showProp] }}
+
+
+ {{ scope.row[item.prop] | trigger(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] | trigger(item.filters, "label", item.dictType) }}
+
+
+ {{ scope.row[item.prop][item.showProp] | trigger(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] | triggerList(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
+
+
+
+
+
+
+
+
+ {{ showDetailData ? showDetailData + "" : showDetailData }}
+
+
+
+
+
+
+
+
+
+
+ 复制JSON
+
+
+
+
+
+
+ {{scope.row.value}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue
index 73207f1..1c82757 100644
--- a/PC/InterFace.Dash/src/components/umyTable/index.vue
+++ b/PC/InterFace.Dash/src/components/umyTable/index.vue
@@ -84,285 +84,36 @@
*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- {{item.label}}
-
-
-
-
- {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
-
-
- {{ scope.row[item.prop]? scope.row[item.prop][item.showProp]: "" | formatDate }}
-
-
{{ scope.row[item.prop] | formatDate }}
-
-
- {{ propsData[item.showProp] }}
-
-
- {{ scope.row[item.prop] | trigger(item.filters, "label") }}
-
-
- {{ scope.row[item.prop] | trigger(item.filters, "label", item.dictType) }}
+
+
+ {{ initApiEnumList(item,scope.row[item.prop]) }}
-
- {{ scope.row[item.prop][item.showProp] | trigger(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] ? '是' : '否' }}
-
- {{ scope.row[item.prop] | triggerList(item.filters, "label") }}
+
+
+ {{ scope.row[item.prop] }}
-
- {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
-
+ {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
- {{ scope.row[item.prop] ? scope.row[item.prop] + "" : scope.row[item.prop] }}
-
+ :class="{ showDetailHover: initApiOtherType(scope.row[item.prop])[1] != 'show' }"
+ >
+ {{ initApiOtherType(scope.row[item.prop])[0] }}
+
@@ -577,6 +328,7 @@ export default {
showJsonData:null,//点开查看Json的数据
showJsonData_str:null,//复制的Json字符串
showJsonCopy:false,//复制json的Dialog显隐控制
+ initTypeList:['system.decimal','system.int64','system.int32','system.long']
};
},
computed: {
@@ -843,14 +595,15 @@ export default {
this.$emit("inlineDialog", row);
},
//可点出详情弹窗
- showDetailInfo(row) {
+ showDetailInfo(row,type) {
this.showDetailDialog = true
- this.showDetailData = row
- this.$emit("showDetailInfo", row);
+ this.showDetailData = type == 'time' ? formatTimeStrToStr(row) : row
+ this.$emit("showDetailInfo", this.showDetailData);
},
// 可点出json转换的table弹窗
showJsonTable(row){
this.showJsonDialog = true
+ console.log(606,_json)
let _json = eval('(' + row + ')')
let _arr = []
let __initJson = (data) => {
@@ -886,28 +639,50 @@ export default {
}
}
}
+ console.log(666,this.showJsonData)
+
this.showJsonData = _arr
+
this.showJsonData_str = JSON.stringify(JSON.parse(JSON.stringify(this.showJsonData)), null, '\t')
this.$emit("showJsonTable", row);
},
// 复制Json按钮
copyJsonHandle(){
+ console.log(651,window.isSecureContext)
this.showJsonCopy = true
- navigator.clipboard.writeText(this.showJsonData_str)
- .then(() => {
- this.$message.success('复制成功');
- })
- .catch(err => {
- this.$message.error('复制失败');
- });
- this.$nextTick(()=>{
- if(this.$refs.copyJsonTextarea_ref){
- this.$refs.copyJsonTextarea_ref.focus()
+ if (navigator.clipboard && window.isSecureContext) {
+ navigator.clipboard.writeText(this.showJsonData_str)
+ .then(() => {
+ this.$message.success('复制成功');
+ })
+ .catch(err => {
+ this.$message.error('复制失败');
+ });
+ }else {
+ // 创建text area
+ const textArea = document.createElement('textarea')
+ textArea.value = this.showJsonData_str
+ // 使text area不在viewport,同时设置不可见
+ document.body.appendChild(textArea)
+ textArea.focus()
+ textArea.select()
+ return new Promise((resolve, reject) => {
+ // 执行复制命令并移除文本框
+ document.execCommand('copy') ? resolve() : reject(new Error('出错了'))
+ textArea.remove()
+ }).then(() => {
this.$nextTick(()=>{
- document.getElementById('copyJsonTextarea_dialog_ref').scrollTop = 0
+ if(this.$refs.copyJsonTextarea_ref){
+ this.$message.success('复制成功');
+ this.$refs.copyJsonTextarea_ref.focus()
+ document.getElementById('copyJsonTextarea_dialog_ref').scrollTop = 0
+ }
})
- }
- })
+ },() => {
+ this.$message.error('复制失败');
+ })
+ }
+
},
//点击按钮打开自定义弹窗
buttonClick(row, index, label) {
@@ -921,6 +696,36 @@ export default {
buttonOperationClick_right(row, item, index) {
this.$emit("buttonOperationClick_right", row, item, index);
},
+ // 转义枚举值
+ initApiEnumList(item,data){
+ let _enumListOp = this.$store.getters.enumList[item.apiBaseType]
+ let _item_enumList = {}
+ _enumListOp.enumValues.forEach((item,key)=>{
+ _item_enumList[item] = _enumListOp.enumNames[key]
+ })
+ return _item_enumList[data] || '未定义'
+ },
+ // 其他类型转义,直接显示 | 点击可出详情 | 点击可点出json
+ initApiOtherType(data){
+ try {
+ let _json = JSON.parse(data)
+ // 数值类型
+ if(typeof _json == 'number' && _json){
+ return [data,'show']
+ }else{
+ return [data,'json']
+ }
+ }
+ // 直接显示
+ catch(err){
+ return [data,'detail']
+ }
+ },
+ // 判断操作
+ showTypeHandle(type,row){
+ if(type == 'detail')this.showDetailInfo(row)
+ if(type == 'json')this.showJsonTable(row)
+ },
},
};
diff --git a/PC/InterFace.Dash/src/mixins/TableMixins.js b/PC/InterFace.Dash/src/mixins/TableMixins.js
index 251c472..2b89158 100644
--- a/PC/InterFace.Dash/src/mixins/TableMixins.js
+++ b/PC/InterFace.Dash/src/mixins/TableMixins.js
@@ -48,6 +48,8 @@ export const tableMixins = {
URLOption_base:allUrlOption[this.$route.name].baseURL,
//主表-明细
URLOption_detail:allUrlOption[this.$route.name].detailURL,
+ //明细列表(主表明细找枚举转义使用)
+ URLOption_detailList:allUrlOption[this.$route.name].detailListURL,
// 主表-明细-筛选数据同步回显
detailSearchDataFE:null,
// 主表-操作列
@@ -56,40 +58,54 @@ export const tableMixins = {
},
methods: {
// 获取通过api的表头数据,不可以在初始化处理,因为接口返回问题
- initApiColumns(table,des,detailsTable,detailsPage){
- // 赋值表头数据
- // if(table && table[this.$route.name])this.apiColumns_Table = this.initTableColumns(table[this.$route.name])
- if(des && des[this.$route.name])this.apiColumns_DesTions = des[this.$route.name]
- 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')
+ // initApiColumns(table,des,detailsTable,detailsPage){
+ // // 赋值表头数据
+ // if(table && table[this.$route.name])this.apiColumns_Table = this.initTableColumns(table[this.$route.name])
+ // if(des && des[this.$route.name])this.apiColumns_DesTions = des[this.$route.name]
+ // 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(data,list,titleName){
+ let _coloums = data.filter(item=>{
+ return item.dtoType == 'S'
+ })
+ let _Columns_Table = []
+ if(_coloums && _coloums.length > 0){
+ let _data = _coloums[0].columnsTypes
+ _data.forEach(item=>{
+ let _item = {
+ label:initFromApiColumnsLable(titleName + item.z_ColumnName) || item.z_ColumnName,
+ prop:firstWordSizeChange(item.z_ColumnName),
+ apiType:item.z_ColumnType,
+ apiBaseType:item.z_ColumnBaseType,
+ apiIsEnum:item.isEnum
+ }
+ // 如果list接口存在数据 ,与list接口返回字段比较处理,list接口存在的话则追加
+ let _if = firstWordSizeChange(item.z_ColumnName) != 'details'
+ if(list && list.length > 0){
+ _if = firstWordSizeChange(item.z_ColumnName) in list && firstWordSizeChange(item.z_ColumnName) != 'details'
+ }
+ if(_if){
+ _Columns_Table.push(_item)
+ }
+ })
+ }
+ return _Columns_Table
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
Promise.all([
- getDtoColumnType(this.$route.name),
+ getDtoColumnType(this.URLOption_base),
getPageList(this.PageListParams, this.URLOption_base)
]).then((allData) => {
// 表头处理
if(allData[0]){
- let _coloums = allData[0].filter(item=>{
- return item.dtoType == 'S'
- })
- let _Columns_Table = []
- if(_coloums && _coloums.length > 0){
- let _data = _coloums[0].columnsTypes
- _data.forEach(item=>{
- let _item = {
- label:initFromApiColumnsLable(this.$route.name + item.z_ColumnName) || item.z_ColumnName,
- prop:firstWordSizeChange(item.z_ColumnName),
- apiType:item.z_ColumnType,
- isEnum:item.isEnum
- }
- _Columns_Table.push(_item)
- })
- }
- this.apiColumns_Table = this.initTableColumns(_Columns_Table)
+ let _Columns = this.initApiColumnsForDto(allData[0],allData[1].items[0] ,this.$route.name)
+ this.apiColumns_Table = this.initTableColumns(_Columns)
+ this.apiColumns_DesTions = _Columns
}
// 页面数据处理
if(allData[1]){
@@ -97,17 +113,10 @@ export const tableMixins = {
this.totalCount = allData[1].totalCount
}
this.pagingCallback(callback)
- console.log(111,this.apiColumns_Table,this.tableData)
- }).catch(()=>{
+ }).catch((err)=>{
this.Loading.tableLoading = false
+ if(error_callback)error_callback()
})
- // getPageList(this.PageListParams, this.URLOption_base).then(res => {
- // this.tableData = res.items
- // this.totalCount = res.totalCount
- // this.pagingCallback(callback)
- // }).catch(err => {
- // this.Loading.tableLoading = false
- // })
},
//接受排序信息并改变视图
sortChange(val) {
@@ -147,24 +156,35 @@ 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) {
- if(this.$refs.currenDrawer_Ref){
- this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
- this.inlineDialogCallback()
- },()=>{
- this.Loading.DrawerLoading = false
- })
+ Promise.all([
+ getDtoColumnType(this.URLOption_detailList),
+ getDetailed(val.id, _url)
+ ]).then((allData) => {
+ // 表头处理
+ if(allData[0]){
+ let _parentName = this.URLOption_detailList.substr(0,this.URLOption_detailList.indexOf('/'))
+ this.initApiColumnsForDto(allData[0],allData[1].details[0],_parentName)
+ this.apiColumns_DetailsTable = this.initTableColumns(this.initApiColumnsForDto(allData[0],allData[1].details[0],_parentName))
+ }
+ // 页面数据处理
+ if(allData[1]){
+ let res = allData[1]
+ // 打印使用的全部数据存储
+ this.tableDataDetails = JSON.parse(JSON.stringify(res))
+ this.propsData = res
+ if (res.details) {
+ if(this.$refs.currenDrawer_Ref){
+ this.$refs.currenDrawer_Ref.getDetailList(res,()=>{
+ this.inlineDialogCallback()
+ },()=>{
+ this.Loading.DrawerLoading = false
+ })
+ }
+ }else{
+ this.Loading.DrawerLoading = false
}
- // 前端分页处理
- // this.propsData = this.detailListPageFromFE(res)
- }else{
- this.Loading.DrawerLoading = false
}
- }).catch(err => {
+ }).catch(()=>{
this.Loading.DrawerLoading = false
})
},
@@ -277,7 +297,6 @@ export const tableMixins = {
// if( _item.name == 'search' || _item.name == 'moreList-search'){
// let _searchObj = {}
// let searchData = options.data_moreList.filters;
- // console.log(299,searchData)
// searchData.forEach(item=>{
// _searchObj[item.column] = item.value
// })
diff --git a/PC/InterFace.Dash/src/permission.js b/PC/InterFace.Dash/src/permission.js
index 9e82108..ab774e3 100644
--- a/PC/InterFace.Dash/src/permission.js
+++ b/PC/InterFace.Dash/src/permission.js
@@ -6,7 +6,6 @@ import 'nprogress/nprogress.css' // progress bar style
import { getToken } from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title'
import { asyncRoutes } from '@/router'
-import { getInterfaceBoard } from "@/api/wms-interface"
import { login,getUsersByUserName } from "@/api/wms-auth"
NProgress.configure({
@@ -19,6 +18,16 @@ router.beforeEach(async (to, from, next) => {
// set page title
document.title = getPageTitle()
+ // 获取枚举数据
+ if(!store.getters.enumList || store.getters.enumList.length <= 0){
+ await store.dispatch('definition/getEnumList')
+ }
+
+ // // 获取表头转义
+ // if(!store.getters.columZHList || store.getters.columZHList.length <= 0){
+ // await store.dispatch('definition/getColumZHList')
+ // }
+
// 判断是否自动登录
let isAutoLogin = JSON.parse(localStorage.getItem('isAutoLogin'))
const interfaceBoardColumnsNames = localStorage.getItem("interfaceBoardColumnsNames")
@@ -52,11 +61,12 @@ router.beforeEach(async (to, from, next) => {
})
}
}else{
- console.log('没有store.getters.currentUserInfo',store.getters.currentUserInfo)
+ // console.log('没有store.getters.currentUserInfo',store.getters.currentUserInfo)
if(!interfaceBoardColumnsNames){
console.log('没有interfaceBoardColumnsNames',interfaceBoardColumnsNames)
- const accessRoutes = await store.dispatch('permission/getApiColumnsNames')
- router.addRoutes(accessRoutes)
+ await store.dispatch('definition/getColumZHList')
+ // const accessRoutes = await store.dispatch('permission/getApiColumnsNames')
+ // router.addRoutes(accessRoutes)
next({
...to,
query:{
diff --git a/PC/InterFace.Dash/src/router/index.js b/PC/InterFace.Dash/src/router/index.js
index 387cbee..d2b2f2e 100644
--- a/PC/InterFace.Dash/src/router/index.js
+++ b/PC/InterFace.Dash/src/router/index.js
@@ -88,7 +88,7 @@ export let constantRoutes = [
name: 'Dashboard',
meta: {
keepAlive : true,
- title: '系统首页',
+ title: localStorage.getItem('browserLanguage') == 'zh-Hans' ? '系统首页' : 'Dashboard',
icon: '系统首页',
outerFirst:true
// affix: true
diff --git a/PC/InterFace.Dash/src/store/getters.js b/PC/InterFace.Dash/src/store/getters.js
index ce9a17f..544de54 100644
--- a/PC/InterFace.Dash/src/store/getters.js
+++ b/PC/InterFace.Dash/src/store/getters.js
@@ -13,6 +13,8 @@ const getters = {
currentUserInfo: state => state.user.userInfo,
permission_routes: state => state.permission.routes,
errorLogs: state => state.errorLog.logs,
- dictionaries: state => state.dictionaries.dict
+ dictionaries: state => state.dictionaries.dict,
+ enumList: state => state.definition.enumList,
+ columZHList: state => state.definition.enumList,
}
export default getters
diff --git a/PC/InterFace.Dash/src/store/modules/definition.js b/PC/InterFace.Dash/src/store/modules/definition.js
index 7d8b791..fc46be0 100644
--- a/PC/InterFace.Dash/src/store/modules/definition.js
+++ b/PC/InterFace.Dash/src/store/modules/definition.js
@@ -1,16 +1,39 @@
+import { getInterfaceBoard,getApiEnumList } from "@/api/wms-interface"
+
const state = {
- enumList: []
+ enumList: [],//枚举
+ columZHList:null,//表头转义
}
const mutations = {
- GET_ENUM_LIST: (state, log) => {
- state.logs.push(log)
+ GET_ENUM_LIST: (state, data) => {
+ state.enumList=data
+ },
+ GET_COLUMZH_LIST: (state, data) => {
+ state.columZHList=data
},
}
const actions = {
- getEnumList({ commit }, log) {
- commit('GET_ENUM_LIST', log)
+ // 获取枚举
+ getEnumList({ commit }) {
+ return new Promise(resolve => {
+ getApiEnumList().then(res=>{
+ commit('GET_ENUM_LIST', res.types)
+ resolve(res)
+ })
+ })
+ },
+ // 获取表头转义
+ getColumZHList({ commit }) {
+ return new Promise(resolve => {
+ getInterfaceBoard().then(res=>{
+ let _zh = res.resources[localStorage.getItem('columnsApiNamesZh')].texts;
+ localStorage.setItem("interfaceBoardColumnsNames",JSON.stringify(_zh))
+ commit('GET_COLUMZH_LIST', _zh)
+ resolve(res)
+ })
+ })
},
}
diff --git a/PC/InterFace.Dash/src/store/modules/permission.js b/PC/InterFace.Dash/src/store/modules/permission.js
index 7f14117..c44f7f1 100644
--- a/PC/InterFace.Dash/src/store/modules/permission.js
+++ b/PC/InterFace.Dash/src/store/modules/permission.js
@@ -140,14 +140,14 @@ export function generaMenu(routes, data, first) {
}
// todo:接口返回的层级菜单,与查重后最终显示的菜单数组做查重及组合处理
-export function initTreeMenusHandle(tree, list,zh,first) {
+export function initTreeMenusHandle(tree, list,first) {
let _res = []
tree.forEach(item=>{
if(list.indexOf(item.name) >= 0){
- item.title = zh[item.name] || item.name
+ item.title = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames"))[item.name] || item.name
if(first)item.component = '@/layout'
if (item.children && item.children.length > 0) {
- item.children = initTreeMenusHandle(item.children,list,zh)
+ item.children = initTreeMenusHandle(item.children,list)
}
_res.push(item)
}
@@ -168,8 +168,6 @@ const actions = {
// resolve(accessedRoutes)
getDefinitionMenu(true).then(res => {
let _allConfig = res.auth.grantedPolicies;//所有配置
- let _zh = res.localization.values[localStorage.getItem('columnsApiNamesZh')];
- localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(_zh));
let _menuList = []//接口获取所有的菜单
for(let item in _allConfig){
let point_number = item.split('.').length - 1
@@ -235,13 +233,13 @@ const actions = {
let _initTreeMenus = []
if(_treeMenusAll && _treeMenusAll.length > 0){
- _initTreeMenus = initTreeMenusHandle(_treeMenusAll,_showMenus,_zh,true)
+ _initTreeMenus = initTreeMenusHandle(_treeMenusAll,_showMenus,true)
}else{
let _data = []
for(let i in _showMenus){
_data.push({name:_showMenus[i]})
}
- _initTreeMenus = initTreeMenusHandle(_data,_showMenus,_zh,true)
+ _initTreeMenus = initTreeMenusHandle(_data,_showMenus,true)
}
// 最后查重+层级查重后的菜单
let _initEndMenus = generaMenu(asyncRoutes, _initTreeMenus,true)
diff --git a/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js b/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
index 192faa8..875ee72 100644
--- a/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/detailsPageColumns_api/index.js
@@ -4,82 +4,76 @@
import { initFromApiColumnsLable } from '@/utils/index'
// AsnMstr
-export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
-]
+// export const AsnMstr = [
+// { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
+// { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
+// ]
// PoMstr
-export const PoMstr = [
- { label: initFromApiColumnsLable('PoDetConsignment'), prop: "consignment",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetOrderQty'), prop: "orderQty" },
- { label: initFromApiColumnsLable('PoDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetPoLine'), prop: "poLine",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetPoNbr'), prop: "poNbr",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetRcQty'), prop: "rcQty" },
- { label: initFromApiColumnsLable('PoDetRemark'), prop: "remark",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetStdPackQty'), prop: "stdPackQty" },
- { label: initFromApiColumnsLable('PoDetStdPackUm'), prop: "stdPackUm",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetUmConv'), prop: "umConv",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetVendPackQty'), prop: "vendPackQty" },
- { label: initFromApiColumnsLable('PoDetVendPackUm'), prop: "vendPackUm" ,type:'showDetail'},
-]
+// export const PoMstr = [
+// { label: initFromApiColumnsLable('PoDetConsignment'), prop: "consignment",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetOrderQty'), prop: "orderQty" },
+// { label: initFromApiColumnsLable('PoDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetPoLine'), prop: "poLine",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetPoNbr'), prop: "poNbr",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetRcQty'), prop: "rcQty" },
+// { label: initFromApiColumnsLable('PoDetRemark'), prop: "remark",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetStdPackQty'), prop: "stdPackQty" },
+// { label: initFromApiColumnsLable('PoDetStdPackUm'), prop: "stdPackUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetUmConv'), prop: "umConv",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetVendPackQty'), prop: "vendPackQty" },
+// { label: initFromApiColumnsLable('PoDetVendPackUm'), prop: "vendPackUm" ,type:'showDetail'},
+// ]
-// ReceiptMstr
-export const ReceiptMstr = [
- { label: initFromApiColumnsLable('ReceiptDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
- { label: initFromApiColumnsLable('ReceiptDetLoc'), prop: "loc" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetLot'), prop: "lot",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPackingCode'), prop: "packingCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPoLine'), prop: "poLine" ,type:'showDetail'},
- { label: initFromApiColumnsLable('ReceiptDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('ReceiptDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('ReceiptDetRemark'), prop: "remark" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetVendorLot'), prop: "vendorLot",type:'showDetail' },
-]
+// // ReceiptMstr
+// export const ReceiptMstr = [
+// { label: initFromApiColumnsLable('ReceiptDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
+// { label: initFromApiColumnsLable('ReceiptDetLoc'), prop: "loc" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetLot'), prop: "lot",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPackingCode'), prop: "packingCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPoLine'), prop: "poLine" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('ReceiptDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('ReceiptDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('ReceiptDetRemark'), prop: "remark" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetVendorLot'), prop: "vendorLot",type:'showDetail' },
+// ]
-// ReturnMstr
-export const ReturnMstr = [
- { label: initFromApiColumnsLable('ReturnDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
- { label: initFromApiColumnsLable('ReturnDetLoc'), prop: "loc" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetLot'), prop: "lot",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPackingCode'), prop: "packingCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPoLine'), prop: "poLine" ,type:'showDetail'},
- { label: initFromApiColumnsLable('ReturnDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('ReturnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('ReturnDetRemark'), prop: "remark" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetVendorLot'), prop: "vendorLot",type:'showDetail' },
-]
-
-// 测试数据
-export const TestSchool = [
- { label: initFromApiColumnsLable('TestStudentDetailStudentName'), prop: "studentName" },
- { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
-]
\ No newline at end of file
+// // ReturnMstr
+// export const ReturnMstr = [
+// { label: initFromApiColumnsLable('ReturnDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
+// { label: initFromApiColumnsLable('ReturnDetLoc'), prop: "loc" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetLot'), prop: "lot",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPackingCode'), prop: "packingCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPoLine'), prop: "poLine" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('ReturnDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('ReturnDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('ReturnDetRemark'), prop: "remark" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetVendorLot'), prop: "vendorLot",type:'showDetail' },
+// ]
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js b/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
index a386bc6..a5d0bc7 100644
--- a/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/detailsTableColumns_api/index.js
@@ -5,76 +5,76 @@
import { initFromApiColumnsLable } from '@/utils/index'
// AsnMstr
-export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",showProp:true},
- { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
- { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
- { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
-]
+// export const AsnMstr = [
+// { label: initFromApiColumnsLable('AsnDetAsnMstrId'), prop: "asnMstrId",showProp:true},
+// { label: initFromApiColumnsLable('AsnDetAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetEntireBarCode'), prop: "entireBarCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLabelCode'), prop: "labelCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLocUm'), prop: "locUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetLot'), prop: "lot" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetPalletLabelCode'), prop: "palletLabelCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPartType'), prop: "partType",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoLine'), prop: "poLine",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoNbr'), prop: "poNbr",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetPoUm'), prop: "poUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('AsnDetRemark'), prop: "remark",type:'showDetail' ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetStatus'), prop: "status" },
+// { label: initFromApiColumnsLable('AsnDetStdPackQty'), prop: "stdPackQty" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetSupplierlot'), prop: "supplierlot",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetUmConv'), prop: "umConv",type:'showDetail' },
+// { label: initFromApiColumnsLable('AsnDetWareClass'), prop: "wareClass" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('AsnDetWareCode'), prop: "wareCode" ,type:'showDetail'},
+// ]
// PoMstr
-export const PoMstr = [
- { label: initFromApiColumnsLable('PoDetConsignment'), prop: "consignment",type:'showDetail' ,showProp:true},
- { label: initFromApiColumnsLable('PoDetOrderQty'), prop: "orderQty" },
- { label: initFromApiColumnsLable('PoDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetPoLine'), prop: "poLine",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetPoNbr'), prop: "poNbr",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetRcQty'), prop: "rcQty" },
- { label: initFromApiColumnsLable('PoDetRemark'), prop: "remark",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetStdPackQty'), prop: "stdPackQty" },
- { label: initFromApiColumnsLable('PoDetStdPackUm'), prop: "stdPackUm",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetUmConv'), prop: "umConv",type:'showDetail' },
- { label: initFromApiColumnsLable('PoDetVendPackQty'), prop: "vendPackQty" },
- { label: initFromApiColumnsLable('PoDetVendPackUm'), prop: "vendPackUm" ,type:'showDetail'},
-]
+// export const PoMstr = [
+// { label: initFromApiColumnsLable('PoDetConsignment'), prop: "consignment",type:'showDetail' ,showProp:true},
+// { label: initFromApiColumnsLable('PoDetOrderQty'), prop: "orderQty" },
+// { label: initFromApiColumnsLable('PoDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetPoLine'), prop: "poLine",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetPoNbr'), prop: "poNbr",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetRcQty'), prop: "rcQty" },
+// { label: initFromApiColumnsLable('PoDetRemark'), prop: "remark",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetStdPackQty'), prop: "stdPackQty" },
+// { label: initFromApiColumnsLable('PoDetStdPackUm'), prop: "stdPackUm",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetUmConv'), prop: "umConv",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoDetVendPackQty'), prop: "vendPackQty" },
+// { label: initFromApiColumnsLable('PoDetVendPackUm'), prop: "vendPackUm" ,type:'showDetail'},
+// ]
-// ReceiptMstr
-export const ReceiptMstr = [
- { label: initFromApiColumnsLable('ReceiptDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
- { label: initFromApiColumnsLable('ReceiptDetLoc'), prop: "loc" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetLot'), prop: "lot",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPackingCode'), prop: "packingCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetPoLine'), prop: "poLine" ,type:'showDetail'},
- { label: initFromApiColumnsLable('ReceiptDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('ReceiptDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('ReceiptDetRemark'), prop: "remark" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptDetVendorLot'), prop: "vendorLot",type:'showDetail' },
-]
+// // ReceiptMstr
+// export const ReceiptMstr = [
+// { label: initFromApiColumnsLable('ReceiptDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
+// { label: initFromApiColumnsLable('ReceiptDetLoc'), prop: "loc" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetLot'), prop: "lot",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPackingCode'), prop: "packingCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetPoLine'), prop: "poLine" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('ReceiptDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('ReceiptDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('ReceiptDetRemark'), prop: "remark" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptDetVendorLot'), prop: "vendorLot",type:'showDetail' },
+// ]
-// ReturnMstr
-export const ReturnMstr = [
- { label: initFromApiColumnsLable('ReturnDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
- { label: initFromApiColumnsLable('ReturnDetLoc'), prop: "loc" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetLot'), prop: "lot",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPackingCode'), prop: "packingCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPartCode'), prop: "partCode",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetPoLine'), prop: "poLine" ,type:'showDetail'},
- { label: initFromApiColumnsLable('ReturnDetProductionDate'), prop: "productionDate",type:'dateTime' },
- { label: initFromApiColumnsLable('ReturnDetQty'), prop: "qty" },
- { label: initFromApiColumnsLable('ReturnDetRemark'), prop: "remark" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetStatus'), prop: "status",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetUm'), prop: "um",type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnDetVendorLot'), prop: "vendorLot",type:'showDetail' },
-]
\ No newline at end of file
+// // ReturnMstr
+// export const ReturnMstr = [
+// { label: initFromApiColumnsLable('ReturnDetContainerCode'), prop: "containerCode",type:'showDetail' ,showProp:true},
+// { label: initFromApiColumnsLable('ReturnDetLoc'), prop: "loc" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetLot'), prop: "lot",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPackingCode'), prop: "packingCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPartCode'), prop: "partCode",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetPoLine'), prop: "poLine" ,type:'showDetail'},
+// { label: initFromApiColumnsLable('ReturnDetProductionDate'), prop: "productionDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('ReturnDetQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('ReturnDetRemark'), prop: "remark" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetStatus'), prop: "status",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetUm'), prop: "um",type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnDetVendorLot'), prop: "vendorLot",type:'showDetail' },
+// ]
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
index a95193a..ab66cc5 100644
--- a/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
+++ b/PC/InterFace.Dash/src/utils/tableColumns_api/index.js
@@ -4,418 +4,418 @@
import { initFromApiColumnsLable } from '@/utils/index'
// ExportCustomUserSetting
-export const ExportCustomUserSetting = [
- { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName" },
- // { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserId'), prop: "exportUserId" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserName'), prop: "exportUserName",type:'dateTime' },
-]
+// export const ExportCustomUserSetting = [
+// { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName" },
+// // { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserId'), prop: "exportUserId" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserName'), prop: "exportUserName",type:'dateTime' },
+// ]
// AsnMstr
-export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr", fixed:'left', type:"showDetail"},
- { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrDueDate'), prop: "dueDate",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('AsnMstrErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr" , type:"showDetail"},
- { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrShipDate'), prop: "shipDate" ,type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" , type:"showDetail"},
- { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" , type:"showDetail"},
- { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse", type:"showDetail" },
- // {
- // label: '操作',
- // type:"buttonOperation",
- // buttonText:'查看详情',
- // buttonName:'info',
- // fixed: "right",
- // },
-]
+// export const AsnMstr = [
+// { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr", fixed:'left', type:"showDetail"},
+// { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrDueDate'), prop: "dueDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('AsnMstrErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr" , type:"showDetail"},
+// { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrShipDate'), prop: "shipDate" ,type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" , type:"showDetail"},
+// { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" , type:"showDetail"},
+// { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse", type:"showDetail" },
+// // {
+// // label: '操作',
+// // type:"buttonOperation",
+// // buttonText:'查看详情',
+// // buttonName:'info',
+// // fixed: "right",
+// // },
+// ]
// IncomingData
-export const IncomingData = [
- { label: initFromApiColumnsLable('IncomingDataCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataDataContent'), prop: "dataContent", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataDataType'), prop: "dataType" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataDestinationSystem'), prop: "destinationSystem" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataNumber'), prop: "number", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataReader'), prop: "reader", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataWriteTime'), prop: "writeTime", type:"dateTime" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataWriter'), prop: "writer", type:"showDetail" },
-]
+// export const IncomingData = [
+// { label: initFromApiColumnsLable('IncomingDataCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataDataContent'), prop: "dataContent", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataDataType'), prop: "dataType" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataDestinationSystem'), prop: "destinationSystem" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('IncomingDataErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataNumber'), prop: "number", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataReadTime'), prop: "readTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('IncomingDataReader'), prop: "reader", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataWriteTime'), prop: "writeTime", type:"dateTime" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataWriter'), prop: "writer", type:"showDetail" },
+// ]
-// IncomingDataHistory
-export const IncomingDataHistory = [
- { label: initFromApiColumnsLable('IncomingDataHistoryCompany'), prop: "company" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataHistoryDataContent'), prop: "dataContent", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataHistoryErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryNumber'), prop: "number", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('IncomingDataHistoryReader'), prop: "reader", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryRetryTimes'), prop: "retryTimes" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataHistorySourceSystem'), prop: "sourceSystem" , type:"showDetail"},
- { label: initFromApiColumnsLable('IncomingDataHistoryStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('IncomingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('IncomingDataHistoryWriter'), prop: "writer" , type:"showDetail"},
-]
+// // IncomingDataHistory
+// export const IncomingDataHistory = [
+// { label: initFromApiColumnsLable('IncomingDataHistoryCompany'), prop: "company" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataHistoryDataContent'), prop: "dataContent", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('IncomingDataHistoryErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryNumber'), prop: "number", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('IncomingDataHistoryReader'), prop: "reader", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataHistorySourceSystem'), prop: "sourceSystem" , type:"showDetail"},
+// { label: initFromApiColumnsLable('IncomingDataHistoryStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('IncomingDataHistoryWriter'), prop: "writer" , type:"showDetail"},
+// ]
-// OutgoingData
-export const OutgoingData = [
- { label: initFromApiColumnsLable('OutgoingDataCompany'), prop: "company" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('OutgoingDataDataType'), prop: "dataType" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataNumber'), prop: "number", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataReader'), prop: "reader", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('OutgoingDataWriter'), prop: "writer", type:"showDetail" },
-]
+// // OutgoingData
+// export const OutgoingData = [
+// { label: initFromApiColumnsLable('OutgoingDataCompany'), prop: "company" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataDataContent'), prop: "dataContent", type:"showJsonTable" },
+// { label: initFromApiColumnsLable('OutgoingDataDataType'), prop: "dataType" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataNumber'), prop: "number", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataReadTime'), prop: "readTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataReader'), prop: "reader", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataRetryTimes'), prop: "retryTimes" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataSourceSystem'), prop: "sourceSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataWriteTime'), prop: "writeTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('OutgoingDataWriter'), prop: "writer", type:"showDetail" },
+// ]
-// OutgoingDataHistory
-export const OutgoingDataHistory = [
- { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number", type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status", type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer", type:"showDetail" },
-]
+// // OutgoingDataHistory
+// export const OutgoingDataHistory = [
+// { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number", type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status", type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer", type:"showDetail" },
+// ]
-// MessageReceive
-export const MessageReceive = [
- { label: initFromApiColumnsLable('MessageReceiveErrorCount'), prop: "errorCount", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveLastUpdateTime'), prop: "updateTime",type:'dateTime' },
- { label: initFromApiColumnsLable('MessageReceiveMessageContent'), prop: "messageContent", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveMessageFileName'), prop: "messageFileName", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveMessageFileType'), prop: "messageFileType", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveOperateType'), prop: "operateType" , type:"showDetail"},
- { label: initFromApiColumnsLable('MessageReceiveReceiveStatus'), prop: "receiveStatus", type:"showDetail" },
- { label: initFromApiColumnsLable('MessageReceiveReceiveTime'), prop: "receiveTime", type:"dateTime" },
-]
+// // MessageReceive
+// export const MessageReceive = [
+// { label: initFromApiColumnsLable('MessageReceiveErrorCount'), prop: "errorCount", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveLastUpdateTime'), prop: "updateTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('MessageReceiveMessageContent'), prop: "messageContent", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveMessageFileName'), prop: "messageFileName", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveMessageFileType'), prop: "messageFileType", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveOperateType'), prop: "operateType" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MessageReceiveReceiveStatus'), prop: "receiveStatus", type:"showDetail" },
+// { label: initFromApiColumnsLable('MessageReceiveReceiveTime'), prop: "receiveTime", type:"dateTime" },
+// ]
-// MesProductL7PartsNote
-export const MesProductL7PartsNote = [
- { label: initFromApiColumnsLable('MesProductL7PartsNoteConfiguration'), prop: "configuration" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNoteCreateDate'), prop: "createDate", type:"dateTime" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteFATA'), prop: "fata", type:"showDetail" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteL7Part'), prop: "l7Part" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNotePosition'), prop: "position" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNoteProductNo'), prop: "productNo" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNoteProgram'), prop: "program", type:"showDetail" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteQty'), prop: "qty" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNoteRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('MesProductL7PartsNoteRowID'), prop: "rowID", type:"showDetail" },
- { label: initFromApiColumnsLable('MesProductL7PartsNoteState'), prop: "state", type:"showDetail" },
-]
+// // MesProductL7PartsNote
+// export const MesProductL7PartsNote = [
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteConfiguration'), prop: "configuration" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteCreateDate'), prop: "createDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteFATA'), prop: "fata", type:"showDetail" },
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteL7Part'), prop: "l7Part" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNotePosition'), prop: "position" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteProductNo'), prop: "productNo" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteProgram'), prop: "program", type:"showDetail" },
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteQty'), prop: "qty" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteRowID'), prop: "rowID", type:"showDetail" },
+// { label: initFromApiColumnsLable('MesProductL7PartsNoteState'), prop: "state", type:"showDetail" },
+// ]
-// 测试数据
-export const TestSchool = [
- { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
- { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
-]
+// // 测试数据
+// export const TestSchool = [
+// { label: initFromApiColumnsLable('TestSchoolSchoolName'), prop: "schoolName", fixed: "left", type: "name" },
+// { label: initFromApiColumnsLable('TestStudentDetailOrderType'), prop: "orderType" },
+// ]
-// MesProductL7PartsNote
-export const Bom = [
- { label: initFromApiColumnsLable('BomCompany'), prop: "company" , type:"showDetail"},
- { label: initFromApiColumnsLable('BomComponent'), prop: "component", type:"showDetail" },
- { label: initFromApiColumnsLable('BomEndDate'), prop: "endDate", type:"dateTime" },
- { label: initFromApiColumnsLable('BomErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('BomErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('BomOp'), prop: "op" , type:"showDetail"},
- { label: initFromApiColumnsLable('BomOptionGroup'), prop: "optionGroup", type:"showDetail" },
- { label: initFromApiColumnsLable('BomParent'), prop: "parent" , type:"showDetail"},
- { label: initFromApiColumnsLable('BomPerQty'), prop: "qty" },
- { label: initFromApiColumnsLable('BomProcess'), prop: "process", type:"showDetail" },
- { label: initFromApiColumnsLable('BomRef2'), prop: "ref2", type:"showDetail" },
- { label: initFromApiColumnsLable('BomRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('BomScrapPct'), prop: "scrapPct", type:"showDetail" },
- { label: initFromApiColumnsLable('BomSeqNumber'), prop: "seqNumber", type:"showDetail" },
- { label: initFromApiColumnsLable('BomStartDate'), prop: "startDate", type:"dateTime" },
- { label: initFromApiColumnsLable('BomTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('BomType'), prop: "type", type:"showDetail" },
-]
+// // MesProductL7PartsNote
+// export const Bom = [
+// { label: initFromApiColumnsLable('BomCompany'), prop: "company" , type:"showDetail"},
+// { label: initFromApiColumnsLable('BomComponent'), prop: "component", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomEndDate'), prop: "endDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('BomErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('BomErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('BomOp'), prop: "op" , type:"showDetail"},
+// { label: initFromApiColumnsLable('BomOptionGroup'), prop: "optionGroup", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomParent'), prop: "parent" , type:"showDetail"},
+// { label: initFromApiColumnsLable('BomPerQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('BomProcess'), prop: "process", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomRef2'), prop: "ref2", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomScrapPct'), prop: "scrapPct", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomSeqNumber'), prop: "seqNumber", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomStartDate'), prop: "startDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('BomTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('BomType'), prop: "type", type:"showDetail" },
+// ]
-export const Cust = [
- { label: initFromApiColumnsLable('CustActive'), prop: "active" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustAddr1'), prop: "addr1", type:"showDetail" },
- { label: initFromApiColumnsLable('CustAddr2'), prop: "addr2", type:"showDetail" },
- { label: initFromApiColumnsLable('CustAddr3'), prop: "addr3", type:"showDetail" },
- { label: initFromApiColumnsLable('CustCity'), prop: "city" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustCode'), prop: "code" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('CustContacts'), prop: "contacts" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustCountry'), prop: "country" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustCurr'), prop: "curr", type:"showDetail" },
- { label: initFromApiColumnsLable('CustErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('CustErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('CustFax'), prop: "fax", type:"showDetail" },
- { label: initFromApiColumnsLable('CustName'), prop: "name", type:"showDetail" },
-]
+// export const Cust = [
+// { label: initFromApiColumnsLable('CustActive'), prop: "active" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustAddr1'), prop: "addr1", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustAddr2'), prop: "addr2", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustAddr3'), prop: "addr3", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustCity'), prop: "city" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustCode'), prop: "code" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustContacts'), prop: "contacts" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustCountry'), prop: "country" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustCurr'), prop: "curr", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustFax'), prop: "fax", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustName'), prop: "name", type:"showDetail" },
+// ]
-export const CustPart = [
- { label: initFromApiColumnsLable('CustPartCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartCustCode'), prop: "custCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustPartCustPackQty'), prop: "custPackQty" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustPartCustPackUm'), prop: "custPackUm", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartCustPartCode'), prop: "custPartCode", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartPartCode'), prop: "partCode", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('CustPartSite'), prop: "site", type:"showDetail" },
- { label: initFromApiColumnsLable('CustPartTraceId'), prop: "traceId", type:"showDetail" },
-]
+// export const CustPart = [
+// { label: initFromApiColumnsLable('CustPartCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartCustCode'), prop: "custCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustPartCustPackQty'), prop: "custPackQty" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustPartCustPackUm'), prop: "custPackUm", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartCustPartCode'), prop: "custPartCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartPartCode'), prop: "partCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('CustPartSite'), prop: "site", type:"showDetail" },
+// { label: initFromApiColumnsLable('CustPartTraceId'), prop: "traceId", type:"showDetail" },
+// ]
-export const Inventory = [
- { label: initFromApiColumnsLable('InventoryCompany'), prop: "company" , type:"showDetail"},
- { label: initFromApiColumnsLable('InventoryCustConsignQty'), prop: "custConsignQty" },
- { label: initFromApiColumnsLable('InventoryErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('InventoryErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('InventoryLoc'), prop: "loc" , type:"showDetail"},
- { label: initFromApiColumnsLable('InventoryLot'), prop: "lot", type:"showDetail" },
- { label: initFromApiColumnsLable('InventoryPart'), prop: "part" , type:"showDetail"},
- { label: initFromApiColumnsLable('InventoryQty'), prop: "qty" },
- { label: initFromApiColumnsLable('InventoryReference'), prop: "reference", type:"showDetail" },
- { label: initFromApiColumnsLable('InventoryRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('InventorySite'), prop: "site", type:"showDetail" },
- { label: initFromApiColumnsLable('InventoryStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('InventorySuppConsignQty'), prop: "suppConsignQty" },
- { label: initFromApiColumnsLable('InventoryTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('InventoryUm'), prop: "um", type:"showDetail" },
-]
+// export const Inventory = [
+// { label: initFromApiColumnsLable('InventoryCompany'), prop: "company" , type:"showDetail"},
+// { label: initFromApiColumnsLable('InventoryCustConsignQty'), prop: "custConsignQty" },
+// { label: initFromApiColumnsLable('InventoryErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('InventoryErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('InventoryLoc'), prop: "loc" , type:"showDetail"},
+// { label: initFromApiColumnsLable('InventoryLot'), prop: "lot", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventoryPart'), prop: "part" , type:"showDetail"},
+// { label: initFromApiColumnsLable('InventoryQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('InventoryReference'), prop: "reference", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventoryRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventorySite'), prop: "site", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventoryStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventorySuppConsignQty'), prop: "suppConsignQty" },
+// { label: initFromApiColumnsLable('InventoryTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('InventoryUm'), prop: "um", type:"showDetail" },
+// ]
-export const Loc = [
- { label: initFromApiColumnsLable('LocCode'), prop: "code" , type:"showDetail"},
- { label: initFromApiColumnsLable('LocCompany'), prop: "company" },
- { label: initFromApiColumnsLable('LocDesc'), prop: "desc" , type:"showDetail"},
- { label: initFromApiColumnsLable('LocErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('LocErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('LocRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('LocSite'), prop: "site", type:"showDetail" },
- { label: initFromApiColumnsLable('LocTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('LocType'), prop: "type", type:"showDetail" },
- { label: initFromApiColumnsLable('LocWhse'), prop: "whse" },
-]
+// export const Loc = [
+// { label: initFromApiColumnsLable('LocCode'), prop: "code" , type:"showDetail"},
+// { label: initFromApiColumnsLable('LocCompany'), prop: "company" },
+// { label: initFromApiColumnsLable('LocDesc'), prop: "desc" , type:"showDetail"},
+// { label: initFromApiColumnsLable('LocErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('LocErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('LocRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('LocSite'), prop: "site", type:"showDetail" },
+// { label: initFromApiColumnsLable('LocTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('LocType'), prop: "type", type:"showDetail" },
+// { label: initFromApiColumnsLable('LocWhse'), prop: "whse" },
+// ]
-export const Part = [
- { label: initFromApiColumnsLable('PartCode'), prop: "code" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartName'), prop: "name" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartDesc1'), prop: "desc1", type:"showDetail" },
- { label: initFromApiColumnsLable('PartDesc2'), prop: "desc2", type:"showDetail" },
- { label: initFromApiColumnsLable('PartAbcClass'), prop: "abcClass" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartCanBuy'), prop: "canBuy" },
- { label: initFromApiColumnsLable('PartCanMake'), prop: "canMake" },
- { label: initFromApiColumnsLable('PartColor'), prop: "color" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('PartConfig'), prop: "config", type:"showDetail" },
- { label: initFromApiColumnsLable('PartEco'), prop: "eco" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartExtPackQty'), prop: "extPackQty" },
- { label: initFromApiColumnsLable('PartExtPackUm'), prop: "extPackUm" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartIsPhantom'), prop: "isPhantom" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartPartCatalog'), prop: "partCatalog" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartPartGroup'), prop: "partGroup" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartPartType'), prop: "partType" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartProdKind'), prop: "prodKind" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartProject'), prop: "project" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartStatus'), prop: "status" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartStdPackQty'), prop: "stdPackQty" },
- { label: initFromApiColumnsLable('PartStdPackUm'), prop: "stdPackUm" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartTraceId'), prop: "traceId" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartUm'), prop: "um" , type:"showDetail"},
- { label: initFromApiColumnsLable('PartVersion'), prop: "version" , type:"showDetail"},
-]
+// export const Part = [
+// { label: initFromApiColumnsLable('PartCode'), prop: "code" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartName'), prop: "name" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartDesc1'), prop: "desc1", type:"showDetail" },
+// { label: initFromApiColumnsLable('PartDesc2'), prop: "desc2", type:"showDetail" },
+// { label: initFromApiColumnsLable('PartAbcClass'), prop: "abcClass" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartCanBuy'), prop: "canBuy" },
+// { label: initFromApiColumnsLable('PartCanMake'), prop: "canMake" },
+// { label: initFromApiColumnsLable('PartColor'), prop: "color" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('PartConfig'), prop: "config", type:"showDetail" },
+// { label: initFromApiColumnsLable('PartEco'), prop: "eco" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartExtPackQty'), prop: "extPackQty" },
+// { label: initFromApiColumnsLable('PartExtPackUm'), prop: "extPackUm" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartIsPhantom'), prop: "isPhantom" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartPartCatalog'), prop: "partCatalog" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartPartGroup'), prop: "partGroup" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartPartType'), prop: "partType" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartProdKind'), prop: "prodKind" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartProject'), prop: "project" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartStatus'), prop: "status" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartStdPackQty'), prop: "stdPackQty" },
+// { label: initFromApiColumnsLable('PartStdPackUm'), prop: "stdPackUm" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartTraceId'), prop: "traceId" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartUm'), prop: "um" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PartVersion'), prop: "version" , type:"showDetail"},
+// ]
-// PoMstr
-export const PoMstr = [
- { label: initFromApiColumnsLable('PoMstrPoNbr'), prop: "poNbr" ,type:'showDetail', fixed:'left' },
- { label: initFromApiColumnsLable('PoMstrBuyer'), prop: "buyer", type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrConsignment'), prop: "consignment", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrContacts'), prop: "contacts", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrContract'), prop: "contract",type:'showDetail' },
- { label: initFromApiColumnsLable('PoMstrDueDate'), prop: "dueDate", type:"dateTime" },
- { label: initFromApiColumnsLable('PoMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrModType'), prop: "modType", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrOrderDate'), prop: "orderDate", type:"dateTime" },
- { label: initFromApiColumnsLable('PoMstrProject'), prop: "project", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrTaxRate'), prop: "taxRate" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
-]
+// // PoMstr
+// export const PoMstr = [
+// { label: initFromApiColumnsLable('PoMstrPoNbr'), prop: "poNbr" ,type:'showDetail', fixed:'left' },
+// { label: initFromApiColumnsLable('PoMstrBuyer'), prop: "buyer", type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrConsignment'), prop: "consignment", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrContacts'), prop: "contacts", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrContract'), prop: "contract",type:'showDetail' },
+// { label: initFromApiColumnsLable('PoMstrDueDate'), prop: "dueDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('PoMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrModType'), prop: "modType", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrOrderDate'), prop: "orderDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('PoMstrProject'), prop: "project", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrTaxRate'), prop: "taxRate" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// ]
-// PrhHist
-export const PrhHist = [
- { label: initFromApiColumnsLable('PrhHistAsnNumber'), prop: "asnNumber" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistAsnQty'), prop: "asnQty" },
- { label: initFromApiColumnsLable('PrhHistBuyer'), prop: "buyer", type:"showDetail" },
- { label: initFromApiColumnsLable('PrhHistCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('PrhHistDock'), prop: "dock" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistLine'), prop: "line" },
- { label: initFromApiColumnsLable('PrhHistLocationCode'), prop: "locationCode" },
- { label: initFromApiColumnsLable('PrhHistLot'), prop: "lot" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistOrderQty'), prop: "orderQty" },
- { label: initFromApiColumnsLable('PrhHistPackageNumber'), prop: "packageNumber", type:"showDetail" },
- { label: initFromApiColumnsLable('PrhHistPalletNumber'), prop: "palletNumber" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistPart'), prop: "part", type:"showDetail" },
- { label: initFromApiColumnsLable('PrhHistPoNumber'), prop: "poNumber" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistPoSite'), prop: "poSite" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistProductionDate'), prop: "productionDate" , type:"dateTime"},
- { label: initFromApiColumnsLable('PrhHistQty'), prop: "qty" },
- { label: initFromApiColumnsLable('PrhHistReason'), prop: "reason" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistReceiveDate'), prop: "receiveDate" , type:"dateTime"},
- { label: initFromApiColumnsLable('PrhHistReceiveNumber'), prop: "receiveNumber" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistReceiveType'), prop: "receiveType" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistRequest'), prop: "request" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistRev'), prop: "rev" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistRma_type'), prop: "rma_type" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistShipDate'), prop: "shipDate" , type:"dateTime"},
- { label: initFromApiColumnsLable('PrhHistShipTo'), prop: "shipTo" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistStatus'), prop: "status" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistTraceId'), prop: "traceId" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistType'), prop: "type" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistUm'), prop: "um" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistUmConv'), prop: "umConv" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistVendor'), prop: "vendor" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistVendorLot'), prop: "vendorLot" , type:"showDetail"},
- { label: initFromApiColumnsLable('PrhHistWhse'), prop: "whse" , type:"showDetail"},
-]
+// // PrhHist
+// export const PrhHist = [
+// { label: initFromApiColumnsLable('PrhHistAsnNumber'), prop: "asnNumber" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistAsnQty'), prop: "asnQty" },
+// { label: initFromApiColumnsLable('PrhHistBuyer'), prop: "buyer", type:"showDetail" },
+// { label: initFromApiColumnsLable('PrhHistCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('PrhHistDock'), prop: "dock" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistLine'), prop: "line" },
+// { label: initFromApiColumnsLable('PrhHistLocationCode'), prop: "locationCode" },
+// { label: initFromApiColumnsLable('PrhHistLot'), prop: "lot" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistOrderQty'), prop: "orderQty" },
+// { label: initFromApiColumnsLable('PrhHistPackageNumber'), prop: "packageNumber", type:"showDetail" },
+// { label: initFromApiColumnsLable('PrhHistPalletNumber'), prop: "palletNumber" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistPart'), prop: "part", type:"showDetail" },
+// { label: initFromApiColumnsLable('PrhHistPoNumber'), prop: "poNumber" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistPoSite'), prop: "poSite" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistProductionDate'), prop: "productionDate" , type:"dateTime"},
+// { label: initFromApiColumnsLable('PrhHistQty'), prop: "qty" },
+// { label: initFromApiColumnsLable('PrhHistReason'), prop: "reason" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistReceiveDate'), prop: "receiveDate" , type:"dateTime"},
+// { label: initFromApiColumnsLable('PrhHistReceiveNumber'), prop: "receiveNumber" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistReceiveType'), prop: "receiveType" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistRequest'), prop: "request" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistRev'), prop: "rev" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistRma_type'), prop: "rma_type" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistShipDate'), prop: "shipDate" , type:"dateTime"},
+// { label: initFromApiColumnsLable('PrhHistShipTo'), prop: "shipTo" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistStatus'), prop: "status" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistTraceId'), prop: "traceId" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistType'), prop: "type" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistUm'), prop: "um" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistUmConv'), prop: "umConv" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistVendor'), prop: "vendor" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistVendorLot'), prop: "vendorLot" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PrhHistWhse'), prop: "whse" , type:"showDetail"},
+// ]
-// ProdLine
-export const ProdLine = [
- { label: initFromApiColumnsLable('ProdLineCode'), prop: "code" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLineCompany'), prop: "company" },
- { label: initFromApiColumnsLable('ProdLineDesc'), prop: "desc", type:"showDetail" },
- { label: initFromApiColumnsLable('ProdLineErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLineErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLinePart'), prop: "part", type:"showDetail" },
- { label: initFromApiColumnsLable('ProdLineRate'), prop: "rate" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLineRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLineSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('ProdLineTraceId'), prop: "traceId" , type:"showDetail"},
-]
+// // ProdLine
+// export const ProdLine = [
+// { label: initFromApiColumnsLable('ProdLineCode'), prop: "code" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLineCompany'), prop: "company" },
+// { label: initFromApiColumnsLable('ProdLineDesc'), prop: "desc", type:"showDetail" },
+// { label: initFromApiColumnsLable('ProdLineErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLineErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLinePart'), prop: "part", type:"showDetail" },
+// { label: initFromApiColumnsLable('ProdLineRate'), prop: "rate" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLineRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLineSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ProdLineTraceId'), prop: "traceId" , type:"showDetail"},
+// ]
-// ReceiptMstr
-export const ReceiptMstr = [
- { label: initFromApiColumnsLable('ReceiptMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail', fixed:'left' },
- { label: initFromApiColumnsLable('ReceiptMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrPoNbr'), prop: "poNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRcNbr'), prop: "rcNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRcTime'), prop: "rcTime", type:"dateTime" },
- { label: initFromApiColumnsLable('ReceiptMstrRcWorker'), prop: "rcWorker", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrWhse'), prop: "whse", type:"showDetail" },
-]
+// // ReceiptMstr
+// export const ReceiptMstr = [
+// { label: initFromApiColumnsLable('ReceiptMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail', fixed:'left' },
+// { label: initFromApiColumnsLable('ReceiptMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrPoNbr'), prop: "poNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcNbr'), prop: "rcNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcTime'), prop: "rcTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcWorker'), prop: "rcWorker", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrWhse'), prop: "whse", type:"showDetail" },
+// ]
-// ReturnMstr
-export const ReturnMstr = [
- { label: initFromApiColumnsLable('ReturnMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail', fixed:'left' },
- { label: initFromApiColumnsLable('ReturnMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrPoNbr'), prop: "poNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrRtNbr'), prop: "rtNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrRtTime'), prop: "rtTime", type:"dateTime" },
- { label: initFromApiColumnsLable('ReturnMstrRtWorker'), prop: "rtWorker", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrWhse'), prop: "whse", type:"showDetail" },
-]
+// // ReturnMstr
+// export const ReturnMstr = [
+// { label: initFromApiColumnsLable('ReturnMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail', fixed:'left' },
+// { label: initFromApiColumnsLable('ReturnMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrPoNbr'), prop: "poNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrRtNbr'), prop: "rtNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrRtTime'), prop: "rtTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('ReturnMstrRtWorker'), prop: "rtWorker", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrWhse'), prop: "whse", type:"showDetail" },
+// ]
-// VendPart
-export const VendPart = [
- { label: initFromApiColumnsLable('VendPartCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendPartPartCode'), prop: "partCode", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendPartSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendPartTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartVendPackQty'), prop: "vendPackQty", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartVendPackUm'), prop: "vendPackUm", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartVendPartCode'), prop: "vendPartCode", type:"showDetail" },
- { label: initFromApiColumnsLable('VendPartVendorCode'), prop: "vendorCode", type:"showDetail" },
-]
+// // VendPart
+// export const VendPart = [
+// { label: initFromApiColumnsLable('VendPartCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendPartPartCode'), prop: "partCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendPartSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendPartTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartVendPackQty'), prop: "vendPackQty", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartVendPackUm'), prop: "vendPackUm", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartVendPartCode'), prop: "vendPartCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendPartVendorCode'), prop: "vendorCode", type:"showDetail" },
+// ]
-// Vend
-export const Vend = [
- { label: initFromApiColumnsLable('VendActive'), prop: "active" , type:"showDetail" },
- { label: initFromApiColumnsLable('VendAddr1'), prop: "addr1", type:"showDetail" },
- { label: initFromApiColumnsLable('VendAddr2'), prop: "addr2" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendAddr3'), prop: "addr3", type:"showDetail" },
- { label: initFromApiColumnsLable('VendBank'), prop: "bank" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendCity'), prop: "city" , type:"showDetail"},
- { label: initFromApiColumnsLable('VendCode'), prop: "code", type:"showDetail" },
- { label: initFromApiColumnsLable('VendCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('VendContacts'), prop: "contacts", type:"showDetail" },
- { label: initFromApiColumnsLable('VendCountry'), prop: "country", type:"showDetail" },
- { label: initFromApiColumnsLable('VendCurr'), prop: "curr", type:"showDetail" },
- { label: initFromApiColumnsLable('VendErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('VendErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('VendFax'), prop: "fax", type:"showDetail" },
- { label: initFromApiColumnsLable('VendName'), prop: "name", type:"showDetail" },
-]
+// // Vend
+// export const Vend = [
+// { label: initFromApiColumnsLable('VendActive'), prop: "active" , type:"showDetail" },
+// { label: initFromApiColumnsLable('VendAddr1'), prop: "addr1", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendAddr2'), prop: "addr2" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendAddr3'), prop: "addr3", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendBank'), prop: "bank" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendCity'), prop: "city" , type:"showDetail"},
+// { label: initFromApiColumnsLable('VendCode'), prop: "code", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendContacts'), prop: "contacts", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendCountry'), prop: "country", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendCurr'), prop: "curr", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendFax'), prop: "fax", type:"showDetail" },
+// { label: initFromApiColumnsLable('VendName'), prop: "name", type:"showDetail" },
+// ]
// 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序
diff --git a/PC/InterFace.Dash/src/utils/tabsDesTions_api/index.js b/PC/InterFace.Dash/src/utils/tabsDesTions_api/index.js
index d1ab407..58c5440 100644
--- a/PC/InterFace.Dash/src/utils/tabsDesTions_api/index.js
+++ b/PC/InterFace.Dash/src/utils/tabsDesTions_api/index.js
@@ -4,110 +4,110 @@
import { initFromApiColumnsLable } from '@/utils/index'
// ExportCustomUserSetting
-export const ExportCustomUserSetting = [
- { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", type:'name' },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserId'), prop: "exportUserId" },
- { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserName'), prop: "exportUserName",type:'dateTime' },
-]
+// export const ExportCustomUserSetting = [
+// { label: initFromApiColumnsLable('ExportCustomUserSettingCustomUserSetting'), prop: "customUserSetting", type:'name' },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportColumnName'), prop: "exportColumnName" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportTableName'), prop: "exportTableName" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserId'), prop: "exportUserId" },
+// { label: initFromApiColumnsLable('ExportCustomUserSettingExportUserName'), prop: "exportUserName",type:'dateTime' },
+// ]
// AsnMstr
-export const AsnMstr = [
- { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr" },
- { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" },
- { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts" },
- { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock" },
- { label: initFromApiColumnsLable('AsnMstrDueDate'), prop: "dueDate",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" },
- { label: initFromApiColumnsLable('AsnMstrErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone" },
- { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr",type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark" },
- { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr" },
- { label: initFromApiColumnsLable('AsnMstrShipDate'), prop: "shipDate" ,type:'dateTime' },
- { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site" },
- { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status" },
- { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" },
- { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId" },
- { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" },
- { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode" },
- { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse" },
-]
+// export const AsnMstr = [
+// { label: initFromApiColumnsLable('AsnMstrAsnNbr'), prop: "asnNbr" },
+// { label: initFromApiColumnsLable('AsnMstrCompany'), prop: "company" },
+// { label: initFromApiColumnsLable('AsnMstrContacts'), prop: "contacts" },
+// { label: initFromApiColumnsLable('AsnMstrDock'), prop: "dock" },
+// { label: initFromApiColumnsLable('AsnMstrDueDate'), prop: "dueDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnMstrErrorCode'), prop: "errorCode" },
+// { label: initFromApiColumnsLable('AsnMstrErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('AsnMstrPhone'), prop: "phone" },
+// { label: initFromApiColumnsLable('AsnMstrPoNbr'), prop: "poNbr",type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnMstrRemark'), prop: "remark" },
+// { label: initFromApiColumnsLable('AsnMstrRpNbr'), prop: "rpNbr" },
+// { label: initFromApiColumnsLable('AsnMstrShipDate'), prop: "shipDate" ,type:'dateTime' },
+// { label: initFromApiColumnsLable('AsnMstrSite'), prop: "site" },
+// { label: initFromApiColumnsLable('AsnMstrStatus'), prop: "status" },
+// { label: initFromApiColumnsLable('AsnMstrTimeWindow'), prop: "timeWindow" },
+// { label: initFromApiColumnsLable('AsnMstrTraceId'), prop: "traceId" },
+// { label: initFromApiColumnsLable('AsnMstrTruckNbr'), prop: "truckNbr" },
+// { label: initFromApiColumnsLable('AsnMstrVendorCode'), prop: "vendorCode" },
+// { label: initFromApiColumnsLable('AsnMstrWhse'), prop: "whse" },
+// ]
// OutgoingDataHistory
-export const OutgoingDataHistory = [
- { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number", type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
- { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem", type:"showDetail" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status", type:"showDetail"},
- { label: initFromApiColumnsLable('OutgoingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
- { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer", type:"showDetail" },
-]
+// export const OutgoingDataHistory = [
+// { label: initFromApiColumnsLable('OutgoingDataHistoryCompany'), prop: "company", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDataContent'), prop: "dataContent", type:"showJsonTable" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDataType'), prop: "dataType", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryErrorCode'), prop: "errorCode" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryErrorMessage'), prop: "errorMessage", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryNumber'), prop: "number", type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryReadTime'), prop: "readTime",type:'dateTime' },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryReader'), prop: "reader", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryRetryTimes'), prop: "retryTimes", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistorySourceSystem'), prop: "sourceSystem", type:"showDetail" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryStatus'), prop: "status", type:"showDetail"},
+// { label: initFromApiColumnsLable('OutgoingDataHistoryWriteTime'), prop: "writeTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('OutgoingDataHistoryWriter'), prop: "writer", type:"showDetail" },
+// ]
-// PoMstr
-export const PoMstr = [
- { label: initFromApiColumnsLable('PoMstrPoNbr'), prop: "poNbr" ,type:'showDetail' },
- { label: initFromApiColumnsLable('PoMstrBuyer'), prop: "buyer", type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrConsignment'), prop: "consignment", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrContacts'), prop: "contacts", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrContract'), prop: "contract",type:'dateTime' },
- { label: initFromApiColumnsLable('PoMstrDueDate'), prop: "dueDate", type:"dateTime" },
- { label: initFromApiColumnsLable('PoMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrModType'), prop: "modType", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrOrderDate'), prop: "orderDate", type:"dateTime" },
- { label: initFromApiColumnsLable('PoMstrProject'), prop: "project", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrRemark'), prop: "remark", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrStatus'), prop: "status", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrTaxRate'), prop: "taxRate" , type:"showDetail"},
- { label: initFromApiColumnsLable('PoMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('PoMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
-]
+// // PoMstr
+// export const PoMstr = [
+// { label: initFromApiColumnsLable('PoMstrPoNbr'), prop: "poNbr" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('PoMstrBuyer'), prop: "buyer", type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrConsignment'), prop: "consignment", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrContacts'), prop: "contacts", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrContract'), prop: "contract",type:'dateTime' },
+// { label: initFromApiColumnsLable('PoMstrDueDate'), prop: "dueDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('PoMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrModType'), prop: "modType", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrOrderDate'), prop: "orderDate", type:"dateTime" },
+// { label: initFromApiColumnsLable('PoMstrProject'), prop: "project", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrRemark'), prop: "remark", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrStatus'), prop: "status", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrTaxRate'), prop: "taxRate" , type:"showDetail"},
+// { label: initFromApiColumnsLable('PoMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('PoMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// ]
-// ReceiptMstr
-export const ReceiptMstr = [
- { label: initFromApiColumnsLable('ReceiptMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReceiptMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrPoNbr'), prop: "poNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRcNbr'), prop: "rcNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRcTime'), prop: "rcTime", type:"dateTime" },
- { label: initFromApiColumnsLable('ReceiptMstrRcWorker'), prop: "rcWorker", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReceiptMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReceiptMstrWhse'), prop: "whse", type:"showDetail" },
-]
+// // ReceiptMstr
+// export const ReceiptMstr = [
+// { label: initFromApiColumnsLable('ReceiptMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReceiptMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrPoNbr'), prop: "poNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcNbr'), prop: "rcNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcTime'), prop: "rcTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('ReceiptMstrRcWorker'), prop: "rcWorker", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrRpNbr'), prop: "rpNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReceiptMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReceiptMstrWhse'), prop: "whse", type:"showDetail" },
+// ]
-// ReturnMstr
-export const ReturnMstr = [
- { label: initFromApiColumnsLable('ReturnMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
- { label: initFromApiColumnsLable('ReturnMstrCompany'), prop: "company" , type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrErrorCode'), prop: "errorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrPoNbr'), prop: "poNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrRemark'), prop: "remark" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrRtNbr'), prop: "rtNbr", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrRtTime'), prop: "rtTime", type:"dateTime" },
- { label: initFromApiColumnsLable('ReturnMstrRtWorker'), prop: "rtWorker", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrSite'), prop: "site" , type:"showDetail"},
- { label: initFromApiColumnsLable('ReturnMstrTraceId'), prop: "traceId", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
- { label: initFromApiColumnsLable('ReturnMstrWhse'), prop: "whse", type:"showDetail" },
-]
\ No newline at end of file
+// // ReturnMstr
+// export const ReturnMstr = [
+// { label: initFromApiColumnsLable('ReturnMstrAsnNbr'), prop: "asnNbr" ,type:'showDetail' },
+// { label: initFromApiColumnsLable('ReturnMstrCompany'), prop: "company" , type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrErrorCode'), prop: "errorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrErrorMessage'), prop: "errorMessage" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrPoNbr'), prop: "poNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrRemark'), prop: "remark" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrRtNbr'), prop: "rtNbr", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrRtTime'), prop: "rtTime", type:"dateTime" },
+// { label: initFromApiColumnsLable('ReturnMstrRtWorker'), prop: "rtWorker", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrSite'), prop: "site" , type:"showDetail"},
+// { label: initFromApiColumnsLable('ReturnMstrTraceId'), prop: "traceId", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrVendorCode'), prop: "vendorCode", type:"showDetail" },
+// { label: initFromApiColumnsLable('ReturnMstrWhse'), prop: "whse", type:"showDetail" },
+// ]
\ No newline at end of file
diff --git a/PC/InterFace.Dash/src/views/login/index.vue b/PC/InterFace.Dash/src/views/login/index.vue
index fc17c45..ac1d2a7 100644
--- a/PC/InterFace.Dash/src/views/login/index.vue
+++ b/PC/InterFace.Dash/src/views/login/index.vue
@@ -70,7 +70,6 @@