Merge branch 'main' of https://git.positivepole.cn/Mes/middle-admin-ant

src/pages/Middle/Chatgpt/ChatgptCard/ChatgptCard/Edit.vue

@@ -169,9 +169,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Chatgpt/User/User/Edit.vue

@@ -171,9 +171,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/BaseDepartment/BaseDepartment/Edit.vue

@@ -207,9 +207,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesCeramicsMaterialClassification/MesCeramicsMaterialClassification/Edit.vue

@@ -189,9 +189,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesInspection/MesInspection/Edit.vue

@@ -183,9 +183,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesPlan/MesPlan/Edit.vue

@@ -183,9 +183,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue

@@ -264,9 +264,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
         this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
 

src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/Edit.vue

@@ -183,9 +183,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue

@@ -295,9 +295,11 @@ export default {
       } else {
         console.log( this.addModeItems)
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesStock/MesStock/Edit.vue

@@ -342,9 +342,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesStock/MesStock/OutIn/LogEdit.vue

@@ -242,9 +242,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesStock/MesStock/Position/PositionEdit.vue

@@ -217,9 +217,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesUnit/MesUnit/Edit.vue

@@ -183,9 +183,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue

@@ -242,9 +242,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mes/MesWarehouse/MesWarehouse/PositionEdit.vue

@@ -273,9 +273,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mold/InkjetPrinter/Edit.vue

@@ -148,9 +148,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mold/MoldComponentCategory/Edit.vue

@@ -151,9 +151,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/Mold/MoldSchemeCategory/Edit.vue

@@ -148,9 +148,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/ProvideLoanApply/ProvideLoanApply/ProvideLoanApply/Edit.vue

@@ -168,9 +168,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/transport/Custom/BalanceLog/Edit.vue

@@ -181,9 +181,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions"></basic-page-edit>
+  <basic-page-edit  :dataId="getDataId()" :options="pageOptions"></basic-page-edit>
 </template>
 
 <script>
@@ -199,9 +199,11 @@ export default {
         this.$forceUpdate()
       } else {
         // 如果没有id参数，说明是新增模式
-        this.addModeItems.forEach(item => {
+      if(this.addModeItems){
+          this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
-        })
+      })
+      }
 
       }
     },

src/pages/Middle/transport/TrainNumber/TrainNumber/Detail.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    1
+  </div>
+</template>

src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue

@@ -76,6 +76,9 @@
 
         <template #op="{ row }">
           <div class="oplinks">
+            <a @click.stop="pageDetail(row)" title="详情">
+              <a-icon type="file"/>
+            </a>
             <a @click.stop="pageEdit(row)" title="编辑">
               <a-icon type="edit" />
             </a>
@@ -272,7 +275,7 @@ export default {
           // =============================== 表格列 自动生成 Start ===============================
 
 
-          { title: '操作', slots: { default: 'op' }, width: 120, fixed: 'right' }
+          {title: '操作', slots: {default: 'op'}, width: 150, fixed: 'right'}
         ]
       }
 
@@ -371,7 +374,14 @@ export default {
         this.$openPage("/TrainNumber/TrainNumberCreate"); // 打开页面
       }
     },
-
+     // 详情
+     pageDetail(row) {
+      if (!row) { // 如果没有选中行
+        this.$mk.msg("请选择行"); // 提示
+        return; // 返回
+      }
+      this.$openPage("/TrainNumber/TrainNumberDetail/" + row[this.keyName]); // 打开页面
+    },
     // 编辑
     pageEdit(row) {
       if (!row) { // 如果没有选中行
@@ -412,7 +422,7 @@ export default {
         }
       });
     },
-
+    
     // 搜索
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索

src/router/Middle/transport/TrainNumber/router.map.js

@@ -65,6 +65,18 @@ const TrainNumberRouterMap = {
             permission: ["TrainNumber", "TrainNumber-All", "Train-Number-Update"],
         }
     },
+    TrainNumberDetail: {
+        name: '车次详情',
+        icon: 'idcard',
+        path: '/TrainNumber/TrainNumberDetail/:id',
+        meta: {
+            invisible: true, // 不在菜单中显示
+        },
+        component: () => import('@/pages/Middle/transport/TrainNumber/TrainNumber/Detail'),
+        authority: {
+            permission: ["TrainNumber", "TrainNumber-All", "Train-Number-Update"],
+        }
+    },
 }
 
 export default TrainNumberRouterMap