diff --git a/PC/InterFace.Dash/public/config.js b/PC/InterFace.Dash/public/config.js index 4df295d..08062ff 100644 --- a/PC/InterFace.Dash/public/config.js +++ b/PC/InterFace.Dash/public/config.js @@ -1,6 +1,7 @@ // 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['businessApi'] = 'http://dev.ccwin-in.com:10097' window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-localization' // window.SITE_CONFIG['columnsApiNames'] = '/api/abp/application-configuration' window.SITE_CONFIG['columnsApiNamesZh'] = 'Z' diff --git a/PC/InterFace.Dash/src/App.vue b/PC/InterFace.Dash/src/App.vue index a88e274..3e9b966 100644 --- a/PC/InterFace.Dash/src/App.vue +++ b/PC/InterFace.Dash/src/App.vue @@ -9,6 +9,7 @@ export default { name: 'App' } localStorage.setItem('base',window.SITE_CONFIG['base']) +localStorage.setItem('businessApi',window.SITE_CONFIG['businessApi']) localStorage.setItem('columnsApiNames',window.SITE_CONFIG['columnsApiNames']) localStorage.setItem('columnsApiNamesZh',window.SITE_CONFIG['columnsApiNamesZh']) localStorage.setItem('isAutoLogin',window.SITE_CONFIG['isAutoLogin']) diff --git a/PC/InterFace.Dash/src/api/wms-business.js b/PC/InterFace.Dash/src/api/wms-business.js new file mode 100644 index 0000000..71f0dd9 --- /dev/null +++ b/PC/InterFace.Dash/src/api/wms-business.js @@ -0,0 +1,29 @@ +// 外部业务数据接口 +import request from '@/utils/request' +let businessApi = localStorage.getItem('businessApi') + +// 获取表头数据 +export function messageReceiveUpdateStatsById(id) { + return request({ + method:'get', + url: businessApi + '/api/wms/message-receive/update-stats-by-id/'+id, + }) +} + +// // 测试数据-明细-列表 +// export function TestSchoolDetailList(data,includeDetails) { +// return request({ +// method:'post', +// url: base_api + '/api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails), +// data +// }) +// } + +// // 测试数据-明细-删除 +// export function TestSchoolDetailList_delete(id) { +// return request({ +// method:'DELETE', +// url: base_api + '/api/TestStudentDetail/base/delete-by-id', +// params:{id:id} +// }) +// } \ No newline at end of file diff --git a/PC/InterFace.Dash/src/components/tablePagination/index.vue b/PC/InterFace.Dash/src/components/tablePagination/index.vue index d0eabdd..7aa12d8 100644 --- a/PC/InterFace.Dash/src/components/tablePagination/index.vue +++ b/PC/InterFace.Dash/src/components/tablePagination/index.vue @@ -53,6 +53,8 @@ @inlineDialog="inlineDialog" :buttonOperationList_left="buttonOperationList_left" @buttonOperationClick_left="buttonOperationClick_left" + :buttonOperationList_right="buttonOperationList_right" + @buttonOperationClick_right="buttonOperationClick_right" :tableBorder="true" :firstFixed="true" :cellStyle = "cellStyle" @@ -115,11 +117,16 @@ export default { return [] } }, - // 操作列按钮 + // 操作列按钮(左侧) buttonOperationList_left:{ type: Array, default: null, }, + // 操作列按钮(右侧) + buttonOperationList_right:{ + type: Function, + default: null, + }, // 列表数据 tableData: { type: Array, @@ -341,10 +348,14 @@ export default { sortChange (data) { this.$emit('sortChange', data) }, - //点击table操作列按钮 + //点击table操作列(左侧)按钮 buttonOperationClick_left(row, item, index) { this.$emit("buttonOperationClick_left", row, item, index); }, + //点击table操作列(右侧)按钮 + buttonOperationClick_right(row, item, index) { + this.$emit("buttonOperationClick_right", row, item, index); + }, // 全面筛选组件配置 // 全面筛选组件内部显示/隐藏更改触发,同步当前的showSearchOverall值 getShowSearchOverall(val){ diff --git a/PC/InterFace.Dash/src/components/umyTable/index.vue b/PC/InterFace.Dash/src/components/umyTable/index.vue index 1294a08..065d98e 100644 --- a/PC/InterFace.Dash/src/components/umyTable/index.vue +++ b/PC/InterFace.Dash/src/components/umyTable/index.vue @@ -53,7 +53,8 @@