Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/api/integrated/carInfo.ts

@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/carInfo/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/carInfo',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/carInfo/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/carInfo',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/carInfo',
+    method: 'put',
+    data: obj
+  })
+}
+

src/api/integrated/carPassRecord.ts

@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/carPassRecord/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/carPassRecord',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/carPassRecord/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/carPassRecord',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/carPassRecord',
+    method: 'put',
+    data: obj
+  })
+}
+

src/views/integrated/carInfo/form.vue

@@ -0,0 +1,177 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="车牌号" prop="carNumber">
+        <el-input v-model="form.carNumber" placeholder="请输入车牌号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="车主姓名" prop="ownerName">
+        <el-input v-model="form.ownerName" placeholder="请输入车主姓名"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="车主手机号码" prop="ownerPhone">
+        <el-input v-model="form.ownerPhone" placeholder="请输入车主手机号码"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审核状态" prop="checkStatus">
+        <el-input v-model="form.checkStatus" placeholder="请输入审核状态"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="是否是临时车" prop="isTemp">
+            <el-radio-group v-model="form.isTemp">
+             <el-radio :label="item.value" v-for="(item, index) in is_show" border :key="index">{{ item.label }}
+            </el-radio>
+            </el-radio-group>
+        </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="临时失效日期" prop="tempDate">
+            <el-date-picker type="datetime" placeholder="请选择临时失效日期" v-model="form.tempDate" :value-format="dateTimeStr"></el-date-picker>
+      </el-form-item>
+      </el-col>
+
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="流程id" prop="processInstanceId">
+        <el-input v-model="form.processInstanceId" placeholder="请输入流程id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审核原因" prop="checkReason">
+        <el-input v-model="form.checkReason" placeholder="请输入审核原因"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="用户id" prop="userId">
+        <el-input v-model="form.userId" placeholder="请输入用户id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="车辆状态" prop="carStatus">
+          <el-select v-model="form.carStatus" placeholder="请选择车辆状态">
+            <el-option :value="item.value" :label="item.label" v-for="(item, index) in car_status" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="CarInfoDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/carInfo'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { car_status,check_status,is_show } = useDict('car_status','check_status','is_show')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  carNumber: '',
+	  ownerName: '',
+	  ownerPhone: '',
+	  checkStatus: '',
+	  deptId: '',
+	  isTemp: '',
+	  tempDate: '',
+	  processInstanceId: '',
+	  checkReason: '',
+	  userId: '',
+	  carStatus: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        carNumber: [{required: true, message: '车牌号不能为空', trigger: 'blur'}],
+        ownerName: [{required: true, message: '车主姓名不能为空', trigger: 'blur'}],
+    ownerPhone: [{required: true, message: '车主手机号码不能为空', trigger: 'blur'}, { validator: rule.mobilePhone, trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取carInfo信息
+  if (id) {
+    form.id = id
+    getcarInfoData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getcarInfoData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/carInfo/index.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row v-show="showSearch">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+      <el-form-item label="车牌号" prop="carNumber" >
+        <el-input placeholder="请输入车牌号" v-model="state.queryForm.carNumber" />
+      </el-form-item>
+      <el-form-item label="车主姓名" prop="ownerName" >
+        <el-input placeholder="请输入车主姓名" v-model="state.queryForm.ownerName" />
+      </el-form-item>
+      <el-form-item label="车主手机号码" prop="ownerPhone" >
+        <el-input placeholder="请输入车主手机号码" v-model="state.queryForm.ownerPhone" />
+      </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              查询
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_carInfo_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_carInfo_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_carInfo_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="carNumber" label="车牌号"  show-overflow-tooltip/>
+          <el-table-column prop="ownerName" label="车主姓名"  show-overflow-tooltip/>
+          <el-table-column prop="ownerPhone" label="车主手机号码"  show-overflow-tooltip/>
+          <el-table-column prop="checkStatus" label="审核状态" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>
+          <el-table-column prop="isTemp" label="是否是临时车" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="is_show" :value="scope.row.isTemp"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="tempDate" label="临时失效日期"  show-overflow-tooltip/>
+          <el-table-column prop="processInstanceId" label="流程id"  show-overflow-tooltip/>
+          <el-table-column prop="checkReason" label="审核原因"  show-overflow-tooltip/>
+          <el-table-column prop="userId" label="用户id"  show-overflow-tooltip/>
+          <el-table-column prop="carStatus" label="车辆状态" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="car_status" :value="scope.row.carStatus"></dict-tag>
+            </template>
+          </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_carInfo_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_carInfo_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemCarInfo">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/carInfo";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { car_status,check_status,is_show } = useDict('car_status','check_status','is_show')
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/carInfo/export', Object.assign(state.queryForm, { ids: selectObjs }), 'carInfo.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/integrated/carPassRecord/form.vue

@@ -0,0 +1,140 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="车牌号" prop="carNumber">
+        <el-input v-model="form.carNumber" placeholder="请输入车牌号"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="通行时间" prop="passTime">
+        <el-input v-model="form.passTime" placeholder="请输入通行时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="通行地点" prop="location">
+        <el-input v-model="form.location" placeholder="请输入通行地点"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="到访单位" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入到访单位"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="进出方向" prop="direction">
+        <el-input v-model="form.direction" placeholder="请输入进出方向"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="现场图片" prop="picUrl">
+        <el-input v-model="form.picUrl" placeholder="请输入现场图片"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="道闸id" prop="gateId">
+        <el-input v-model="form.gateId" placeholder="请输入道闸id"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="CarPassRecordDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/carPassRecord'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { direction } = useDict('direction')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  carNumber: '',
+	  passTime: '',
+	  location: '',
+	  deptId: '',
+	  direction: '',
+	  picUrl: '',
+	  gateId: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取carPassRecord信息
+  if (id) {
+    form.id = id
+    getcarPassRecordData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getcarPassRecordData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/carPassRecord/index.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row v-show="showSearch">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+      <el-form-item label="车牌号" prop="carNumber" >
+        <el-input placeholder="请输入车牌号" v-model="state.queryForm.carNumber" />
+      </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              查询
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_carPassRecord_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_carPassRecord_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_carPassRecord_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="carNumber" label="车牌号"  show-overflow-tooltip/>
+          <el-table-column prop="passTime" label="通行时间"  show-overflow-tooltip/>
+          <el-table-column prop="location" label="通行地点"  show-overflow-tooltip/>
+          <el-table-column prop="deptId" label="到访单位"  show-overflow-tooltip/>
+          <el-table-column prop="direction" label="进出方向" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="direction" :value="scope.row.direction"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="picUrl" label="现场图片"  show-overflow-tooltip/>
+          <el-table-column prop="gateId" label="道闸id"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_carPassRecord_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_carPassRecord_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemCarPassRecord">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/carPassRecord";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { direction } = useDict('direction')
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/carPassRecord/export', Object.assign(state.queryForm, { ids: selectObjs }), 'carPassRecord.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>