zcy 4 лет назад
Родитель
Сommit
ae51dc2f73

+ 1 - 1
src/views/basics/pillar/index.vue

@@ -119,7 +119,7 @@
 import { listMixin } from '@/mixin/listMixin'
 import columns from './indexColumns'
 import CheckAndEditModel from './CheckAndEditModel'
-import {getAction} from "@/api/request";
+import { getAction } from '@/api/request'
 
 export default {
   components: {

+ 0 - 58
src/views/catenary/stand/CheckAndEditModel.vue

@@ -8,64 +8,6 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
     </a-form-model>
   </j-modal>
 </template>

+ 29 - 18
src/views/catenary/stand/index.vue

@@ -4,35 +4,39 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
+          <j-list-select-tag
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
-            dict-code="sj_plan_status"
+            dict-code="line"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
+          <j-list-select-tag
+            v-model="queryParam.stationId"
             style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
+            placeholder="选择区间站场"
+            dict-code="station"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
+          <a-tree-select
+            v-model="queryParam.deptId"
             style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间工区"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
           />
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.yy"
+            v-model="queryParam.xingbie"
             style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
+            placeholder="选择行别"
+            dict-code="xingbie"
           />
         </a-form-item>
         <a-form-item>
@@ -42,10 +46,6 @@
             placeholder="输入公里标"
           />
         </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>
           <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
@@ -112,6 +112,7 @@
 import { listMixin } from '@/mixin/listMixin'
 import columns from './indexColumns'
 import CheckAndEditModel from './CheckAndEditModel'
+import { getAction } from '@/api/request'
 
 export default {
   components: {
@@ -128,13 +129,23 @@ export default {
         list: '/business/catenary/bus/zzdzxx/list',
         delete: '/business/catenary/bus/zzdzxx/',
         exportXlsUrl: '/exportXlsUrl',
+        tree: '/system/dept/treeSelect',
         importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
       }
     }
   },
   created() {
+    this.loadTree()
   },
   methods: {
+    loadTree() {
+      this.treeData = []
+      getAction(this.url.tree).then((res) => {
+        if (res.code === 200) {
+          this.treeData = res.data
+        }
+      })
+    }
   }
 }
 </script>