16 changed files with 49 additions and 144 deletions
--- a/dist/index.html
+++ b/dist/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.7970aba0.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>tft-mes</title><script defer="defer" src="/js/chunk-vendors.60a1a666.js"></script><script defer="defer" src="/js/app.41e2ca26.js"></script><link href="/css/chunk-vendors.330963ff.css" rel="stylesheet"><link href="/css/app.82c5423c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but tft-mes doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/dist/js/318.716d7ea2.js
+++ b/dist/js/318.716d7ea2.js
--- a/dist/js/4332.c5cf652d.js
+++ b/dist/js/4332.c5cf652d.js
--- a/dist/js/4954.5ae1ce52.js
+++ b/dist/js/4954.5ae1ce52.js
--- a/dist/js/6828.3e4b3643.js
+++ b/dist/js/6828.3e4b3643.js
--- a/dist/js/6833.635c9e95.js
+++ b/dist/js/6833.635c9e95.js
--- a/dist/js/6931.b0bb7c51.js
+++ b/dist/js/6931.b0bb7c51.js
--- a/dist/js/8674.4cb564e6.js
+++ b/dist/js/8674.4cb564e6.js
--- a/dist/js/8674.7395549d.js
+++ b/dist/js/8674.7395549d.js
--- a/dist/js/app.41e2ca26.js
+++ b/dist/js/app.41e2ca26.js
--- a/dist/js/app.7970aba0.js
+++ b/dist/js/app.7970aba0.js
--- a/src/api/productionScheduling.js
+++ b/src/api/productionScheduling.js
@ -127,14 +127,6 @@ export function unloadPalletUpdate(data) {
  })
 }

-export function unloadPalletDelete(data) {
-  return request({
-    url: '/order/unloadPallet/delete',
-    method: 'post',
-    data
-  })
-}
-
 // 验证玻璃架id
 export function unloadPalletVerify(data) {
  return request({
--- a/src/router/index.js
+++ b/src/router/index.js
@ -120,6 +120,15 @@ export const routes = [
        },
        component: () => import('../views/productionScheduling/productionData')
      },
+      {
+        path: 'offShelfPackaging',
+        name: 'offShelfPackaging',
+        meta: {
+          title: '下架包装'
+        },
+        component: () =>
+          import('../views/productionScheduling/offShelfPackaging')
+      },
      {
        path: 'reLaunching',
        name: 'reLaunching',
@ -472,16 +481,6 @@ export const routes = [
        },
        component: () =>
          import('../views/qualityManagement/productTraceability')
-      },
-      // 2023、8/23要求将下架包装从生成管理换到质量管理
-      {
-        path: 'offShelfPackaging',
-        name: 'offShelfPackaging',
-        meta: {
-          title: '下架包装'
-        },
-        component: () =>
-          import('../views/productionScheduling/offShelfPackaging')
      }
    ]
  },
--- a/src/views/productionScheduling/components/InnerSpan.vue
+++ b/src/views/productionScheduling/components/InnerSpan.vue
@ -1,45 +0,0 @@
-<template>
-  <div>
-    <span :style="'color: ' + showColor">{{ injectData.glassRackId }}</span>
-  </div>
-</template>
-<script>
-export default {
-  name: 'innerSpan',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      showColor: 'green'
-    }
-  },
-  mounted() {
-    this.init()
-  },
-  methods: {
-    init() {
-      switch (this.injectData.status) {
-        case 3:
-          this.showColor = '#37D97F'
-          break
-        case 1:
-          this.showColor = '#FF4E4ED9'
-          break
-        default:
-          this.showColor = '#606266'
-      }
-    }
-  },
-  watch: {
-    injectData(newVal, oldVal) {
-      if (oldVal.enabled !== newVal.enabled) {
-        this.init()
-      }
-    }
-  }
-}
-</script>
--- a/src/views/productionScheduling/components/OffShelfPackagingDetail.vue
+++ b/src/views/productionScheduling/components/OffShelfPackagingDetail.vue
@ -78,7 +78,6 @@
 <script>
 import { tableHeight, timeFormatter } from '@/utils/index'
 import { getDetail, glassIdTrace } from '@/api/productionScheduling'
-import InnerSpan from './InnerSpan'
 const tableProps = [
  {
    prop: 'proLineName',
@ -98,8 +97,7 @@ const tableProps = [
  {
    prop: 'glassId',
    label: '玻璃ID',
-    minWidth: 160,
-    subcomponent: InnerSpan
+    minWidth: 160
  },
  {
    prop: 'loadTime',
--- a/src/views/productionScheduling/offShelfPackaging.vue
+++ b/src/views/productionScheduling/offShelfPackaging.vue
@ -15,7 +15,7 @@
      <method-btn
        v-if="tableBtn.length"
        slot="handleBtn"
-        :width="260"
+        :width="220"
        label="操作"
        fixed="right"
        :method-list="tableBtn"
@ -68,8 +68,7 @@ import OffShelfPackagingDetail from './components/OffShelfPackagingDetail.vue'
 import OffShelfPackagingContinue from './components/OffShelfPackagingContinue.vue'
 import {
  unloadPalletPage,
-  unloadPalletFinish,
-  unloadPalletDelete
+  unloadPalletFinish
 } from '@/api/productionScheduling'
 const tableProps = [
  {
@ -151,11 +150,6 @@ const tableBtn = [
          type: 'equal',
          name: 'status',
          value: 2
-        },
-        {
-          type: 'unequal',
-          name: 'num',
-          value: 0
        }
      ]
    }
@ -177,25 +171,6 @@ const tableBtn = [
        }
      ]
    }
-  },
-  {
-    type: 'clean',
-    btnName: '清空',
-    showParam: {
-      type: '&',
-      data: [
-        {
-          type: 'equal',
-          name: 'status',
-          value: 2
-        },
-        {
-          type: 'unequal',
-          name: 'num',
-          value: 0
-        }
-      ]
-    }
  }
 ]
 export default {
@ -334,15 +309,13 @@ export default {
    },
    handleClick(val) {
      console.log(val)
-      switch (val.type) {
-        case 'edit':
+      if (val.type === 'edit') {
        this.centervisible = true
        this.addOrEditTitle = '编辑'
        this.$nextTick(() => {
          this.$refs.offShelfPackagingAdd.init(val.data.id)
        })
-          break
-        case 'end':
+      } else if (val.type === 'end') {
        this.$confirm(
          '确认结束包装玻璃架ID" ' + val.data.glassRackId + ' "吗？',
          {
@ -359,27 +332,16 @@ export default {
            })
          })
          .catch(() => {})
-          break
-        case 'continue':
+      } else if (val.type === 'continue') {
        this.centervisible2 = true
        this.$nextTick(() => {
          this.$refs.offShelfPackagingContinue.init(val.data.id)
        })
-          break
-        case 'detail':
+      } else if (val.type === 'detail') {
        this.detailVisible = true
        this.$nextTick(() => {
          this.$refs.packagingDetail.init(val.data.id)
        })
-          break
-        default:
-          unloadPalletDelete({ id: val.data.id }).then(() => {
-            this.$message({
-              message: '操作成功',
-              type: 'success'
-            })
-            this.getList()
-          })
      }
    },
    handleCancel() {