Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into test

src/views/technology/route/index.vue

@@ -92,7 +92,21 @@ export default {
       isUpdate: false,
       // 表格列配置
       columns: [
-
+      {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+        {
+          slot: 'routeType',
+          label: '类型',
+          align: 'center',
+          showOverflowTooltip: true
+        },
         {
           prop: 'code',
           label: '工艺路线编码',
@@ -141,25 +155,21 @@ export default {
           columnKey: 'status'
         },
 
+       
         {
-          slot: 'routeType',
-          label: '类型',
+          slot: 'factoryName',
+          label: '所属工厂',
           align: 'center',
           showOverflowTooltip: true
         },
 
         {
-          slot: 'factoryName',
-          label: '所属工厂',
           align: 'center',
-          showOverflowTooltip: true
+          prop: 'createTime',
+          label: '创建时间',
+          showOverflowTooltip: true,
+          minWidth: 110
         },
-
-
-
-
-
-
         {
           columnKey: 'action',
           label: '操作',

src/views/technology/version/components/user-edit.vue

@@ -7,8 +7,8 @@
       <el-row>
 
         <el-col :span="8">
-          <el-form-item label="版本编码:" prop="code">
-            <el-input clearable v-model="form.code" :disabled="isUpdate" placeholder="请输入版本编码" />
+          <el-form-item label="工艺类型编码:" prop="code">
+            <el-input clearable v-model="form.code" :disabled="isUpdate" placeholder="请输入工艺类型编码" />
           </el-form-item>
         </el-col>
 
@@ -16,8 +16,8 @@
 
 
         <el-col :span="8">
-          <el-form-item label="类型名称:" prop="name">
-            <el-input v-model="form.name" clearable placeholder="请输入" />
+          <el-form-item label="工艺类型名称:" prop="name">
+            <el-input v-model="form.name" clearable placeholder="请输入工艺类型名称" />
           </el-form-item>
         </el-col>
 

src/views/technology/version/index.vue

@@ -78,17 +78,25 @@ export default {
     return {
       // 表格列配置
       columns: [
-
+      {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
         {
           align: 'center',
           prop: 'code',
-          label: '版本编码',
+          label: '工艺类型编码',
           showOverflowTooltip: true,
           minWidth: 110
         },
         {
           prop: 'name',
-          label: '版本名称',
+          label: '工艺类型名称',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 110
@@ -100,7 +108,13 @@ export default {
           showOverflowTooltip: true,
           minWidth: 110
         },
-
+        {
+          align: 'center',
+          prop: 'createTime',
+          label: '创建时间',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
         {
           columnKey: 'action',
           label: '操作',