救援集成进度1/5

src/utils/dict.js

@@ -143,6 +143,12 @@ export const DICT_TYPE = {
   // 资产取得方式
   PROPERTY_GET_WAY : 'property_get_way',
   COMPANY_COST_TYPE: 'company_cost_type',
+  // 救援车车型
+  JYC_TYPE : 'jyc_type',
+  // 车牌颜色
+  CAR_LICENSE_COLOR: 'car_license_color',
+  // 车辆使用性质
+  CAR_USE_NATURE : 'car_use_nature',
 }
 
 /**

src/views/rescue/api/rescueCustomer.js

@@ -53,7 +53,7 @@ export function delRescueCustomer(id) {
 //ai
 export function getdeptTree() {
   return request({
-    url: '/system/user/deptTree' ,
+    url: '/system/dept/list' ,
     method: 'get'
   })
 }

src/views/rescue/carInfo.vue

@@ -4,7 +4,7 @@
       <el-form-item label="车辆类型" prop="rescueCarType">
         <el-select v-model="queryParams.rescueCarType" placeholder="请选择车辆类型" clearable>
           <el-option
-            v-for="dict in dict.type.jyc_type"
+            v-for="dict in this.getDictDatas(DICT_TYPE.JYC_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -32,7 +32,7 @@
       <el-form-item label="车牌颜色" prop="carLicenseColor">
         <el-select v-model="queryParams.carLicenseColor" placeholder="请选择车牌颜色" clearable>
           <el-option
-            v-for="dict in dict.type.car_license_color"
+            v-for="dict in this.getDictDatas(DICT_TYPE.CAR_LICENSE_COLOR)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -42,7 +42,7 @@
       <el-form-item label="车辆性质" prop="carUseNature">
         <el-select v-model="queryParams.carUseNature" placeholder="请选择车辆性质" clearable>
           <el-option
-            v-for="dict in dict.type.car_use_nature"
+            v-for="dict in this.getDictDatas(DICT_TYPE.CAR_USE_NATURE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -69,10 +69,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="rescueCarList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center">
+        <template scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="车辆类型" align="center" prop="rescueCarType">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.jyc_type" :value="scope.row.rescueCarType"/>
+          <dict-tag :type="DICT_TYPE.JYC_TYPE" :value="scope.row.rescueCarType"/>
         </template>
       </el-table-column>
       <el-table-column label="车牌号" align="center" prop="rescueCarNum" />
@@ -105,7 +109,7 @@
       </el-table-column>
       <el-table-column label="车牌颜色" align="center" prop="carLicenseColor">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.car_license_color" :value="scope.row.carLicenseColor"/>
+          <dict-tag :type="DICT_TYPE.CAR_LICENSE_COLOR" :value="scope.row.carLicenseColor"/>
         </template>
       </el-table-column>
 <!--      <el-table-column label="车辆所属" align="center" prop="carLicenseColor">-->
@@ -115,10 +119,10 @@
 <!--      </el-table-column>-->
       <el-table-column label="车辆性质" align="center" prop="carUseNature">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.car_use_nature" :value="scope.row.carUseNature"/>
+          <dict-tag :type="DICT_TYPE.CAR_USE_NATURE" :value="scope.row.carUseNature"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -153,7 +157,7 @@
         <el-form-item label="车辆类型" prop="rescueCarType">
           <el-select v-model="form.rescueCarType" placeholder="请选择车辆类型">
             <el-option
-              v-for="dict in dict.type.jyc_type"
+              v-for="dict in this.getDictDatas(DICT_TYPE.JYC_TYPE)"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -207,7 +211,7 @@
         <el-form-item label="车牌颜色" prop="carLicenseColor">
           <el-radio-group v-model="form.carLicenseColor">
             <el-radio
-              v-for="dict in dict.type.car_license_color"
+              v-for="dict in this.getDictDatas(DICT_TYPE.CAR_LICENSE_COLOR)"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
@@ -216,7 +220,7 @@
         <el-form-item label="车辆性质" prop="carUseNature">
           <el-radio-group v-model="form.carUseNature">
             <el-radio
-              v-for="dict in dict.type.car_use_nature"
+              v-for="dict in this.getDictDatas(DICT_TYPE.CAR_USE_NATURE)"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
@@ -293,8 +297,8 @@
       getList() {
         this.loading = true;
         listRescueCar(this.queryParams).then(response => {
-          this.rescueCarList = response.rows;
+          this.rescueCarList = response.data.records;
-          this.total = response.total;
+          this.total = response.data.total;
           this.loading = false;
         });
       },

src/views/rescue/customerIndex.vue

@@ -14,6 +14,7 @@
         <el-tree :data="Thetree"
                  :props="defaultProps"
                  node-key="id"
+                 ref="tree"
                  :default-expanded-keys="[200, 201]"
                  :default-checked-keys="[206]"
                  @node-click="handleNodeClick"></el-tree>
@@ -127,7 +128,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="客户公司" prop="customerDeptId">
 
-          <span style="font-weight: bold; font-size: 16px">{{ deptName ||xtitle}}</span>
+          <span style="font-weight: bold; font-size: 16px">{{ form.deptName ||xtitle}}</span>
         </el-form-item>
         <el-form-item label="客户名称" prop="customerName">
           <el-input v-model="form.customerName" placeholder="请输入客户名称" />
@@ -188,7 +189,7 @@ export default {
       filterText:'',
       defaultProps: {
         children: 'children',
-        label: 'label'
+        label: 'name'
       },
       // 遮罩层
       loading: true,
@@ -236,7 +237,6 @@ export default {
           { required: true, message: '不能为空', trigger: 'blur' },
         ],
       },
-
     };
   },
   created() {
@@ -244,31 +244,27 @@ export default {
   },
   watch: {
     filterText(val) {
-      this.$refs.tree.filter(val);
+      // TODO 待完成
     }
   },
   methods: {
     handleCheckChange(data, checked, indeterminate) {
-      console.log(data, checked, indeterminate);
+      // console.log(data, checked, indeterminate);
     },
     handleNodeClick(data) {
       this.xid  = data.id
-      // this.form.customerDeptId
+      this.xtitle = data.name
-      this.xtitle = data.label
-      console.log('x',data);
-      console.log(this.form.customerDeptId)
     },
     /** 查询救援的客户信息列表 */
     getList() {
       this.loading = true;
       listRescueCustomer(this.queryParams).then(response => {
-        this.rescueCustomerList = response.rows;
+        this.rescueCustomerList = response.data.records;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
       getdeptTree().then(res=>{
-        console.log(res)
+        this.Thetree = this.handleTree(res.data, 'id')
-        this.Thetree = res.data
       })
     },
     // 取消按钮