Browse Source

【东阳主子表】配置更新

faster_develop
安虹睿 1 year ago
parent
commit
a20eac547b
  1. 6
      WinIn.FasterZ.Wms.Fe/public/config.js
  2. 2
      WinIn.FasterZ.Wms.Fe/src/settings.js
  3. 12
      WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
  4. 2
      WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue
  5. 102
      WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue
  6. 102
      WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue
  7. 102
      WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue
  8. 4
      WinIn.FasterZ.Wms.Fe/vue.config.js

6
WinIn.FasterZ.Wms.Fe/public/config.js

@ -1,8 +1,6 @@
// dev_win // dev_win
window.SITE_CONFIG['baseApi'] = 'http://192.168.0.240:60011' window.SITE_CONFIG['baseApi'] = 'http://dev.ccwin-in.com:60011'
window.SITE_CONFIG['authApi'] = 'http://192.168.0.240:60100' window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:60100'//192.168.0.240
// window.SITE_CONFIG['baseApi'] = 'http://192.168.0.190:60078'//http://dev.ccwin-in.com:60022
// window.SITE_CONFIG['authApi'] = 'http://192.168.0.190:60065'//http://dev.ccwin-in.com:60020
window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097' window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
//是否登录配置信息【loginName】 //是否登录配置信息【loginName】
window.SITE_CONFIG['isConfigLogin'] = false window.SITE_CONFIG['isConfigLogin'] = false

2
WinIn.FasterZ.Wms.Fe/src/settings.js

@ -1,5 +1,5 @@
module.exports = { module.exports = {
title: 'JOB-QAD&WMS', title: 'Dy_WMS',
/** /**
* @type {boolean} true | false * @type {boolean} true | false

12
WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js

@ -205,10 +205,6 @@ export const AbpAuditLog = {
export const InventoryBalance = { export const InventoryBalance = {
baseURL:'InventoryBalance/base',//主表-列表 baseURL:'InventoryBalance/base',//主表-列表
detailURL:'app/Inventory-Balance',//主表-明细 + 明细-查看主表 detailURL:'app/Inventory-Balance',//主表-明细 + 明细-查看主表
}
export const InventoryBalanceCopy = {
baseURL:'InventoryBalanceCopy/base',//主表-列表
detailURL:'app/Inventory-Balance-Copy',//主表-明细 + 明细-查看主表
} }
export const InventoryContainer = { export const InventoryContainer = {
baseURL:'InventoryContainer/base',//主表-列表 baseURL:'InventoryContainer/base',//主表-列表
@ -337,18 +333,10 @@ export const AbpAuditLog = {
detailURL:'app/Job-Purchase-Receipt-Job',//主表-明细 + 明细-查看主表 detailURL:'app/Job-Purchase-Receipt-Job',//主表-明细 + 明细-查看主表
detailListURL:'JobPurchaseReceiptJobDetail/base',//明细-列表, detailListURL:'JobPurchaseReceiptJobDetail/base',//明细-列表,
masterId:'masterId',//明细获取主表信息的masterId masterId:'masterId',//明细获取主表信息的masterId
}
export const JobPurchaseReceiptJobCopy = {
baseURL:'JobPurchaseReceiptJobCopy/base',//主表-列表
detailURL:'app/Job-Purchase-Receipt-Job-Copy',//主表-明细 + 明细-查看主表
} }
export const JobPurchaseReceiptJobDetail = { export const JobPurchaseReceiptJobDetail = {
baseURL:'JobPurchaseReceiptJobDetail/base',//主表-列表 baseURL:'JobPurchaseReceiptJobDetail/base',//主表-列表
detailURL:'app/Job-Purchase-Receipt-Job-Detail',//主表-明细 + 明细-查看主表 detailURL:'app/Job-Purchase-Receipt-Job-Detail',//主表-明细 + 明细-查看主表
}
export const JobPurchaseReceiptJobDetailCopy = {
baseURL:'JobPurchaseReceiptJobDetailCopy/base',//主表-列表
detailURL:'app/Job-Purchase-Receipt-Job-Detail-Copy',//主表-明细 + 明细-查看主表
} }
export const JobPurchaseReturnJob = { export const JobPurchaseReturnJob = {
baseURL:'JobPurchaseReturnJob/base',//主表-列表 baseURL:'JobPurchaseReturnJob/base',//主表-列表

2
WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue

@ -112,7 +112,7 @@
type="primary" type="primary"
@click="savePer" @click="savePer"
v-permission="['AbpIdentity.Roles.ManagePermissions']" v-permission="['AbpIdentity.Roles.ManagePermissions']"
v-if="name != 'admin'" v-show="name != 'admin'"
>保存</el-button> >保存</el-button>
</div> </div>
<el-tree <el-tree

102
WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue

@ -1,102 +0,0 @@
<template>
<div class="page-box" v-loading="Loading.tableLoading">
<tablePagination
v-if="apiColumns_Table"
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="apiColumns_Table"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@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"
:buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left"
></tablePagination>
<!-- :buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left" -->
<curren-Drawer
ref="currenDrawer_Ref"
:title="apiColumns_DesTions"
@rowDrop="rowDrop"
:tableColumns="apiColumns_DetailsTable"
:tabsDesTions="apiColumns_DesTions"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:Butttondata="[]"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
:totalCount="totalCountDetails"
:currentPage="oldSkipCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
:buttonOperationList_left="operationButtonsDetail"
></curren-Drawer>
<!-- 导出弹窗 -->
<exportDrop
v-if="displayDialog.exportDialog"
@closeDialog="closeExportDrop"
@exportDropSubmit="exportDropSubmit"
></exportDrop>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "InventoryBalanceCopy",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
newAndEdiDialogMixins
],
data() {
return {
//
currenButtonData: [
this.defaultExportBtn({
isRedundance:true,
isDetailExport:true
}),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
};
},
mounted() {
this.paging();
},
}
</script>
<style lang="scss" scoped>
@import "@/styles/basicData.scss";
</style>

102
WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue

@ -1,102 +0,0 @@
<template>
<div class="page-box" v-loading="Loading.tableLoading">
<tablePagination
v-if="apiColumns_Table"
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="apiColumns_Table"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@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"
:buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left"
></tablePagination>
<!-- :buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left" -->
<curren-Drawer
ref="currenDrawer_Ref"
:title="apiColumns_DesTions"
@rowDrop="rowDrop"
:tableColumns="apiColumns_DetailsTable"
:tabsDesTions="apiColumns_DesTions"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:Butttondata="[]"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
:totalCount="totalCountDetails"
:currentPage="oldSkipCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
:buttonOperationList_left="operationButtonsDetail"
></curren-Drawer>
<!-- 导出弹窗 -->
<exportDrop
v-if="displayDialog.exportDialog"
@closeDialog="closeExportDrop"
@exportDropSubmit="exportDropSubmit"
></exportDrop>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "JobPurchaseReceiptJobCopy",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
newAndEdiDialogMixins
],
data() {
return {
//
currenButtonData: [
this.defaultExportBtn({
isRedundance:true,
isDetailExport:true
}),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
};
},
mounted() {
this.paging();
},
}
</script>
<style lang="scss" scoped>
@import "@/styles/basicData.scss";
</style>

102
WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue

@ -1,102 +0,0 @@
<template>
<div class="page-box" v-loading="Loading.tableLoading">
<tablePagination
v-if="apiColumns_Table"
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="apiColumns_Table"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@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"
:buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left"
></tablePagination>
<!-- :buttonOperationList_left="buttonOperationClick_leftBase"
@buttonOperationClick_left="buttonOperationClick_left" -->
<curren-Drawer
ref="currenDrawer_Ref"
:title="apiColumns_DesTions"
@rowDrop="rowDrop"
:tableColumns="apiColumns_DetailsTable"
:tabsDesTions="apiColumns_DesTions"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
:Butttondata="[]"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
:totalCount="totalCountDetails"
:currentPage="oldSkipCountDetails"
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
:buttonOperationList_left="operationButtonsDetail"
></curren-Drawer>
<!-- 导出弹窗 -->
<exportDrop
v-if="displayDialog.exportDialog"
@closeDialog="closeExportDrop"
@exportDropSubmit="exportDropSubmit"
></exportDrop>
</div>
</template>
<script>
import { tableMixins } from "@/mixins/TableMixins";
import { LoadingMixins } from "@/mixins/LoadingMixins";
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins";
import { filterSelectMixins } from '@/mixins/filter-Select'
export default {
name: "JobPurchaseReceiptJobDetailCopy",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
newAndEdiDialogMixins
],
data() {
return {
//
currenButtonData: [
this.defaultExportBtn({
isRedundance:true,
isDetailExport:true
}),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
};
},
mounted() {
this.paging();
},
}
</script>
<style lang="scss" scoped>
@import "@/styles/basicData.scss";
</style>

4
WinIn.FasterZ.Wms.Fe/vue.config.js

@ -6,14 +6,14 @@ function resolve(dir) {
return path.join(__dirname, dir) return path.join(__dirname, dir)
} }
const name = defaultSettings.title || '接口看板-QAD&WMS' // page title const name = defaultSettings.title || 'Dy_WMS' // page title
// If your port is set to 80, // If your port is set to 80,
// use administrator privileges to execute the command line. // use administrator privileges to execute the command line.
// For example, Mac: sudo npm run // For example, Mac: sudo npm run
// You can change the port by the following method: // You can change the port by the following method:
// port = 9527 npm run dev OR npm run dev --port = 9527 // port = 9527 npm run dev OR npm run dev --port = 9527
const port = process.env.port || process.env.npm_config_port || 60012 // dev port const port = process.env.port || process.env.npm_config_port || 60200 // dev port
const Timestamp = new Date().getTime(); const Timestamp = new Date().getTime();
// All configuration item explanations can be find in https://cli.vuejs.org/config/ // All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = { module.exports = {

Loading…
Cancel
Save