Merge branch 'master' of https://git.evo-techina.com/sgc/mes-vue

src/router/index.ts

@@ -215,6 +215,20 @@ const routes: RouteRecordRaw[] = [
         component: () => import('@/views/biz/device/board.vue'),
         meta: { title: '设备状态监控', icon: 'PulseOutline' }
       },
+      // 入库管理
+      {
+        path: 'biz/stockIn',
+        name: 'BizStockIn',
+        component: () => import('@/views/biz/stockIn/index.vue'),
+        meta: { title: '入库管理', icon: 'ArchiveOutline' }
+      },
+      // 甘特图排产
+      {
+        path: 'biz/orderProject/gantt',
+        name: 'BizOrderProjectGantt',
+        component: () => import('@/views/biz/orderProject/components/GanttSchedule.vue'),
+        meta: { title: '甘特图排产', icon: 'CalendarOutline' }
+      },
       // 开发工具
       {
         path: 'biz/permissionConfig',

src/views/biz/orderProcessPlan/components/SplitProcessDialog.vue

@@ -105,7 +105,7 @@
               >
                 <n-space>
                   <n-radio value="kingdee">金蝶工艺路线</n-radio>
-                  <n-radio value="assemble">工序表组装</n-radio>
+                  <n-radio value="assemble">创建新工艺路线</n-radio>
                 </n-space>
               </n-radio-group>
             </div>
@@ -163,7 +163,7 @@
 
             <div v-else class="split-body">
               <div class="assemble-toolbar">
-                <span class="hint-inline">按新增工艺路线方式逐行维护；说明为空时默认用工序名称</span>
+                <span class="hint-inline">新增工艺路线方；说明为空时默认用工序名称</span>
                 <n-button size="small" type="primary" secondary @click="addAssembleRow">+ 添加工序</n-button>
               </div>
               <n-data-table