【前端平板】项目框架兼容平板初始化及封装开发

12 months ago · 41c14f2fd2
6 changed files with 218 additions and 22 deletions
--- a/fe/PC/src/layout/components/AppMain.vue
+++ b/fe/PC/src/layout/components/AppMain.vue
@ -1,5 +1,5 @@
 <template>
-	<section class="app-main">
+	<section class="app-main" :style="{height:(noOuter?'100%':'calc(100vh - 84px)'),padding:(noOuter?'0':'14px')}">
 		<transition name="fade-transform" mode="out-in">
 			<!-- 缓存页面 -->
 			<keep-alive :max="20" v-if="!$route.meta.keepAlive" >
@ -28,6 +28,14 @@ export default {
 	// 		componentsArr: []
 	// 	}
 	// },
+  	props: {
+		noOuter:{
+			type: Boolean,
+			default: () => {
+				return false
+			}
+		},
+	},
 	computed: {
 		cachedViews() {
 			return this.$store.state.tagsView.cachedViews;
@ -189,12 +197,12 @@ $appPadding:14px;
 $appBack: #f3f4f8;
 .app-main {
 /* 84 = navbar + tags-view = 50 + 34*/
-  height: calc(100vh - 84px);
+//   height: calc(100vh - 84px);
  position: relative;
  overflow: hidden;
  overflow-y: auto;
  background: $appBack;
-  padding: $appPadding;
+//   padding: $appPadding;
 }

 .fixed-header + .app-main {
--- a/fe/PC/src/layout/index.vue
+++ b/fe/PC/src/layout/index.vue
@ -1,16 +1,21 @@
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
-        <navbar />
-        <tags-view v-if="needTagsView" />
+  <div style="height:100%">
+    <div :class="classObj" class="app-wrapper" v-if="isShowOuter()">
+      <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
+      <sidebar class="sidebar-container" />
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <div :class="{'fixed-header':fixedHeader}">
+          <navbar />
+          <tags-view v-if="needTagsView" />
+        </div>
+        <app-main />
+        <right-panel v-if="showSettings">
+          <settings />
+        </right-panel>
      </div>
-      <app-main />
-      <right-panel v-if="showSettings">
-        <settings />
-      </right-panel>
+    </div>
+    <div v-else style="height:100%">
+      <app-main :noOuter="true" />
    </div>
  </div>
 </template>
@ -49,11 +54,20 @@ export default {
      }
    }
  },
+  data() {
+    return {
+      // 不显示框架页面
+      isOnlyAppMainPages:['padTransferLibJob','padKittingPack']
+    }
+  },
  methods: {
    handleClickOutside() {
      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    },
+    isShowOuter(){
+      return this.isOnlyAppMainPages.indexOf(this.$route.name) < 0
    }
-  }
+  },
 }
 </script>

--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@ -142,12 +142,46 @@ export const constantRoutes = [
      }
    }]
  }, 
-  // 【平板】菜单页
-  // {
-  //   path: '/padMenuPage',
-  //   component: () => import('@/views/padManage/InventoryBookDetail_innerPage'),
-  //   hidden: true
-  // },
+  // 【平板】 菜单页
+  {
+    path: '/padMenuPage',
+    component: () => import('@/views/padManage/padMenuPage'),
+    hidden: true
+  },
+  // 【平板】 业务库移
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/padTransferLibJob',
+    hidden: true,
+    children: [{
+      path: 'padTransferLibJob',
+      component: () => import('@/views/padManage/padTransferLibJob'),
+      name: 'padTransferLibJob',
+      meta: {
+        keepAlive : true, 
+        title: '业务库移',
+        icon: '系统首页',
+      }
+    }]
+  }, 
+  // 【平板】 Kitting组包
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/padKittingPack',
+    hidden: true,
+    children: [{
+      path: 'padKittingPack',
+      component: () => import('@/views/padManage/padKittingPack'),
+      name: 'padKittingPack',
+      meta: {
+        keepAlive : true, 
+        title: 'Kitting组包',
+        icon: '系统首页',
+      }
+    }]
+  }, 
  // {
  //   path: '/',
  //   component: Layout,
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@ -4976,7 +4976,19 @@ export const KittingIssueNote =  [
  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
 ]

-
+// 【pad】业务库移
+export const padTransferLibJob =  [
+  { label: "请求单号", prop: "number", fixed: "left", type: "name" },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
+  { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+  { label: "目标库位代码", prop: "toLocationCode" },
+  { label: "目标ERP库位", prop: "toLocationErpCode" },
+  { label: "备注", prop: "remark" },
+  { label: "操作员", prop: "worker" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]


 // 字段说明
--- a/fe/PC/src/views/padManage/padMenuPage.vue
+++ b/fe/PC/src/views/padManage/padMenuPage.vue
@ -0,0 +1,35 @@
+<template>
+    <div class="padMenuPage">
+        <div class="item"><el-button type="primary"><a href="/#/padTransferLibJob">业务库移</a></el-button></div>
+        <div class="item"><el-button type="warning"><a href="/#/padKittingPack">Kitting组包</a></el-button></div>
+        <div class="item"><el-button type="info"><a href="/#/padKittingPackNote">kitting打包记录</a></el-button></div>
+        <div class="item"><el-button type="success"><a href="/#/padChassis">底盘</a></el-button></div>
+        <div class="item"><el-button type="danger"><a href="/#/padChassisOperationSequence">底盘序列</a></el-button></div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'padMenuPage',
+        data () {
+            return {}
+        },
+        methods: {}
+    }
+</script>
+<style lang="scss" scoped>
+    .padMenuPage{
+        padding-top: 15px;
+        text-align:center;
+        .item{
+            margin: 0 auto 15px;
+            button{
+                width: 200px;
+            }
+            a{
+                display: block;
+                color: inherit;
+            }
+        }
+    }
+</style>
--- a/fe/PC/src/views/padManage/padTransferLibJob.vue
+++ b/fe/PC/src/views/padManage/padTransferLibJob.vue
@ -0,0 +1,93 @@
+<template>
+    <div class="page-box" v-loading="Loading.appMainLoading">
+      <tablePagination
+        :currenButtonData="currenButtonData"
+        :tableData="tableData"
+        :tableLoading="Loading.tableLoading"
+        :tableColumns="tableColumns"
+        @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"
+        :setUTableHeight="140"
+      >
+      </tablePagination>
+      <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+      <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+      <importFile
+        :loading="Loading.importLoading"
+        :show="displayDialog.importDialog"
+        :URL="URL"
+        :disabledMethod = {method1:false,method2:false,method3:false}
+        :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+        isAllowPartImportValue="1"
+        @importClick="postImportMergeClick(arguments)"
+        @postImportDown="importDown"
+      ></importFile>
+      <!--抽屉-->
+      <curren-Drawer
+        :title="tableColumns"
+        :DrawerLoading="Loading.DrawerLoading"
+        :drawer="displayDialog.detailsDialog"
+        :propsData="propsData"
+        :tabsDesTions="tabsDesTions"
+        :Butttondata="[]"
+        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+        @handleCommand="drawerHandle"
+        @close-value="closeValue"
+        :tableColumns="detailsTableColumns"
+        :totalCount="totalCountDetails"
+        :MaxResultCount="MaxResultCountDetails"
+        @alterResultCountDetails="alterResultCountDetails"
+        @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      ></curren-Drawer>
+    </div>
+  </template>
+  <script>
+  import { tableMixins } from "@/mixins/TableMixins";
+  import { LoadingMixins } from "@/mixins/LoadingMixins";
+  import { drawerMixins } from "@/mixins/drawerMixins";
+  import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+  import { mixins } from "@/mixins/mixins";
+  export default {
+    name: "padTransferLibJob",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data() {
+      return {
+        URL: "wms/store/kitting-issue-request",
+        //常用按钮数据
+        currenButtonData: [
+        //   this.defaultImportBtn(),//导入
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          this.defaultFilterBtn(),//筛选
+        ],
+      };
+    },
+    mounted() {
+      this.paging();
+    },
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/styles/mainbasicData.scss";
+  </style>