From 30f1c775f033ebd665317dd1d38dd6ae31cb8ddb Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 15 Dec 2023 12:48:57 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  8 ++++-
 src/views/main-navbar.vue                     |  2 +-
 src/views/main.vue                            |  8 ++---
 src/views/modules/pad/padCODelNotify.vue      | 10 ++++--
 src/views/modules/pad/padPart1.vue            |  2 +-
 src/views/modules/pad/padPartPhoto.vue        |  3 +-
 .../production/shopOrderProductView.vue       | 35 +++++++++----------
 src/views/modules/sys/menu-add-or-update.vue  |  1 +
 8 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 6eee2b6..7d84a17 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,12 +90,18 @@ router.beforeEach((to, from, next) => {
   if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
     next()
   } else {
+    let type="pc"
+    // let match = navigator.userAgent.match(/(pad|iPad)/i);
+    let match = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+    if (match) {
+      type="pad"
+    }
     http({
       url: http.adornUrl('/sys/menu/nav'),
       method: 'get',
       params: {
         'l': i18n.locale, //i18n.locale
-        menuType: "pc"
+        menuType: type
       }
     }).then(({data}) => {
       if (data && data.code === 0) {
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index 5f434e5..09bbe30 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -1,7 +1,7 @@
 <template>
   <nav class="site-navbar" :class="'site-navbar--' + navbarLayoutType">
     <div class="site-navbar__header">
-      <h1 class="site-navbar__brand" @click="$router.push({ name: 'home' })">
+      <h1 class="site-navbar__brand">
         <el-menu
           class="site-navbar__menu"
           mode="horizontal">
diff --git a/src/views/main.vue b/src/views/main.vue
index da8f0d9..94daf3c 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -97,10 +97,10 @@
             this.site = data.user.site
             this.languageDefault = data.user.languageDefault
             this.userDisplay = data.user.userDisplay
-            let match = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
-            if (match) {
-              this.$router.replace({ name: 'padCODelNotify' })
-            }
+            // let match = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
+            // if (match) {
+            //   this.$router.replace({ name: 'padCODelNotify' })
+            // }
           }
         })
       }
diff --git a/src/views/modules/pad/padCODelNotify.vue b/src/views/modules/pad/padCODelNotify.vue
index 7f0314e..a33df37 100644
--- a/src/views/modules/pad/padCODelNotify.vue
+++ b/src/views/modules/pad/padCODelNotify.vue
@@ -66,7 +66,7 @@
     </el-form>
     <div v-loading="delNotifyHeaderTableLoading">
       <el-table
-        :height="300"
+        :height="height"
         :data="delNotifyHeaderList"
         border stripe
         @row-click="rowClickDelNotifyHeaderTable"
@@ -177,7 +177,7 @@
       </div>
 
       <el-table :data="delNotifyDetailList"
-                height="300"
+                height="250"
                 border stripe
                 style="margin-top: 10px;">
         <el-table-column label="操作" width="150px" header-align="center" fixed align="center">
@@ -554,6 +554,7 @@ import {Decimal} from "decimal.js";
 export default {
   data() {
     return {
+      height:200,
       // 搜索表单对象
       searchData:{
         site:"",
@@ -599,6 +600,11 @@ export default {
       subCodeDesc:"",//描述
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 475
+    })
+  },
   methods: {
     searchDelHeaderList(){
       let params = JSON.parse(JSON.stringify(this.searchData))
diff --git a/src/views/modules/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue
index f430570..fd4ffbc 100644
--- a/src/views/modules/pad/padPart1.vue
+++ b/src/views/modules/pad/padPart1.vue
@@ -100,7 +100,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 100
+        this.height = window.innerHeight - 210
       })
     },
     methods: {
diff --git a/src/views/modules/pad/padPartPhoto.vue b/src/views/modules/pad/padPartPhoto.vue
index 0841867..fe28fd8 100644
--- a/src/views/modules/pad/padPartPhoto.vue
+++ b/src/views/modules/pad/padPartPhoto.vue
@@ -78,7 +78,8 @@
 
       },
       jump(){
-        this.$router.push('/padPart');
+        // this.$router.push('/padPart');
+        this.$router.back();
       },
       getPhoto(){
         getPhotoAddressData(this.searchData).then(({data}) => {
diff --git a/src/views/modules/production/shopOrderProductView.vue b/src/views/modules/production/shopOrderProductView.vue
index eb6dff0..0c29af4 100644
--- a/src/views/modules/production/shopOrderProductView.vue
+++ b/src/views/modules/production/shopOrderProductView.vue
@@ -248,7 +248,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
-
+          }, {
+            tableId: "orderView",
+            tableName: this.$route.meta.title,
+            columnProp: "jiagongReport",
+            columnLabel: "加工组",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'right'
           }, {
             tableId: "orderView",
             tableName: this.$route.meta.title,
@@ -266,23 +282,6 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
-          // }, {
-          //   tableId: "orderView",
-          //   tableName: this.$route.meta.title,
-          //   columnProp: "jianyanReport",
-          //   columnLabel: "加工组",
-          //   columnHidden: false,
-          //   columnImage: false,
-          //   columnSortable: false,
-          //   columnWidth: 60,
-          //   format: null,
-          //   functionId: this.$route.meta.menuId,
-          //   sortLv: 0,
-          //   status: true,
-          //   fixed: '',
-          //   serialNumber: null,
-          //   columnType: null,
-          //   align: 'right'
           }, {
             tableId: "orderView",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
index 8bcbb27..b712f14 100644
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ b/src/views/modules/sys/menu-add-or-update.vue
@@ -51,6 +51,7 @@
         <el-select v-model="dataForm.menuType">
           <el-option label="pc" value="pc"></el-option>
           <el-option label="pda" value="pda"></el-option>
+          <el-option label="pad" value="pad"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item v-if="dataForm.type !== 2" label="菜单图标" prop="icon">