字段调整

src/views/basics/line/CheckAndEditModel.vue

@@ -26,9 +26,9 @@
           :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -66,7 +66,7 @@ export default {
         lineName: [{ required: true, message: '请输入' }],
         lineId: [{ required: true, message: '请选择' }],
         deptId: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         lineStartMarker: [{ required: true, message: '请输入' }],
         lineEndMarker: [{ required: true, message: '请输入' }]
 

src/views/basics/line/index.vue

@@ -24,7 +24,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

src/views/basics/line/indexColumns.js

@@ -16,10 +16,10 @@ function columns(vm) {
       key: 'lineSjbh'
     },
     {
-      title: '线别',
+      title: '段别',
       align: 'center',
-      dataIndex: 'lineType',
-      key: 'lineType'
+      dataIndex: 'deptParentName',
+      key: 'deptParentName'
     },
     {
       title: '线路名称',
@@ -36,8 +36,8 @@ function columns(vm) {
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '开始公里标',

src/views/basics/pillar/CheckAndEditModel.vue

@@ -23,9 +23,9 @@
           :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
         />
       </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
+      <a-form-model-item label="线别" prop="lineId">
         <j-list-select-tag
-          v-model="model.xb"
+          v-model="model.lineId"
           dict-code="line"
         />
       </a-form-model-item>
@@ -35,9 +35,9 @@
           dict-code="station"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -100,9 +100,9 @@ export default {
       validatorRules: {
         zzh: [{ required: true, message: '请输入' }],
         stationId: [{ required: true, message: '请选择' }],
-        xb: [{ required: true, message: '请选择' }],
+        lineId: [{ required: true, message: '请选择' }],
         deptId: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         glb: [{ required: true, message: '请输入' }],
         zzlx: [{ required: true, message: '请选择' }],
         zzxh: [{ required: true, message: '请选择' }],

src/views/basics/pillar/indexColumns.js

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间/站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '车间/工区',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号',

src/views/basics/section/CheckAndEditModel.vue

@@ -29,9 +29,9 @@
           dict-code="line"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -75,7 +75,7 @@ export default {
         stationName: [{ required: true, message: '请输入' }],
         lineId: [{ required: true, message: '请选择' }],
         deptId: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         startMarker: [{ required: true, message: '请输入' }],
         endMarker: [{ required: true, message: '请输入' }]

src/views/basics/section/index.vue

@@ -32,7 +32,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

src/views/basics/tunnel/index.vue

@@ -12,7 +12,7 @@
             />
           </a-form-item>
           <j-list-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
             dict-code="line"
@@ -28,7 +28,7 @@
         </a-form-item>
         <a-form-item>
           <a-tree-select
-            v-model="queryParam.bm"
+            v-model="queryParam.deptId"
             style="width: 150px"
             :show-search="true"
             allow-clear

src/views/basics/tunnel/indexColumns.js

@@ -12,20 +12,20 @@ function columns(vm) {
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'cj',
-      key: 'cj'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '隧道名称',