zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

TestSchool模拟暂存

dev_web_online
安虹睿 2 years ago
parent
9ef4073c7a
commit
3c3244ac3b
18 changed files with 719 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      fe/PC/src/api/wms-interface.js
  2. 197
      fe/PC/src/components/filterForDetailPage/index.vue
  3. 7
      fe/PC/src/components/tablePagination/index.vue
  4. 4
      fe/PC/src/main.js
  5. 12
      fe/PC/src/utils/defaultButtons.js
  6. 26
      fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js
  7. 33
      fe/PC/src/utils/isLocalApiTableColums/index.js
  8. 252
      fe/PC/src/utils/isLocalApiTableDesTions/index.js
  9. 2
      fe/PC/src/utils/utils.js
  10. 97
      fe/PC/src/views/interfaceBoard/TestSchool.vue
  11. 33
      fe/PC/src/views/interfaceBoard/comingFromOut.vue
  12. 33
      fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
  13. 33
      fe/PC/src/views/interfaceBoard/comingToWms.vue
  14. 33
      fe/PC/src/views/interfaceBoard/comingToWms_file.vue
  15. 1
      fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
  16. 19
      fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
  17. 33
      fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
  18. 27
      fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue

32
fe/PC/src/api/wms-interface.js
View File

@ -103,7 +103,15 @@ export function TestSchool(data, includeDetails) {
})
}
// 测试数据-新增、编辑
// 测试数据-列表-根据id获取详情
export function TestSchoolItemById(id) {
return axios({
method:'get',
url: base_api + 'api/app/test-school/'+id,
})
}
// 测试数据-列表-新增、编辑
export function TestSchool_save(data,isAdd) {
let _type = isAdd ? 'create' : 'update-by-id'
// let _url = isEdit ? '/api/TestSchool/base/update-by-id?id='+ data.id : '/api/TestSchool/base/create'
@ -118,11 +126,29 @@ export function TestSchool_save(data,isAdd) {
})
}
// 测试数据-删除
// 测试数据-列表-删除
export function TestSchool_delete(id) {
return axios({
method:'DELETE',
url: base_api + 'outgoing-to-external/' + id,
url: base_api + 'api/TestSchool/base/delete-by-id',
params:{id:id}
})
}
// 测试数据-明细-列表
export function TestSchoolDetailList(data,includeDetails) {
return axios({
method:'post',
url: base_api + 'api/TestStudentDetail/base/get-list-page-by-filter?includeDetails='+Boolean(includeDetails),
data
})
}
// 测试数据-明细-删除
export function TestSchoolDetailList_delete(id) {
return axios({
method:'DELETE',
url: base_api + 'api/TestStudentDetail/base/delete-by-id',
params:{id:id}
})
}

197
fe/PC/src/components/filterForDetailPage/index.vue
View File

@ -0,0 +1,197 @@
<template>
<div class="filterForDetailPage">
<el-dialog
title="明细查询"
:visible.sync="dialogShow"
top="5vh"
width="96%"
:modal-append-to-body="false"
:append-to-body="false"
:show-close="true"
@close="closeDialog(false)"
>
<div
class="filterForDetailPage-list"
v-loading="Loading.tableLoading"
>
<!-- 列表 -->
<tablePagination
v-if="dialogShow"
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="listColumns"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
:setUTableHeight="setUTableHeight"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
<template>
<el-table-column
label="操作"
:align="'center'"
width="100"
>
<template slot-scope="scope">
<el-popover
placement="left"
width="260"
v-model="scope.row.deleteTipVisible"
>
<p>此操作将永久删除该消息, 是否继续?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" style="margin-right: 20px;" @click="scope.row.deleteTipVisible = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteHandle(scope.row)">确定</el-button>
</div>
<el-button type="text" slot="reference" style="color: red;">删除</el-button>
</el-popover>
</template>
</el-table-column>
</template>
</tablePagination>
</div>
</el-dialog>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
import { TestSchoolDetailList,TestSchoolDetailList_delete } from "@/api/wms-interface"
export default {
name: 'filterForDetailPage',
mixins: [
tableMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
LoadingMixins
],
props: {
// 已app-main高度为100% 需要减掉的高度
setUTableHeight: {
type: Number,
default: 340
},
// 是否显示序号
isShowIndex:{
type: Boolean,
default: false
},
// 复选框
tableSelection: {
type: Boolean,
default: false
},
cellStyle: {
type: Function,
default: () => {
return Function;
}
},
// 超出内容是否提示
showOverflowTooltip:{
type: Boolean,
default: true,
},
// 列表api
listApi: {
type: String,
default: null
},
// 删除api
DeleteApi: {
type: String,
default: null
},
// 列表数据
listColumns:{
type: Array,
default: null
},
},
data () {
return {
dialogShow:true,
//删除提示
currenButtonData: [
// this.defaultAddBtn(),//新增
// this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
this.defaultFilterBtn(),//筛选
// this.defaultFilterForDetailBtn()//明细查询按钮
],
}
},
mounted(){
this.paging()
},
methods: {
closeDialog(data){
this.dialogShow = false
this.$emit("closeDialog", data)
},
paging(callback){
this.Loading.tableLoading = true
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
TestSchoolDetailList(this.PageListParams)
.then(result => {
this.Loading.tableLoading = false
this.tableData = []
result.data.items.forEach(item=>{
item.deleteTipVisible = false
this.tableData.push(item)
})
this.totalCount = result.data.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
deleteHandle(data){
this.Loading.appMainLoading = true
data.deleteTipVisible = false
TestSchoolDetailList_delete(data.id).then(res => {
this.$successMsg('删除成功!')
this.Loading.appMainLoading = false
this.paging()
}).catch(err => {
this.Loading.appMainLoading = false
this.$message.error("删除失败!")
})
},
}
}
</script>
<style lang="scss">
.filterForDetailPage {
.el-dialog__body{
padding-bottom: 20px !important;
}
.fullPageCover{
height: calc(100vh - 380px) !important;
}
}
.filterForDetailPage-list{
height: calc(100vh - 320px);
overflow: auto;
}
</style>

7
fe/PC/src/components/tablePagination/index.vue
View File

@ -45,7 +45,7 @@
:tableColumns="tableColumns | isTableColumns"
:isShowIndex="isShowIndex"
:selectionTable="tableSelection"
:setUTableHeight="uTableTopHeight"
:setUTableHeight="setUTableHeight || uTableTopHeight"
@sortChange="sortChange"
@handleSelectionChange="handleSelectionChange"
@inlineDialog="inlineDialog"
@ -85,6 +85,11 @@ export default {
rowDrop
},
props: {
// 已app-main高度为100% 需要减掉的高度
setUTableHeight: {
type: Number,
default: null
},
// 超出内容是否提示
showOverflowTooltip:{
type: Boolean,

4
fe/PC/src/main.js
View File

@ -34,7 +34,8 @@ import {
defaultFreshBtn,
defaultFilterBtn,
defaultImportBtn,
defaultExportBtn
defaultExportBtn,
defaultFilterForDetailBtn
} from '@/utils/defaultButtons';
Vue.prototype.defaultFieldSettingBtn = defaultFieldSettingBtn;
@ -43,6 +44,7 @@ Vue.prototype.defaultFreshBtn = defaultFreshBtn;
Vue.prototype.defaultFilterBtn = defaultFilterBtn;
Vue.prototype.defaultImportBtn = defaultImportBtn;
Vue.prototype.defaultExportBtn = defaultExportBtn;
Vue.prototype.defaultFilterForDetailBtn = defaultFilterForDetailBtn;
import * as filters from './filters' // global filters

12
fe/PC/src/utils/defaultButtons.js
View File

@ -92,7 +92,17 @@ export function defaultFilterBtn(option) {
})
}
// 明细查询按钮
export function defaultFilterForDetailBtn(option) {
return __defaultBtnOption(option,{
type: "warning",
icon: "el-icon-finished",
label: "明细查询",
name: "filterForDetail",
size: "mini",
float: 'right',
})
}
// 默认按钮规则
function __defaultBtnOption(option,specific){

26
fe/PC/src/utils/isLocalApiDetailsTableColumns/index.js
View File

@ -0,0 +1,26 @@
//全局从接口缓存的明细（如：接口监控看板）
// import { getInterfaceBoard } from "@/api/wms-interface"
// getList = () => {
// getInterfaceBoard().then(result => {
// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
// })
// .catch(err => {
// })
// }
let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames")
if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') {
_Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames"))
}
// 用于如果没有表头数据时候报错问题处理
const initDashboardLable = (data) => {
return _Dashboard ? _Dashboard[data] : null
}
// 测试数据
export const TestSchool = [
{ label: '学生33', prop: "studentName" },
{ label: 'orderType33', prop: "orderType" },
{ label: '创建时间33', prop: "creationTime", type:'dateTime' },
]

33
fe/PC/src/utils/isLocalApiTableColums/index.js
View File

@ -1,4 +1,4 @@
//全局从接口缓存的表头（如：接口监控看板）
// import { getInterfaceBoard } from "@/api/wms-interface"
// getList = () => {
@ -246,32 +246,7 @@ export const comingFromOut_file = [
// 测试数据
export const TestSchool = [
{ label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" },
{ label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" },
{ label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" },
{ label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" },
{ label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" },
{ label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
{ label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" },
{ label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
{ label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
{ label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" },
{ label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
{ label: '名称11', prop: "schoolName", fixed: "left", type: "name" },
{ label: 'orderType11', prop: "orderType" },
{ label: '创建时间11', prop: "creationTime", type:'dateTime' },
]

252
fe/PC/src/utils/isLocalApiTableDesTions/index.js
View File

@ -0,0 +1,252 @@
//全局从接口缓存的详情（如：接口监控看板）
// import { getInterfaceBoard } from "@/api/wms-interface"
// getList = () => {
// getInterfaceBoard().then(result => {
// localStorage.setItem("interfaceBoardColumnsNames", JSON.stringify(result.data.localization.values.Dashboard));
// })
// .catch(err => {
// })
// }
let _Dashboard = localStorage.getItem("interfaceBoardColumnsNames")
if(_Dashboard && _Dashboard != 'undefined' && _Dashboard != 'null') {
_Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames"))
}
// 用于如果没有表头数据时候报错问题处理
const initDashboardLable = (data) => {
return _Dashboard ? _Dashboard[data] : null
}
// 1外部数据转换
export const dataExchangeFromOut = [
{ label: initDashboardLable('OutgoingToExternalNumber'), prop: "number" },
{ label: initDashboardLable('OutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalDataType'), prop: "dataType", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalTableType'), prop: "tableType" },
{ label: initDashboardLable('OutgoingToExternalDataAction'), prop: "dataAction" },
{ label: initDashboardLable('OutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalStatus'), prop: "status" },
{ label: initDashboardLable('OutgoingToExternalSourceSystem'), prop: "sourceSystem", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataId'), prop: "sourceDataId" },
{ label: initDashboardLable('OutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
{ label: initDashboardLable('OutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalWriter'), prop: "writer" },
{ label: initDashboardLable('OutgoingToExternalDestinationSystem'), prop: "destinationSystem", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
{ label: initDashboardLable('OutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
{ label: initDashboardLable('OutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('OutgoingToExternalReader'), prop: "reader" },
{ label: initDashboardLable('OutgoingToExternalErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('OutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('OutgoingToExternalRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 2归档外部数据转换
export const dataExchangeFromOut_file = [
{ label: initDashboardLable('ArchivedOutgoingToExternalNumber'), prop: "number" },
{ label: initDashboardLable('ArchivedOutgoingToExternalRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('ArchivedOutgoingToExternalDataType'), prop: "dataType" },
{ label: initDashboardLable('ArchivedOutgoingToExternalTableType'), prop: "tableType" },
{ label: initDashboardLable('ArchivedOutgoingToExternalDataAction'), prop: "dataAction" },
{ label: initDashboardLable('ArchivedOutgoingToExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('ArchivedOutgoingToExternalStatus'), prop: "status" },
{ label: initDashboardLable('ArchivedOutgoingToExternalSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('ArchivedOutgoingToExternalSourceDataId'), prop: "sourceDataId" },
{ label: initDashboardLable('ArchivedOutgoingToExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
{ label: initDashboardLable('ArchivedOutgoingToExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
{ label: initDashboardLable('ArchivedOutgoingToExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
{ label: initDashboardLable('ArchivedOutgoingToExternalWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('ArchivedOutgoingToExternalWriter'), prop: "writer" },
{ label: initDashboardLable('ArchivedOutgoingToExternalDestinationSystem'), prop: "destinationSystem" },
{ label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataId'), prop: "destinationDataId" },
{ label: initDashboardLable('ArchivedOutgoingToExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
{ label: initDashboardLable('ArchivedOutgoingToExternalReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('ArchivedOutgoingToExternalReader'), prop: "reader" },
{ label: initDashboardLable('ArchivedOutgoingToExternalErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('ArchivedOutgoingToExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('ArchivedOutgoingToExternalRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 3WMS数据接收
export const comingToWms = [
{ label: initDashboardLable('IncomingToWmsNumber'), prop: "number" },
{ label: initDashboardLable('IncomingToWmsRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('IncomingToWmsDataType'), prop: "dataType" },
{ label: initDashboardLable('IncomingToWmsDataAction'), prop: "dataAction" },
{ label: initDashboardLable('IncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('IncomingToWmsStatus'), prop: "status" },
{ label: initDashboardLable('IncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
{ label: initDashboardLable('IncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
{ label: initDashboardLable('IncomingToWmsSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('IncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('IncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('IncomingToWmsErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('IncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('IncomingToWmsRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 4归档WMS数据接收
export const comingToWms_file = [
{ label: initDashboardLable('ArchivedIncomingToWmsNumber'), prop: "number" },
{ label: initDashboardLable('ArchivedIncomingToWmsRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('ArchivedIncomingToWmsDataType'), prop: "dataType" },
{ label: initDashboardLable('ArchivedIncomingToWmsDataAction'), prop: "dataAction" },
{ label: initDashboardLable('ArchivedIncomingToWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('ArchivedIncomingToWmsStatus'), prop: "status" },
{ label: initDashboardLable('ArchivedIncomingToWmsDataIdentityCode'), prop: "dataIdentityCode" },
{ label: initDashboardLable('ArchivedIncomingToWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
{ label: initDashboardLable('ArchivedIncomingToWmsSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('ArchivedIncomingToWmsWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('ArchivedIncomingToWmsReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('ArchivedIncomingToWmsErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('ArchivedIncomingToWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('ArchivedIncomingToWmsRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 5WMS数据转换
export const dataExchangeFromWms = [
{ label: initDashboardLable('DataExchange_OutgoingFromWmsNumber'), prop: "number" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsDataType'), prop: "dataType" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsDataAction'), prop: "dataAction" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsStatus'), prop: "status" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsDestinationSystem'), prop: "destinationSystem" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('DataExchange_OutgoingFromWmsRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 6归档WMS数据转换
export const dataExchangeFromWms_file = [
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsNumber'), prop: "number" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataType'), prop: "dataType" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataAction'), prop: "dataAction" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsStatus'), prop: "status" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataIdentityCode'), prop: "dataIdentityCode" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsDataContent'), prop: "dataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsWriteTime'), prop: "writeTime",type:'dateTime' },
// { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('DataExchange_ArchivedOutgoingFromWmsRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 7外部数据接收
export const comingFromOut = [
{ label: initDashboardLable('DataExchange_IncomingFromExternalNumber'), prop: "number" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalDataType'), prop: "dataType" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalTableType'), prop: "tableType" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalDataAction'), prop: "dataAction" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('DataExchange_IncomingFromExternalStatus'), prop: "status" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataId'), prop: "sourceDataId" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_IncomingFromExternalWriter'), prop: "writer" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_IncomingFromExternalReader'), prop: "reader" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('DataExchange_IncomingFromExternalRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 8归档外部数据接收
export const comingFromOut_file = [
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalNumber'), prop: "number" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRemark'), prop: "remark", type:"showDetail" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataType'), prop: "dataType" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalTableType'), prop: "tableType" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDataAction'), prop: "dataAction" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalEffectiveDate'), prop: "effectiveDate",type:'dateTime' },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalStatus'), prop: "status" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceSystem'), prop: "sourceSystem" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataId'), prop: "sourceDataId" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataGroupCode'), prop: "sourceDataGroupCode" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataDetailCode'), prop: "sourceDataDetailCode" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalSourceDataContent'), prop: "sourceDataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriteTime'), prop: "writeTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalWriter'), prop: "writer" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationSystem'), prop: "destinationSystem" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataId'), prop: "destinationDataId" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalDestinationDataContent'), prop: "destinationDataContent", type:"showJsonTable" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReadTime'), prop: "readTime",type:'dateTime' },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalReader'), prop: "reader" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorCode'), prop: "errorCode" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalErrorMessage'), prop: "errorMessage", type:"showDetail" },
{ label: initDashboardLable('DataExchange_ArchivedIncomingFromExternalRetryTimes'), prop: "retryTimes" },
// ************** 暂时隐藏 ************************
// { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
// { label: _Public.creatorId, prop: "creatorId" },
// { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
// { label: _Public.lastModifierId, prop: "lastModifierId" },
// { label: _Public.ID, prop: "ID" },
]
// 测试数据
export const TestSchool = [
{ label: '名称22', prop: "schoolName", fixed: "left", type: "name" },
{ label: 'orderType22', prop: "orderType" },
{ label: '创建时间22', prop: "creationTime", type:'dateTime' },
]

2
fe/PC/src/utils/utils.js
View File

@ -62,6 +62,7 @@ import newAndEdiDialog from '@/components/newAndEdiDialog' //普通新增与编
import stepsForm from '@/components/StepsForm' //步骤新增
import handelFrom from '@/components/handelFrom' //执行表单
import umyTable from '@/components/umyTable' // 用于数据量过大table
import filterForDetailPage from '@/components/filterForDetailPage' //明细查询
// Mixins
// import { tableMixins } from "@/mixins/TableMixins"
@ -113,6 +114,7 @@ Vue.component('newAndEdiDialog', newAndEdiDialog)
Vue.component('stepsForm', stepsForm)
Vue.component('handelFrom', handelFrom)
Vue.component('umyTable', umyTable)
Vue.component('filterForDetailPage', filterForDetailPage)
Vue.prototype.$echarts = eCharts
Vue.prototype.$isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
Vue.prototype.$isAndroid = navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Adr') > -1

97
fe/PC/src/views/interfaceBoard/TestSchool.vue
View File

@ -10,7 +10,7 @@
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@topbutton="customTopbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@ -23,8 +23,7 @@
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
></tablePagination>
<!-- 新增与编辑 -->
<newAndEdiDialog
ref="newAndEdiDialog"
@ -44,18 +43,26 @@
@goBack="goBack"
></newAndEdiDialog>
<curren-Drawer
:title="tableColumns"
:tableColumns="tableColumns"
:title="apiTableDesTions"
:tableColumns="apiDetailsTableColumns"
:tabsDesTions="apiTableDesTions"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:dropdownData="dropdownData"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
></curren-Drawer>
<filterForDetailPage
v-if="filterForDetailShow"
ref="filterForDetailPage"
listApi="TestSchoolDetailList"
DeleteApi="TestSchoolDetailList_delete"
:listColumns="apiDetailsTableColumns"
@closeDialog="changeFilterForDetailShow"
></filterForDetailPage>
</div>
</template>
<script>
@ -66,10 +73,11 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
import { dataExchangeFromOut,TestSchool,TestSchool_save,TestSchool_delete } from "@/api/wms-interface"
import { TestSchool,TestSchool_save,TestSchoolItemById,TestSchool_delete } from "@/api/wms-interface"
import { getToken } from '@/utils/auth'
import * as isLocalApiTableColums from "@/utils/isLocalApiTableColums/index" //全局从接口缓存的表头（如：接口监控看板）
import * as isLocalApiTableDesTions from "@/utils/isLocalApiTableDesTions/index" //全局从接口缓存的详情（如：接口监控看板）
import * as isLocalApiDetailsTableColumns from "@/utils/isLocalApiDetailsTableColumns/index" //全局从接口缓存的详情（如：接口监控看板）
export default {
name: "TestSchool",
@ -93,18 +101,32 @@ export default {
// let _Dashboard = JSON.parse(localStorage.getItem("interfaceBoardColumnsNames")) // 接口监控看板
return {
apiTableColumns:null,
tableLoading:false,
apiTableDesTions:null,
apiDetailsTableColumns:null,
//常用按钮数据
currenButtonData: [
this.defaultAddBtn(),//新增
this.defaultFieldSettingBtn(),//字段设置
this.defaultFreshBtn(),//刷新
this.defaultFilterBtn(),//筛选
this.defaultFilterForDetailBtn()//明细查询按钮
],
//新增
CreateFormData: {
schoolName:null,
orderType:null,
details: [
{
"lastModifierId": "ad731144-d789-f322-fede-327cac55dd36",
"creationTime": "1978-07-18T22:00:37.5Z",
"creatorId": "19e78d1b-6203-8d6d-b6e7-ae5b503c0824",
"id": "5926ec25-2132-ba25-6b93-e453c17f00e2",
"studentName": "张三",
"orderType": 2,
"masterId": "a044e2c6-3bc6-7cdd-55a6-f1a2a9682ccb",
"lastModificationTime": "1946-12-30T14:22:31.982Z"
},
],
// number: null,//数字+点*
// remark: null,
// dataType: null,
@ -128,9 +150,8 @@ export default {
// errorMessage: null,
// retryTimes: null,//数字+点*
},
//新增
//编辑
editFormData: {
id:null,
schoolName:null,
orderType:null,
// number: null,//数字+点*
@ -233,6 +254,8 @@ export default {
// retryTimes: [{ required: true, trigger: "blur", message: "不可为空" }],
}
},
// 明细查询弹窗显示
filterForDetailShow:false,
};
},
mounted() {
@ -243,8 +266,10 @@ export default {
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.apiTableDesTions = isLocalApiTableDesTions[this.$route.name]
this.apiDetailsTableColumns = isLocalApiDetailsTableColumns[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
dataExchangeFromOut(this.PageListParams,true)
TestSchool(this.PageListParams,true)
.then(result => {
let res = result.data
this.tableData = res.items
@ -252,28 +277,52 @@ export default {
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
//打开抽屉
inlineDialog(val) {
this.Loading.DrawerLoading = true
this.displayDialog.detailsDialog = true;
TestSchool(this.PageListParams)
TestSchoolItemById(val.id)
.then(result => {
this.propsData = result.data.items.filter(item=>{
return item.id == val.id
})[0]
this.propsData = result.data
this.inlineDialogCallback()
})
.catch(err => {
this.Loading.DrawerLoading = false
this.$message.error("数据获取失败")
})
},
// 新增/编辑提交
// 新增/编辑提交 todo:编辑报错
FormSubmit(val){
this.Loading.tableLoading = true
let _data = this.formReveal ? this.CreateFormData : this.editFormData
// if(!this.formReveal){
// _data.details= [
// {
// "lastModifierId": "ad731144-d789-f322-fede-327cac55dd36",
// "creationTime": "1978-07-18T22:00:37.5Z",
// "creatorId": "19e78d1b-6203-8d6d-b6e7-ae5b503c0824",
// "id": "5926ec25-2132-ba25-6b93-e453c17f00e2",
// "studentName": "张三2",
// "orderType": 32,
// "masterId": "a044e2c6-3bc6-7cdd-55a6-f1a2a9682ccb",
// "lastModificationTime": "1946-12-30T14:22:31.982Z"
// },
// {
// "orderType": 4,
// "id": "b1d829d2-f3c2-9584-5b91-5ce64eea194a",
// "masterId": "f789a9ef-ffbe-f690-fc49-b87d57093b5c",
// "lastModificationTime": null,
// "creationTime": "2010-07-21T09:46:13.372Z",
// "creatorId": null,
// "studentName": "李四",
// "lastModifierId": null
// },
// ]
// }
TestSchool_save(_data,this.formReveal)
.then(result => {
this.FormResult("success")
@ -332,11 +381,23 @@ export default {
this.paging()
}).catch(err => {
this.Loading.appMainLoading = false
this.$message.error("删除失败!")
})
}).catch(() => {
//取消操作
});
}
},
changeFilterForDetailShow(data){
this.filterForDetailShow = data
},
customTopbutton(val,item){
// 明细筛选按钮
if(val == 'filterForDetail'){
this.changeFilterForDetailShow(true)
}else{
this.topbutton(val,item)
}
}
}
}

33
fe/PC/src/views/interfaceBoard/comingFromOut.vue
View File

@ -58,22 +58,23 @@
this.paging();
},
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingFromOut(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingFromOut(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}
</script>

33
fe/PC/src/views/interfaceBoard/comingFromOut_file.vue
View File

@ -58,22 +58,23 @@
this.paging();
},
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingFromOut_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingFromOut_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}
</script>

33
fe/PC/src/views/interfaceBoard/comingToWms.vue
View File

@ -59,22 +59,23 @@
this.paging();
},
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingToWms(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingToWms(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}
</script>

33
fe/PC/src/views/interfaceBoard/comingToWms_file.vue
View File

@ -58,22 +58,23 @@
this.paging();
},
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingToWms_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
comingToWms_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}
</script>

1
fe/PC/src/views/interfaceBoard/dataExchangeFromOut.vue
View File

@ -87,6 +87,7 @@
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}

19
fe/PC/src/views/interfaceBoard/dataExchangeFromOut_file.vue
View File

@ -65,15 +65,16 @@
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
dataExchangeFromOut_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
};

33
fe/PC/src/views/interfaceBoard/dataExchangeFromWms.vue
View File

@ -58,22 +58,23 @@
this.paging();
},
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
dataExchangeFromWms(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
},
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
dataExchangeFromWms(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}
</script>

27
fe/PC/src/views/interfaceBoard/dataExchangeFromWms_file.vue
View File

@ -60,19 +60,20 @@
methods: {
//渲染数据
paging(callback) {
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
dataExchangeFromWms_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
})
this.Loading.tableLoading = true;
this.apiTableColumns = isLocalApiTableColums[this.$route.name]
this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
dataExchangeFromWms_file(this.PageListParams)
.then(result => {
let res = result.data
this.tableData = res.items
this.totalCount = res.totalCount
this.pagingCallback(callback)
})
.catch(err => {
this.Loading.tableLoading = false
this.$message.error("数据获取失败")
})
},
}
}

Write Preview
Loading…
Cancel
Save