1

src/utils/dict.js

@@ -248,6 +248,10 @@ export const DICT_TYPE = {
   DRIVE_TYPE: 'drive_type',
   //驾校课程类型
   DRIVE_COURSE_TYPE: 'course_type',
+  //驾校订单状态
+  DRIVE_SCHOOL_ORDER_STATUS: 'drive_school_order_status',
+  //驾校订单支付类型
+  DRIVE_SCHOOL_PAY_TYPE: 'drive_school_pay_type',
 
 }
 

src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue

@@ -15,58 +15,59 @@
         <el-form-item label="用户身份证号" prop="userNo">
           <el-input v-model="formData.userNo" placeholder="请输入用户身份证号"/>
         </el-form-item>
-                    <el-form-item label="用户性别" prop="userSex">
+        <el-form-item label="性别" prop="userSex">
-                      <el-radio-group v-model="formData.userSex">
+          <el-radio-group v-model="formData.sex">
-                            <el-radio label="1">请选择字典生成</el-radio>
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)"
+                      :key="dict.value" :label="dict.value">{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
-                    <el-form-item label="课程id" prop="courseId">
+
-                      <el-input v-model="formData.courseId" placeholder="请输入课程id" />
-                    </el-form-item>
         <el-form-item label="课程名字" prop="courseName">
           <el-input v-model="formData.courseName" placeholder="请输入课程名字"/>
         </el-form-item>
-                    <el-form-item label="主负责教练ID" prop="coachUserId">
+
-                      <el-input v-model="formData.coachUserId" placeholder="请输入主负责教练ID" />
+        <el-form-item label="负责教练" prop="coachUserName">
-                    </el-form-item>
-                    <el-form-item label="主负责教练姓名" prop="coachUserName">
           <el-input v-model="formData.coachUserName" placeholder="请输入主负责教练姓名"/>
         </el-form-item>
         <el-form-item label="订金金额" prop="reserveMoney">
           <el-input v-model="formData.reserveMoney" placeholder="请输入订金金额"/>
         </el-form-item>
-                    <el-form-item label="课程类型" prop="courseType">
+
-                      <el-select v-model="formData.courseType" placeholder="请选择课程类型">
+        <el-form-item label="是否终止" prop="ifEnd">
-                            <el-option label="请选择字典生成" value="" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="是否终止（0 未终止|1已终止）" prop="ifEnd">
           <el-radio-group v-model="formData.ifEnd">
-                            <el-radio label="1">请选择字典生成</el-radio>
+            <el-radio v-for="item in ifEndRadio"
+                      :key="item.value" :label="item.value">{{ item.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="终止原因" prop="endReason">
           <el-input v-model="formData.endReason" placeholder="请输入终止原因"/>
         </el-form-item>
         <el-form-item label="终止时间" prop="endTime">
-                      <el-date-picker clearable v-model="formData.endTime" type="date" value-format="timestamp" placeholder="选择终止时间" />
+          <el-date-picker clearable v-model="formData.endTime" type="date" value-format="timestamp"
+                          placeholder="选择终止时间"/>
         </el-form-item>
         <el-form-item label="订单状态" prop="paymentStatus">
           <el-select v-model="formData.paymentStatus" placeholder="请选择订单状态">
-                            <el-option label="请选择字典生成" value="" />
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DRIVE_SCHOOL_ORDER_STATUS)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"
+            />
           </el-select>
         </el-form-item>
-                    <el-form-item label="是否已面签 0：否 1： 是" prop="isSign">
+        <el-form-item label="是否已面签" prop="isSign">
-                      <el-select v-model="formData.isSign" placeholder="请选择是否已面签 0：否 1： 是">
+          <el-select v-model="formData.isSign" placeholder="请选择是否已面签">
             <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="尾款" prop="restMoney">
           <el-input v-model="formData.restMoney" placeholder="请输入尾款"/>
         </el-form-item>
-                    <el-form-item label="支付类型 1：定金 2：全款" prop="payType">
+        <el-form-item label="支付类型" prop="payType">
-                      <el-select v-model="formData.payType" placeholder="请选择支付类型 1：定金 2：全款">
+          <el-select v-model="formData.paymentStatus" placeholder="请选择支付类型">
-                            <el-option label="请选择字典生成" value="" />
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DRIVE_SCHOOL_PAY_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"
+            />
           </el-select>
         </el-form-item>
       </el-form>
@@ -80,10 +81,10 @@
 
 <script>
 import * as SchoolCourseOrderApi from '@/views/drivingSchool/DriveSchoolPay/api';
+
 export default {
   name: "SchoolCourseOrderForm",
-    components: {
+  components: {},
-                    },
   data() {
     return {
       // 弹出层标题
@@ -113,9 +114,18 @@ import * as SchoolCourseOrderApi from '@/views/drivingSchool/DriveSchoolPay/api'
         restMoney: undefined,
         payType: undefined,
       },
-        // 表单校验
+      ifEndRadio:[
-        formRules: {
+        {
+          label:'是',
+          value:'1'
         },
+        {
+          label:'否',
+          value:'0'
+        },
+      ],
+      // 表单校验
+      formRules: {},
     };
   },
   methods: {

src/views/drivingSchool/DriveSchoolPay/index.vue

@@ -8,17 +8,10 @@
       <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="courseName">
+      <el-form-item label="负责教练" prop="coachUserName">
-        <el-input v-model="queryParams.courseName" placeholder="请输入课程名字" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="主负责教练姓名" prop="coachUserName">
         <el-input v-model="queryParams.coachUserName" placeholder="请输入主负责教练姓名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="是否已面签" prop="isSign">
+
-        <el-select v-model="queryParams.isSign" placeholder="请选择是否已面签" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -40,20 +33,31 @@
       <el-table-column label="订单号" align="center" prop="orderNo" />
       <el-table-column label="用户姓名" align="center" prop="userName" />
       <el-table-column label="用户手机号" align="center" prop="userPhone" />
-      <el-table-column label="用户身份证号" align="center" prop="userNo" />
+      <el-table-column label="用户性别" align="center" prop="userSex">
-      <el-table-column label="用户性别" align="center" prop="userSex" />
-      <el-table-column label="课程名字" align="center" prop="courseName" />
-      <el-table-column label="主负责教练姓名" align="center" prop="coachUserName" />
-      <el-table-column label="订金金额" align="center" prop="reserveMoney" />
-      <el-table-column label="课程类型" align="center" prop="courseType" />
-      <el-table-column label="是否终止" align="center" prop="ifEnd" />
-      <el-table-column label="终止原因" align="center" prop="endReason" />
-      <el-table-column label="终止时间" align="center" prop="endTime" width="180">
         <template v-slot="scope">
-          <span>{{ parseTime(scope.row.endTime) }}</span>
+          <dict-tag :type="DICT_TYPE.DICT_SYS_USER_SEX" :value="scope.row.userSex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="课程" align="center" prop="courseName" />
+      <el-table-column label="负责教练" align="center" prop="coachUserName" />
+      <el-table-column label="订金金额" align="center" prop="reserveMoney" />
+      <el-table-column label="课程类型" align="center" prop="courseType" />
+      <el-table-column label="是否终止" align="center" prop="ifEnd">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.ifEnd == 1" type="success">是</el-tag>
+          <el-tag v-if="scope.row.ifEnd == 0" type="danger">否</el-tag>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="终止时间" align="center" prop="endTime" width="180">-->
+<!--        <template v-slot="scope">-->
+<!--          <span>{{ parseTime(scope.row.endTime) }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="订单状态" align="center" prop="paymentStatus">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DRIVE_SCHOOL_ORDER_STATUS" :value="scope.row.paymentStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="订单状态" align="center" prop="paymentStatus" />
       <el-table-column label="是否已面签" align="center" prop="isSign">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.isSign == 1" type="success">是</el-tag>
@@ -61,7 +65,11 @@
         </template>
       </el-table-column>
       <el-table-column label="尾款" align="center" prop="restMoney" />
-      <el-table-column label="支付类型" align="center" prop="payType" />
+      <el-table-column label="支付类型" align="center" prop="payType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DRIVE_SCHOOL_PAY_TYPE" :value="scope.row.payType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改</el-button>