From 6f9334bbabde8ed4aa93f2cad0ea786da9d41caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 17 Dec 2024 09:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw-ui/src/layout/index2.vue                   | 56 +++++++++++++++----
 .../views/mes/productplan/editProductPlan.vue | 16 +++---
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/hw-ui/src/layout/index2.vue b/hw-ui/src/layout/index2.vue
index 71192199..1b451512 100644
--- a/hw-ui/src/layout/index2.vue
+++ b/hw-ui/src/layout/index2.vue
@@ -8,21 +8,12 @@
       <div class="select">
         <el-dropdown @command="handleCommand">
           <el-button type="primary" size="mini">
-            切换看板
+            {{ (menuData.find(v=>v.path === $route.fullPath)||{}).name }}
             <i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="/index">后台系统</el-dropdown-item>
-            <el-dropdown-item command="/board/firstFloorProduction">一楼生产</el-dropdown-item>
-            <el-dropdown-item command="/board/firstFloorWarehouse">一楼能源</el-dropdown-item>
-            <el-dropdown-item command="/board/secondFloorProduction">二楼生产</el-dropdown-item>
-            <el-dropdown-item command="/board/secondFloorWarehouse">二楼仓储</el-dropdown-item>
-            <el-dropdown-item command="/board/thirdFloorProduction">三楼生产</el-dropdown-item>
-            <el-dropdown-item command="/board/thirdFloorWarehouse">三楼仓储</el-dropdown-item>
-            <el-dropdown-item command="/board/fourthFloorProduction">四楼生产</el-dropdown-item>
-            <el-dropdown-item command="/board/fourthFloorWarehouse">四楼仓储</el-dropdown-item>
-            <el-dropdown-item command="/board/fifthFloorProduction">五楼生产</el-dropdown-item>
-            <el-dropdown-item command="/board/fifthFloorWarehouse">五楼仓储</el-dropdown-item>
+            <el-dropdown-item v-for="i in menuData" :command="i.path">{{ i.name }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
 
@@ -41,7 +32,45 @@
         data: '',
         time: '',
         date: '',
-        value: ''
+        value: '',
+        menuData:[
+          {
+            name:'一楼生产',
+            path:'/board/firstFloorProduction'
+          },
+          {
+            name:'一楼能源',
+            path:'/board/firstFloorWarehouse'
+          },
+          {
+            name:'二楼生产',
+            path:'/board/secondFloorProduction'
+          },
+          {
+            name:'二楼仓储',
+            path:'/board/secondFloorWarehouse'
+          },
+          {
+            name:'三楼生产',
+            path:'/board/thirdFloorProduction'
+          },
+          {
+            name:'三楼仓储',
+            path:'/board/thirdFloorWarehouse'
+          },
+          {
+            name:'四楼生产',
+            path:'/board/fourthFloorProduction'
+          },
+          {
+            name:'四楼仓储',
+            path:'/board/fourthFloorWarehouse'
+          },
+          {
+            name:'五楼生产',
+            path:'/board/fifthFloorProduction'
+          },
+        ]
       }
     },
     created() {
@@ -61,6 +90,9 @@
       getDate()
       getDateIntervalFun = setInterval(getDate, 1000)
     },
+    mounted(){
+      console.log(this.$route.fullPath)
+    },
     methods: {
       handleCommand(e) {
         this.$router.push(e)
diff --git a/hw-ui/src/views/mes/productplan/editProductPlan.vue b/hw-ui/src/views/mes/productplan/editProductPlan.vue
index d6a3826d..b336bf01 100644
--- a/hw-ui/src/views/mes/productplan/editProductPlan.vue
+++ b/hw-ui/src/views/mes/productplan/editProductPlan.vue
@@ -186,7 +186,7 @@
                 size="mini"
                 type="primary"
                 @click="handleDrawing(scope.row)"
-                v-if="scope.row.processType !== PROCESS_TYPE.AUTO && scope.row.children != null && scope.row.children !== undefined"
+
               >图纸
               </el-button>
               <el-button
@@ -243,7 +243,7 @@
       @before-close="blueprintModel = false">
       <el-form ref="form">
         <el-form-item label="选择BOM图纸">
-          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM图纸" multiple filterable :clearable="false">
+          <el-select v-model="materialBomAttachIdList"  placeholder="请选择选择BOM图纸" multiple filterable :clearable="false"  :disabled="!(nowRow.processType !== PROCESS_TYPE.AUTO && nowRow.children != null && nowRow.children !== undefined)">
             <el-option
               v-for="item in attachInfoList"
               :key="item.attachId"
@@ -292,6 +292,7 @@
         <span
           class="el-upload-list__item-delete"
           @click="handleRemoveDrawing(file)"
+          v-if="nowRow.processType !== PROCESS_TYPE.AUTO && nowRow.children != null && nowRow.children !== undefined"
         >
           <i class="el-icon-delete"></i>
         </span>
@@ -300,12 +301,6 @@
       </el-upload>
       <span slot="footer" class="dialog-footer">
         <!-- 上传提示 -->
-    <div class="el-upload__tip" slot="tip" v-if="isShowTip">
-      请上传
-      <template v-if="drawingFileSize"> 大小不超过 <b style="color: #f67c7c">{{ drawingFileSize }}MB</b></template>
-      <template v-if="drawingFileType"> 格式为 <b style="color: #f56c6c">{{ drawingFileType.join("/") }}</b></template>
-      的文件
-    </div>
     <el-button type="primary" @click="drawingFileUploadSubmit">确 定</el-button>
     <el-button @click="blueprintModel = false">取 消</el-button>
       </span>
@@ -482,6 +477,7 @@ export default {
   },
   data() {
     return {
+      nowRow:{},
       blueprintModel: false,
       sopViewModel: false,
       pictureDetailModel: false,
@@ -1298,6 +1294,7 @@ export default {
 
     /** 查看sop */
     handleSop(row) {
+      this.nowRow = row
       this.fileList = [];
       if (row.oldRowFlag && (!this.previewSopFlag[row.dispatchCode + "-" + row.processId]
         || this.previewSopFlag[row.dispatchCode + "-" + row.processId] !== "1")) {
@@ -1561,4 +1558,7 @@ export default {
 
 <style scoped>
 /deep/.el-icon-close{display:none}
+/deep/.el-upload{
+  display: none;
+}
 </style>