保存

src/views/basics/check/view/dc/CheckAndEditModel.vue

@@ -20,21 +20,21 @@
           :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>
-      <a-form-model-item label="站场区间" prop="qj">
+      <a-form-model-item label="站场区间" prop="stationId">
         <j-list-select-tag
-          v-model="model.qj"
+          v-model="model.stationId"
           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"
         />
@@ -74,9 +74,9 @@ export default {
       model: {},
       validatorRules: {
         deptId: [{ required: true, message: '请选择' }],
-        xb: [{ required: true, message: '请选择' }],
-        qj: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        lineId: [{ required: true, message: '请选择' }],
+        stationId: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzhfw: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         cdh: [{ required: true, message: '请输入' }]

src/views/basics/check/view/dc/index.vue

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
             dict-code="line"
@@ -13,7 +13,7 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.zhanqujian"
+            v-model="queryParam.stationId"
             style="width: 150px"
             placeholder="选择区间站场"
             dict-code="station"
@@ -21,7 +21,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/check/view/dc/indexColumns.js

@@ -12,20 +12,20 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '线别',
       align: 'center',
-      dataIndex: '',
-      key: ''
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'zhanqujian',
-      key: 'zhanqujian'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '行别',

src/views/basics/check/view/fd/CheckAndEditModel.vue

@@ -20,19 +20,19 @@
             :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>
-      <a-form-model-item label="站场区间" prop="qj">
+      <a-form-model-item label="站场区间" prop="stationId">
         <j-list-select-tag
-          v-model="model.qj"
+          v-model="model.stationId"
           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"
           type="radioButton"
@@ -71,9 +71,9 @@ export default {
       model: {},
       validatorRules: {
         deptId: [{ required: true, message: '请选择' }],
-        xb: [{ required: true, message: '请选择' }],
-        qj: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        lineId: [{ required: true, message: '请选择' }],
+        stationId: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzhfw: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         cdh: [{ required: true, message: '请输入' }]

src/views/basics/check/view/fd/index.vue

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
             dict-code="line"
@@ -13,7 +13,7 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.qj"
+            v-model="queryParam.stationId"
             style="width: 150px"
             placeholder="选择区间站场"
             dict-code="station"
@@ -21,7 +21,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
@@ -33,7 +33,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

src/views/basics/check/view/fd/indexColumns.js

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       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: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号范围',

src/views/basics/line/CheckAndEditModel.vue

@@ -64,7 +64,6 @@ export default {
       validatorRules: {
         lineSjbh: [{ required: true, message: '请输入' }],
         lineName: [{ required: true, message: '请输入' }],
-        lineId: [{ required: true, message: '请选择' }],
         deptId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
         lineStartMarker: [{ required: true, message: '请输入' }],