Merge branch 'master' of http://61.174.243.28:15863/chuangte/electripper-v2-ui

src/views/bst/fault/index.vue

@@ -1,46 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车辆编号" prop="vehicleCode">
-        <el-input
-          v-model="queryParams.vehicleCode"
-          placeholder="请输入车辆编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图片" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入图片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单编号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="故障部位" prop="faultSite">
         <el-input
           v-model="queryParams.faultSite"
-          placeholder="请输入故障部位"
+          placeholder="请选择故障部位"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="报修进度" prop="appealStatus">
+        <el-input
+          v-model="queryParams.appealStatus"
+          placeholder="请选择报修进度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -144,8 +121,8 @@
           <form-col :span="span"  label="用户" prop="userName">
             <el-input v-model="form.userName" placeholder="请输入用户" />
           </form-col>
-          <form-col :span="span"  label="车辆编号" prop="vehicleCode">
+          <form-col :span="span"  label="车辆编码" prop="vehicleCode">
-            <el-input v-model="form.vehicleCode" placeholder="请输入车辆编号" />
+            <el-input v-model="form.vehicleCode" placeholder="请输入车辆编码" />
           </form-col>
           <form-col :span="span"  label="图片" prop="picture">
             <el-input v-model="form.picture" placeholder="请输入图片" />
@@ -184,19 +161,20 @@ export default {
   name: "Fault",
   mixins: [$showColumns],
   components: {FormCol},
+  dicts: ['fault_site'],
   data() {
     return {
       span: 24,
       // 字段列表
       columns: [
-        {key: 'id', visible: true, label: '故障申诉id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        //{key: 'id', visible: true, label: '故障申诉id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'vehicleCode', visible: true, label: '车辆编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'vehicleCode', visible: true, label: '车辆编码', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'orderId', visible: true, label: '订单编号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'faultSite', visible: true, label: '故障部位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
         {key: 'faultDetail', visible: true, label: '故障详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
-        {key: 'appealStatus', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'appealStatus', visible: true, label: '申诉状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
       ],
       // 排序方式
       orderSorts: ['ascending', 'descending', null],
@@ -241,7 +219,7 @@ export default {
           { required: true, message: "用户不能为空", trigger: "blur" }
         ],
         vehicleCode: [
-          { required: true, message: "车辆编号不能为空", trigger: "blur" }
+          { required: true, message: "车辆编码不能为空", trigger: "blur" }
         ],
         picture: [
           { required: true, message: "图片不能为空", trigger: "blur" }
@@ -250,10 +228,10 @@ export default {
           { required: true, message: "故障部位不能为空", trigger: "blur" }
         ],
         appealStatus: [
-          { required: true, message: "状态不能为空", trigger: "change" }
+          { required: true, message: "申诉状态:0-已驳回 1-已提交 2-维修中不能为空", trigger: "change" }
         ],
         createTime: [
-          { required: true, message: "添加时间不能为空", trigger: "blur" }
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
         ]
       }
     };