소스 검색

修改后台页面

mojinxia 1 개월 전
부모
커밋
91821f2e02

+ 29 - 29
back-ui/src/views/dz/agent/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="代理商名称" prop="name">
+<!--      <el-form-item label="用户ID" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入用户ID"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入代理商名称"
@@ -25,22 +25,22 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="上级代理商ID" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入上级代理商ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="负责校区列表" prop="schools">
-        <el-input
-          v-model="queryParams.schools"
-          placeholder="请输入负责校区列表"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="上级代理商ID" prop="parentId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.parentId"-->
+<!--          placeholder="请输入上级代理商ID"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="负责校区列表" prop="schools">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.schools"-->
+<!--          placeholder="请输入负责校区列表"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -76,10 +76,10 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="用户ID" prop="userId" />
-      <el-table-column label="代理商名称" align="center" prop="name" />
+<!--      <el-table-column label="用户ID" prop="userId" />-->
+      <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="联系电话" align="center" prop="phonenumber" />
-      <el-table-column label="上级代理商ID" align="center" prop="parentId" />
+<!--      <el-table-column label="上级代理商ID" align="center" prop="parentId" />-->
       <el-table-column label="负责校区列表" align="center" prop="schools" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -177,7 +177,7 @@ function getTreeselect() {
     agentOptions.value.push(data)
   })
 }
-	
+
 // 取消按钮
 function cancel() {
   open.value = false

+ 7 - 7
back-ui/src/views/dz/cards/index.vue

@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="0电子卡" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择0电子卡" clearable>
+        <el-select v-model="queryParams.type" placeholder="请选择0电子卡" clearable style="width: 170px">
           <el-option
             v-for="dict in card_status"
             :key="dict.value"
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="0未开卡,1已开卡,2已激活," prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择0未开卡,1已开卡,2已激活," clearable>
+        <el-select v-model="queryParams.status" placeholder="请选择0未开卡,1已开卡,2已激活," clearable style="width: 170px">
           <el-option
             v-for="dict in card_status"
             :key="dict.value"
@@ -38,7 +38,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="0未分配,1已分配" prop="distributeStatus">
-        <el-select v-model="queryParams.distributeStatus" placeholder="请选择0未分配,1已分配" clearable>
+        <el-select v-model="queryParams.distributeStatus" placeholder="请选择0未分配,1已分配" clearable style="width: 170px">
           <el-option
             v-for="dict in card_status"
             :key="dict.value"
@@ -48,7 +48,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="9已过期,10已关卡,11已失效" prop="timeStatus">
-        <el-select v-model="queryParams.timeStatus" placeholder="请选择9已过期,10已关卡,11已失效" clearable>
+        <el-select v-model="queryParams.timeStatus" placeholder="请选择9已过期,10已关卡,11已失效" clearable style="width: 170px">
           <el-option
             v-for="dict in card_status"
             :key="dict.value"
@@ -58,7 +58,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="0=未缴费,1=已缴费,2=已退费" prop="payStatus">
-        <el-select v-model="queryParams.payStatus" placeholder="请选择0=未缴费,1=已缴费,2=已退费" clearable>
+        <el-select v-model="queryParams.payStatus" placeholder="请选择0=未缴费,1=已缴费,2=已退费" clearable style="width: 170px">
           <el-option
             v-for="dict in card_status"
             :key="dict.value"
@@ -68,7 +68,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="是否结算(0:否,1:是)" prop="isSettlement">
-        <el-select v-model="queryParams.isSettlement" placeholder="请选择是否结算(0:否,1:是)" clearable>
+        <el-select v-model="queryParams.isSettlement" placeholder="请选择是否结算(0:否,1:是)" clearable style="width: 170px">
           <el-option
             v-for="dict in sys_yes_no"
             :key="dict.value"
@@ -354,7 +354,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

+ 2 - 2
back-ui/src/views/dz/classes/index.vue

@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="是否线上" prop="online">
-        <el-select v-model="queryParams.online" placeholder="请选择是否线上" clearable>
+        <el-select v-model="queryParams.online" placeholder="请选择是否线上" clearable style="width: 170px">
           <el-option
             v-for="dict in sys_yes_no"
             :key="dict.value"
@@ -92,7 +92,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

+ 245 - 200
back-ui/src/views/dz/control/index.vue

@@ -3,59 +3,63 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="省份" prop="location">
         <el-input
-          v-model="queryParams.location"
-          placeholder="请输入省份"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.location"
+                placeholder="请输入省份"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="开始时间" prop="startDate">
-        <el-input
-          v-model="queryParams.startDate"
-          placeholder="请输入开始时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-date-picker clearable
+                        v-model="queryParams.startDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择开始时间">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="结束时间" prop="endDate">
-        <el-input
-          v-model="queryParams.endDate"
-          placeholder="请输入结束时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-date-picker clearable
+                        v-model="queryParams.endDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择结束时间">
+        </el-date-picker>
       </el-form-item>
-      <el-form-item label="是否生效(0:否,1:是)" prop="isValid">
-        <el-input
-          v-model="queryParams.isValid"
-          placeholder="请输入是否生效(0:否,1:是)"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+      <el-form-item label="是否生效" prop="isValid">
+        <el-select v-model="queryParams.isValid" placeholder="请选择是否生效" clearable  style="width: 220px">
+          <el-option
+                  v-for="dict in bool_values"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="计划年度" prop="planYear">
         <el-input
-          v-model="queryParams.planYear"
-          placeholder="请输入计划年度"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.planYear"
+                placeholder="请输入计划年度"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="录取年度" prop="submitYear">
         <el-input
-          v-model="queryParams.submitYear"
-          placeholder="请输入录取年度"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.submitYear"
+                placeholder="请输入录取年度"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="开启考生" prop="examTypes">
-        <el-input
-          v-model="queryParams.examTypes"
-          placeholder="请输入开启考生"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.examTypes" placeholder="请选择开启考生" clearable  style="width: 220px">
+          <el-option
+                  v-for="dict in exam_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -66,40 +70,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['dz:control:add']"
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                v-hasPermi="['dz:control:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dz:control:edit']"
+                type="success"
+                plain
+                icon="Edit"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['dz:control:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dz:control:remove']"
+                type="danger"
+                plain
+                icon="Delete"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['dz:control:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['dz:control:export']"
+                type="warning"
+                plain
+                icon="Download"
+                @click="handleExport"
+                v-hasPermi="['dz:control:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -109,12 +113,28 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="省份" align="center" prop="location" />
-      <el-table-column label="开始时间" align="center" prop="startDate" />
-      <el-table-column label="结束时间" align="center" prop="endDate" />
-      <el-table-column label="是否生效(0:否,1:是)" align="center" prop="isValid" />
+      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否生效(0:否,1:是)" align="center" prop="isValid">
+        <template #default="scope">
+          <dict-tag :options="bool_values" :value="scope.row.isValid"/>
+        </template>
+      </el-table-column>
       <el-table-column label="计划年度" align="center" prop="planYear" />
       <el-table-column label="录取年度" align="center" prop="submitYear" />
-      <el-table-column label="开启考生" align="center" prop="examTypes" />
+      <el-table-column label="开启考生" align="center" prop="examTypes">
+        <template #default="scope">
+          <dict-tag :options="exam_type" :value="scope.row.examTypes"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dz:control:edit']">修改</el-button>
@@ -122,13 +142,13 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+            v-show="total>0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
     />
 
     <!-- 添加或修改单招省份状态对话框 -->
@@ -138,13 +158,30 @@
           <el-input v-model="form.location" placeholder="请输入省份" />
         </el-form-item>
         <el-form-item label="开始时间" prop="startDate">
-          <el-input v-model="form.startDate" placeholder="请输入开始时间" />
+          <el-date-picker clearable
+                          v-model="form.startDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择开始时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间" prop="endDate">
-          <el-input v-model="form.endDate" placeholder="请输入结束时间" />
+          <el-date-picker clearable
+                          v-model="form.endDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择结束时间">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="是否生效(0:否,1:是)" prop="isValid">
-          <el-input v-model="form.isValid" placeholder="请输入是否生效(0:否,1:是)" />
+        <el-form-item label="是否生效" prop="isValid">
+          <el-select v-model="form.isValid" placeholder="请选择是否生效">
+            <el-option
+                    v-for="dict in bool_values"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="计划年度" prop="planYear">
           <el-input v-model="form.planYear" placeholder="请输入计划年度" />
@@ -153,7 +190,14 @@
           <el-input v-model="form.submitYear" placeholder="请输入录取年度" />
         </el-form-item>
         <el-form-item label="开启考生" prop="examTypes">
-          <el-input v-model="form.examTypes" placeholder="请输入开启考生" />
+          <el-select v-model="form.examTypes" placeholder="请选择开启考生" multiple>
+            <el-option
+                    v-for="dict in exam_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -167,148 +211,149 @@
 </template>
 
 <script setup name="Control">
-import { listControl, getControl, delControl, addControl, updateControl } from "@/api/dz/control"
+  import { listControl, getControl, delControl, addControl, updateControl } from "@/api/dz/control"
 
-const { proxy } = getCurrentInstance()
+  const { proxy } = getCurrentInstance()
+  const { exam_type, bool_values } = proxy.useDict('exam_type', 'bool_values')
 
-const controlList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    location: null,
-    startDate: null,
-    endDate: null,
-    isValid: null,
-    planYear: null,
-    submitYear: null,
-    examTypes: null
-  },
-  rules: {
-    isValid: [
-      { required: true, message: "是否生效(0:否,1:是)不能为空", trigger: "blur" }
-    ],
-  }
-})
+  const controlList = ref([])
+  const open = ref(false)
+  const loading = ref(true)
+  const showSearch = ref(true)
+  const ids = ref([])
+  const single = ref(true)
+  const multiple = ref(true)
+  const total = ref(0)
+  const title = ref("")
 
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询单招省份状态列表 */
-function getList() {
-  loading.value = true
-  listControl(queryParams.value).then(response => {
-    controlList.value = response.rows
-    total.value = response.total
-    loading.value = false
+  const data = reactive({
+    form: {},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      location: null,
+      startDate: null,
+      endDate: null,
+      isValid: null,
+      planYear: null,
+      submitYear: null,
+      examTypes: null
+    },
+    rules: {
+      isValid: [
+        { required: true, message: "是否生效(0:否,1:是)不能为空", trigger: "change" }
+      ],
+    }
   })
-}
 
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
+  const { queryParams, form, rules } = toRefs(data)
 
-// 表单重置
-function reset() {
-  form.value = {
-    id: null,
-    location: null,
-    startDate: null,
-    endDate: null,
-    isValid: null,
-    planYear: null,
-    submitYear: null,
-    examTypes: null
+  /** 查询单招省份状态列表 */
+  function getList() {
+    loading.value = true
+    listControl(queryParams.value).then(response => {
+      controlList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
   }
-  proxy.resetForm("controlRef")
-}
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
 
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
+  // 表单重置
+  function reset() {
+    form.value = {
+      id: null,
+      location: null,
+      startDate: null,
+      endDate: null,
+      isValid: null,
+      planYear: null,
+      submitYear: null,
+      examTypes: null
+    }
+    proxy.resetForm("controlRef")
+  }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
-}
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加单招省份状态"
-}
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
+
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.id)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getControl(_id).then(response => {
-    form.value = response.data
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
     open.value = true
-    title.value = "修改单招省份状态"
-  })
-}
+    title.value = "添加单招省份状态"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _id = row.id || ids.value
+    getControl(_id).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改单招省份状态"
+    })
+  }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["controlRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateControl(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addControl(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["controlRef"].validate(valid => {
+      if (valid) {
+        if (form.value.id != null) {
+          updateControl(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addControl(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
       }
-    }
-  })
-}
+    })
+  }
 
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除单招省份状态编号为"' + _ids + '"的数据项?').then(function() {
-    return delControl(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _ids = row.id || ids.value
+    proxy.$modal.confirm('是否确认删除单招省份状态编号为"' + _ids + '"的数据项?').then(function() {
+      return delControl(_ids)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => {})
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('dz/control/export', {
-    ...queryParams.value
-  }, `control_${new Date().getTime()}.xlsx`)
-}
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('dz/control/export', {
+      ...queryParams.value
+    }, `control_${new Date().getTime()}.xlsx`)
+  }
 
-getList()
+  getList()
 </script>

+ 208 - 183
back-ui/src/views/dz/school/index.vue

@@ -3,52 +3,62 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名称" prop="name">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.name"
+                placeholder="请输入名称"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="机构ID" prop="deptId">
         <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入机构ID"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.deptId"
+                placeholder="请输入机构ID"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="地域" prop="location">
         <el-input
-          v-model="queryParams.location"
-          placeholder="请输入地域"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.location"
+                placeholder="请输入地域"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="省" prop="pro">
         <el-input
-          v-model="queryParams.pro"
-          placeholder="请输入省"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.pro"
+                placeholder="请输入省"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="市" prop="city">
         <el-input
-          v-model="queryParams.city"
-          placeholder="请输入市"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.city"
+                placeholder="请输入市"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="区" prop="area">
         <el-input
-          v-model="queryParams.area"
-          placeholder="请输入区"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.area"
+                placeholder="请输入区"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 170px">
+          <el-option
+                  v-for="dict in bool_values"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -58,40 +68,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['dz:school:add']"
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                v-hasPermi="['dz:school:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dz:school:edit']"
+                type="success"
+                plain
+                icon="Edit"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['dz:school:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dz:school:remove']"
+                type="danger"
+                plain
+                icon="Delete"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['dz:school:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['dz:school:export']"
+                type="warning"
+                plain
+                icon="Download"
+                @click="handleExport"
+                v-hasPermi="['dz:school:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,7 +109,7 @@
 
     <el-table v-loading="loading" :data="schoolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="机构ID" align="center" prop="deptId" />
       <el-table-column label="地域" align="center" prop="location" />
@@ -107,7 +117,11 @@
       <el-table-column label="省" align="center" prop="pro" />
       <el-table-column label="市" align="center" prop="city" />
       <el-table-column label="区" align="center" prop="area" />
-      <el-table-column label="状态(0:无效,1:有效)" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :options="bool_values" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dz:school:edit']">修改</el-button>
@@ -115,13 +129,13 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+            v-show="total>0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
     />
 
     <!-- 添加或修改机构校区对话框 -->
@@ -148,6 +162,16 @@
         <el-form-item label="区" prop="area">
           <el-input v-model="form.area" placeholder="请输入区" />
         </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择状态">
+            <el-option
+                    v-for="dict in bool_values"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -160,151 +184,152 @@
 </template>
 
 <script setup name="School">
-import { listSchool, getSchool, delSchool, addSchool, updateSchool } from "@/api/dz/school"
+  import { listSchool, getSchool, delSchool, addSchool, updateSchool } from "@/api/dz/school"
 
-const { proxy } = getCurrentInstance()
+  const { proxy } = getCurrentInstance()
+  const { bool_values } = proxy.useDict('bool_values')
 
-const schoolList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    name: null,
-    deptId: null,
-    location: null,
-    pro: null,
-    city: null,
-    area: null,
-    status: null,
-  },
-  rules: {
-    status: [
-      { required: true, message: "状态(0:无效,1:有效)不能为空", trigger: "change" }
-    ],
-  }
-})
+  const schoolList = ref([])
+  const open = ref(false)
+  const loading = ref(true)
+  const showSearch = ref(true)
+  const ids = ref([])
+  const single = ref(true)
+  const multiple = ref(true)
+  const total = ref(0)
+  const title = ref("")
 
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询机构校区列表 */
-function getList() {
-  loading.value = true
-  listSchool(queryParams.value).then(response => {
-    schoolList.value = response.rows
-    total.value = response.total
-    loading.value = false
+  const data = reactive({
+    form: {},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      name: null,
+      deptId: null,
+      location: null,
+      pro: null,
+      city: null,
+      area: null,
+      status: null,
+    },
+    rules: {
+      status: [
+        { required: true, message: "状态(0:无效,1:有效)不能为空", trigger: "change" }
+      ],
+    }
   })
-}
 
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
+  const { queryParams, form, rules } = toRefs(data)
 
-// 表单重置
-function reset() {
-  form.value = {
-    id: null,
-    name: null,
-    deptId: null,
-    location: null,
-    remark: null,
-    pro: null,
-    city: null,
-    area: null,
-    status: null,
-    createTime: null,
-    updateTime: null
+  /** 查询机构校区列表 */
+  function getList() {
+    loading.value = true
+    listSchool(queryParams.value).then(response => {
+      schoolList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
   }
-  proxy.resetForm("schoolRef")
-}
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
+
+  // 表单重置
+  function reset() {
+    form.value = {
+      id: null,
+      name: null,
+      deptId: null,
+      location: null,
+      remark: null,
+      pro: null,
+      city: null,
+      area: null,
+      status: null,
+      createTime: null,
+      updateTime: null
+    }
+    proxy.resetForm("schoolRef")
+  }
 
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
-}
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加机构校区"
-}
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.id)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getSchool(_id).then(response => {
-    form.value = response.data
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
     open.value = true
-    title.value = "修改机构校区"
-  })
-}
+    title.value = "添加机构校区"
+  }
+
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _id = row.id || ids.value
+    getSchool(_id).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改机构校区"
+    })
+  }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["schoolRef"].validate(valid => {
-    if (valid) {
-      if (form.value.id != null) {
-        updateSchool(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addSchool(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["schoolRef"].validate(valid => {
+      if (valid) {
+        if (form.value.id != null) {
+          updateSchool(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addSchool(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
       }
-    }
-  })
-}
+    })
+  }
 
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除机构校区编号为"' + _ids + '"的数据项?').then(function() {
-    return delSchool(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _ids = row.id || ids.value
+    proxy.$modal.confirm('是否确认删除机构校区编号为"' + _ids + '"的数据项?').then(function() {
+      return delSchool(_ids)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => {})
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('dz/school/export', {
-    ...queryParams.value
-  }, `school_${new Date().getTime()}.xlsx`)
-}
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('dz/school/export', {
+      ...queryParams.value
+    }, `school_${new Date().getTime()}.xlsx`)
+  }
 
-getList()
+  getList()
 </script>

+ 28 - 12
ie-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java

@@ -10,7 +10,7 @@ import com.ruoyi.generator.domain.GenTableColumn;
 
 /**
  * 代码生成器 工具类
- * 
+ *
  * @author ruoyi
  */
 public class GenUtils
@@ -132,7 +132,7 @@ public class GenUtils
 
     /**
      * 校验数组是否包含指定值
-     * 
+     *
      * @param arr 数组
      * @param targetValue 值
      * @return 是否包含
@@ -144,7 +144,7 @@ public class GenUtils
 
     /**
      * 获取模块名
-     * 
+     *
      * @param packageName 包名
      * @return 模块名
      */
@@ -157,20 +157,36 @@ public class GenUtils
 
     /**
      * 获取业务名
-     * 
+     *
      * @param tableName 表名
      * @return 业务名
      */
     public static String getBusinessName(String tableName)
     {
-        int lastIndex = tableName.lastIndexOf("_");
-        int nameLength = tableName.length();
-        return StringUtils.substring(tableName, lastIndex + 1, nameLength);
+//        int lastIndex = tableName.lastIndexOf("_");
+//        int nameLength = tableName.length();
+//        return StringUtils.substring(tableName, lastIndex + 1, nameLength);
+
+        String businessName=convertClassName(tableName);
+        businessName= lowerFirst(businessName);
+
+        return businessName;
+    }
+
+    /**
+     * 首字母小写
+     * @param oldStr
+     * @return
+     */
+    public static String lowerFirst(String oldStr){
+        char[]chars = oldStr.toCharArray();
+        chars[0] += 32;
+        return String.valueOf(chars);
     }
 
     /**
      * 表名转换成Java类名
-     * 
+     *
      * @param tableName 表名称
      * @return 类名
      */
@@ -188,7 +204,7 @@ public class GenUtils
 
     /**
      * 批量替换前缀
-     * 
+     *
      * @param replacementm 替换值
      * @param searchList 替换列表
      * @return
@@ -209,7 +225,7 @@ public class GenUtils
 
     /**
      * 关键字替换
-     * 
+     *
      * @param text 需要被替换的名字
      * @return 替换后的名字
      */
@@ -220,7 +236,7 @@ public class GenUtils
 
     /**
      * 获取数据库类型字段
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
@@ -238,7 +254,7 @@ public class GenUtils
 
     /**
      * 获取字段长度
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */

+ 6 - 6
ie-system/src/main/resources/mapper/dz/DzAgentMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.dz.mapper.DzAgentMapper">
-    
+
     <resultMap type="DzAgent" id="DzAgentResult">
         <result property="agentId"    column="agentId"    />
         <result property="deptId"    column="deptId"    />
@@ -21,16 +21,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDzAgentList" parameterType="DzAgent" resultMap="DzAgentResult">
         <include refid="selectDzAgentVo"/>
-        <where>  
+        <where>
             <if test="userId != null "> and userId = #{userId}</if>
             <if test="deptId != null "> and deptId = #{deptId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="phonenumber != null  and phonenumber != ''"> and phonenumber = #{phonenumber}</if>
+            <if test="phonenumber != null  and phonenumber != ''"> and phonenumber  like concat('%', #{phonenumber}, '%')</if>
             <if test="parentId != null "> and parentId = #{parentId}</if>
             <if test="schools != null  and schools != ''"> and schools = #{schools}</if>
         </where>
     </select>
-    
+
     <select id="selectDzAgentByAgentId" parameterType="Long" resultMap="DzAgentResult">
         <include refid="selectDzAgentVo"/>
         where agentId = #{agentId}
@@ -77,9 +77,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDzAgentByAgentIds" parameterType="String">
-        delete from dz_agent where agentId in 
+        delete from dz_agent where agentId in
         <foreach item="agentId" collection="array" open="(" separator="," close=")">
             #{agentId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

+ 6 - 6
ie-system/src/main/resources/mapper/dz/DzControlMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.dz.mapper.DzControlMapper">
-    
+
     <resultMap type="DzControl" id="DzControlResult">
         <result property="id"    column="id"    />
         <result property="location"    column="location"    />
@@ -21,17 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDzControlList" parameterType="DzControl" resultMap="DzControlResult">
         <include refid="selectDzControlVo"/>
-        <where>  
+        <where>
             <if test="location != null  and location != ''"> and location = #{location}</if>
             <if test="startDate != null  and startDate != ''"> and start_date = #{startDate}</if>
             <if test="endDate != null  and endDate != ''"> and end_date = #{endDate}</if>
             <if test="isValid != null "> and is_valid = #{isValid}</if>
             <if test="planYear != null  and planYear != ''"> and plan_year = #{planYear}</if>
             <if test="submitYear != null  and submitYear != ''"> and submit_year = #{submitYear}</if>
-            <if test="examTypes != null  and examTypes != ''"> and exam_types = #{examTypes}</if>
+            <if test="examTypes != null  and examTypes != ''"> and exam_types like concat ('%',#{examTypes},'%') </if>
         </where>
     </select>
-    
+
     <select id="selectDzControlById" parameterType="Long" resultMap="DzControlResult">
         <include refid="selectDzControlVo"/>
         where id = #{id}
@@ -78,9 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDzControlByIds" parameterType="String">
-        delete from dz_control where id in 
+        delete from dz_control where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>