提交

src/views/catenary/stand/view/fb/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="所属车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -21,11 +21,11 @@
           @change="deptChange"
         />
       </a-form-model-item>
-      <a-form-model-item label="线路" prop="lineId">
+      <a-form-model-item label="线别" prop="lineId">
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -49,18 +49,18 @@
         <a-input v-model="model.pillarCode" />
       </a-form-model-item>
       <a-form-model-item label="开始公里标" prop="startMarker">
-        <a-input-number style="width: 100%" v-model="model.startMarker" />
+        <a-input-number v-model="model.startMarker" style="width: 100%" />
       </a-form-model-item>
       <a-form-model-item label="结束公里标" prop="endMarker">
-        <a-input-number style="width: 100%" v-model="model.endMarker" />
+        <a-input-number v-model="model.endMarker" style="width: 100%" />
       </a-form-model-item>
       <a-form-model-item label="风险源" prop="riskSource">
         <a-input v-model="model.riskSource" />
       </a-form-model-item>
       <a-form-model-item label="采取措施" prop="measures">
-        <a-textarea :maxLength="300" :rows="4" v-model="model.measures" />
+        <a-textarea v-model="model.measures" :max-length="300" :rows="4" />
       </a-form-model-item>
-    </a-form-model>
+      </a-form-model-item></a-form-model>
   </j-modal>
 </template>
 <script>
@@ -84,7 +84,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
@@ -101,11 +101,8 @@ export default {
       }
     }
   },
-  created() {
-    this.loadTree()
-  },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false
@@ -124,6 +121,9 @@ export default {
       }
     }
   },
+  created() {
+    this.loadTree()
+  },
   methods: {
     lineChange() {
       this.model.stationId = undefined

src/views/catenary/stand/view/fb/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fb/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fcr/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -103,7 +103,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         pillarArea: [{ required: true, message: '请输入' }],
@@ -130,7 +130,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fcr/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fcr/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/ff/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -84,7 +84,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
@@ -105,7 +105,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/ff/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/ff/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fh/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -83,7 +83,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         pillarArea: [{ required: true, message: '请输入' }],
@@ -105,7 +105,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fh/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fh/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fl/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -84,7 +84,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
@@ -105,7 +105,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fl/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fl/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fnh/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -90,7 +90,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         substationId: [{ required: true, message: '请选择' }],
@@ -112,7 +112,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fnh/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fnh/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fs/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -102,7 +102,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
@@ -131,7 +131,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fs/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fs/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fxs/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -97,7 +97,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         substationId: [{ required: true, message: '请选择' }],
@@ -121,7 +121,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fxs/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fxs/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'

src/views/catenary/stand/view/fyw/CheckAndEditModel.vue

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="deptStationId">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.deptStationId"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -25,7 +25,7 @@
         <j-list-select-tag
           v-if="lineShow"
           v-model="model.lineId"
-          :dept-id="model.deptStationId"
+          :dept-id="model.deptId"
           dict-code="line"
           @selectChange="lineChange"
         />
@@ -84,7 +84,7 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        deptStationId: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
@@ -105,7 +105,7 @@ export default {
     this.loadTree()
   },
   watch: {
-    'model.deptStationId': {
+    'model.deptId': {
       immediate: true,
       handler: function(newV, oldV) {
         this.lineShow = false

src/views/catenary/stand/view/fyw/index.vue

@@ -17,17 +17,21 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.lineId"
+            v-if="lineShow"
+            v-model="lineId"
+            :dept-id="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择线别"
+            placeholder="选择线路"
             dict-code="line"
           />
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.stationId"
+            v-if="stationShow"
+            v-model="stationId"
+            :line-id="queryParam.lineId"
             style="width: 150px"
-            placeholder="选择区间站场"
+            placeholder="选择站场区间"
             dict-code="station"
           />
         </a-form-item>
@@ -128,6 +132,10 @@ export default {
   mixins: [listMixin],
   data() {
     return {
+      stationShow: true,
+      lineShow: true,
+      lineId: undefined,
+      stationId: undefined,
       // 查询条件
       queryParam: {},
       // 表头
@@ -141,6 +149,31 @@ export default {
       }
     }
   },
+  watch: {
+    stationId(val) {
+      this.queryParam.stationId = val
+    },
+    lineId(val) {
+      this.queryParam.lineId = val
+      this.stationShow = false
+      this.$nextTick(() => {
+        this.stationId = undefined
+        this.stationShow = true
+      })
+    },
+    'queryParam.deptId': {
+      handler: function(newV, oldV) {
+        this.lineShow = false
+        this.$nextTick(() => {
+          this.queryParam.lineId = undefined
+          this.queryParam.stationId = undefined
+          this.lineId = undefined
+          this.stationId = undefined
+          this.lineShow = true
+        })
+      }
+    }
+  },
   created() {
     this.loadTree()
   },

src/views/catenary/stand/view/fyw/indexColumns.js

@@ -16,13 +16,13 @@ function columns(vm) {
       key: 'deptName'
     },
     {
-      title: '线别',
+      title: '线路',
       align: 'center',
       dataIndex: 'lineName',
       key: 'lineName'
     },
     {
-      title: '区间站场',
+      title: '站场区间',
       align: 'center',
       dataIndex: 'stationName',
       key: 'stationName'