From a20eac547b11b15aa29aa48ab2d03d9a83d2a347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 20 Nov 2023 13:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WinIn.FasterZ.Wms.Fe/public/config.js         |   6 +-
 WinIn.FasterZ.Wms.Fe/src/settings.js          |   2 +-
 .../src/utils/baseData/urlOption.js           |  12 ---
 .../views/menuList/AbpIdentityMarkRoles.vue   |   2 +-
 .../views/menuList/InventoryBalanceCopy.vue   | 102 ------------------
 .../menuList/JobPurchaseReceiptJobCopy.vue    | 102 ------------------
 .../JobPurchaseReceiptJobDetailCopy.vue       | 102 ------------------
 WinIn.FasterZ.Wms.Fe/vue.config.js            |   4 +-
 8 files changed, 6 insertions(+), 326 deletions(-)
 delete mode 100644 WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue
 delete mode 100644 WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue
 delete mode 100644 WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue

diff --git a/WinIn.FasterZ.Wms.Fe/public/config.js b/WinIn.FasterZ.Wms.Fe/public/config.js
index 4b6c8b44c..6f5a817f1 100644
--- a/WinIn.FasterZ.Wms.Fe/public/config.js
+++ b/WinIn.FasterZ.Wms.Fe/public/config.js
@@ -1,8 +1,6 @@
 // dev_win
-window.SITE_CONFIG['baseApi'] = 'http://192.168.0.240:60011'
-window.SITE_CONFIG['authApi'] = 'http://192.168.0.240:60100'
-// 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['baseApi'] = 'http://dev.ccwin-in.com:60011'
+window.SITE_CONFIG['authApi'] = 'http://dev.ccwin-in.com:60100'//192.168.0.240
 window.SITE_CONFIG['businessApi'] = 'http://dev.ccwin-in.com:10097'
 //是否登录配置信息【loginName】
 window.SITE_CONFIG['isConfigLogin'] = false
diff --git a/WinIn.FasterZ.Wms.Fe/src/settings.js b/WinIn.FasterZ.Wms.Fe/src/settings.js
index e484d10ef..1cf1b5822 100644
--- a/WinIn.FasterZ.Wms.Fe/src/settings.js
+++ b/WinIn.FasterZ.Wms.Fe/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: 'JOB-QAD&WMS',
+  title: 'Dy_WMS',
 
   /**
    * @type {boolean} true | false
diff --git a/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js b/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
index 159d873cb..9e010f484 100644
--- a/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
+++ b/WinIn.FasterZ.Wms.Fe/src/utils/baseData/urlOption.js
@@ -205,10 +205,6 @@ export const AbpAuditLog = {
   export const InventoryBalance = { 
   baseURL:'InventoryBalance/base',//主表-列表 
   detailURL:'app/Inventory-Balance',//主表-明细 + 明细-查看主表 
- } 
-  export const InventoryBalanceCopy = { 
-  baseURL:'InventoryBalanceCopy/base',//主表-列表 
-  detailURL:'app/Inventory-Balance-Copy',//主表-明细 + 明细-查看主表 
  } 
   export const InventoryContainer = { 
   baseURL:'InventoryContainer/base',//主表-列表 
@@ -337,18 +333,10 @@ export const AbpAuditLog = {
   detailURL:'app/Job-Purchase-Receipt-Job',//主表-明细 + 明细-查看主表 
   detailListURL:'JobPurchaseReceiptJobDetail/base',//明细-列表, 
    masterId:'masterId',//明细获取主表信息的masterId 
- } 
-  export const JobPurchaseReceiptJobCopy = { 
-  baseURL:'JobPurchaseReceiptJobCopy/base',//主表-列表 
-  detailURL:'app/Job-Purchase-Receipt-Job-Copy',//主表-明细 + 明细-查看主表 
  } 
   export const JobPurchaseReceiptJobDetail = { 
   baseURL:'JobPurchaseReceiptJobDetail/base',//主表-列表 
   detailURL:'app/Job-Purchase-Receipt-Job-Detail',//主表-明细 + 明细-查看主表 
- } 
-  export const JobPurchaseReceiptJobDetailCopy = { 
-  baseURL:'JobPurchaseReceiptJobDetailCopy/base',//主表-列表 
-  detailURL:'app/Job-Purchase-Receipt-Job-Detail-Copy',//主表-明细 + 明细-查看主表 
  } 
   export const JobPurchaseReturnJob = { 
   baseURL:'JobPurchaseReturnJob/base',//主表-列表 
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue
index 9bfccd9b6..c3980936d 100644
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/views/menuList/AbpIdentityMarkRoles.vue
@@ -112,7 +112,7 @@
               type="primary"
               @click="savePer"
               v-permission="['AbpIdentity.Roles.ManagePermissions']"
-              v-if="name != 'admin'"
+              v-show="name != 'admin'"
             >保存</el-button>
           </div>
           <el-tree
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue
deleted file mode 100644
index d3ca4606b..000000000
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/InventoryBalanceCopy.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue
deleted file mode 100644
index 59fec0d54..000000000
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobCopy.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue b/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue
deleted file mode 100644
index e13f3c9d9..000000000
--- a/WinIn.FasterZ.Wms.Fe/src/views/menuList/JobPurchaseReceiptJobDetailCopy.vue
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/vue.config.js b/WinIn.FasterZ.Wms.Fe/vue.config.js
index 785396f80..e9259fad6 100644
--- a/WinIn.FasterZ.Wms.Fe/vue.config.js
+++ b/WinIn.FasterZ.Wms.Fe/vue.config.js
@@ -6,14 +6,14 @@ function resolve(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,
 // use administrator privileges to execute the command line.
 // For example, Mac: sudo npm run
 // You can change the port by the following method:
 // 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();
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {