Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

components/page/treeGrid/EditGrid.vue

 <template>
-  <div class="table-content">
+  <div class="table-content1">
     <div class="table-tools">
       <div class="table-search">
         <slot name="easySearch"></slot>
@@ -46,11 +46,6 @@
               </th>
             </tr>
           </thead>
-        </table>
-      </div>
-
-      <div class="table-body">
-        <table>
           <tbody>
             <tr
               v-for="(item, index) in trs"
@@ -784,7 +779,7 @@ export default {
 @table_line_height: 50px;
 @table_hover: #f2f8fe;
 @table_border: #accef7;
-.table-content {
+.table-content1 {
   position: relative;
   height: 100%;
   display: flex;

i18n/locale/zh-CN.js

@@ -1137,6 +1137,8 @@ export default {
         multipleEquip: "是否多台安排设备", // 否  是
         multipleEquipIds: "设备id", //用英文逗号分隔
         discrete: '离散值',
+        routingHeaderCode:'工艺编号',
+        routingHeaderName:'工艺名称',
     },
     routing_header: {
         id: '',