!355 修复一些 issues 提到的问题

Merge pull request !355 from puhui999/dev-crm

!355 修复一些 issues 提到的问题
Merge pull request !355 from puhui999/dev-crm
0338caee · 芋道源码 · Gitee · 1eefa02c · d766b36e · 0338caee
Commit 0338caee authored Dec 30, 2023 by 芋道源码 Committed by Gitee Dec 30, 2023
Show whitespace changes
Inline Side-by-side

Showing with 94 additions and 83 deletions

src/components/UploadFile/src/UploadFile.vue
+36 -39

src/views/bpm/oa/leave/create.vue
+11 -12

src/views/bpm/oa/leave/index.vue
+47 -32

No files found.
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -2,25 +2,27 @@
  <div class="upload-file">
    <el-upload
      ref="uploadRef"
-      :multiple="props.limit > 1"
-      name="file"
-      v-model="valueRef"
      v-model:file-list="fileList"
-      :show-file-list="true"
-      :auto-upload="autoUpload"
      :action="updateUrl"
+      :auto-upload="autoUpload"
+      :before-upload="beforeUpload"
+      :drag="drag"
      :headers="uploadHeaders"
      :limit="props.limit"
-      :drag="drag"
+      :multiple="props.limit > 1"
-      :before-upload="beforeUpload"
-      :on-exceed="handleExceed"
-      :on-success="handleFileSuccess"
      :on-error="excelUploadError"
-      :on-remove="handleRemove"
+      :on-exceed="handleExceed"
      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleFileSuccess"
+      :show-file-list="true"
      class="upload-file-uploader"
+      name="file"
    >
-      <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
+      <el-button type="primary">
+        <Icon icon="ep:upload-filled" />
+        选取文件
+      </el-button>
      <template v-if="isShowTip" #tip>
        <div style="font-size: 8px">
          大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
@@ -35,8 +37,8 @@
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
-import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
-import { isArray, isString } from '@/utils/is'
+import { isString } from '@/utils/is'
 defineOptions({ name: 'UploadFile' })
@@ -54,8 +56,8 @@ const props = defineProps({
  drag: propTypes.bool.def(false), // 拖拽上传
  isShowTip: propTypes.bool.def(true) // 是否显示提示
 })
 // ========== 上传相关 ==========
-const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
 const fileList = ref<UploadUserFile[]>([])
@@ -64,6 +66,7 @@ const uploadHeaders = ref({
  Authorization: 'Bearer ' + getAccessToken(),
  'tenant-id': getTenantId()
 })
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
  if (fileList.value.length >= props.limit) {
@@ -97,12 +100,10 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
  message.success('上传成功')
-  const fileListNew = fileList.value
+  fileList.value.shift()
-  fileListNew.pop()
-  fileList.value = fileListNew
  uploadList.value.push({ name: res.data, url: res.data })
  if (uploadList.value.length == uploadNumber.value) {
-    fileList.value = fileList.value.concat(uploadList.value)
+    fileList.value.push(...uploadList.value)
    uploadList.value = []
    uploadNumber.value = 0
    emitUpdateModelValue()
@@ -131,29 +132,25 @@ const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
 // 监听模型绑定值变动
 watch(
  () => props.modelValue,
-  () => {
+  (val: string | string[]) => {
-    const files: string[] = []
+    if (!val) {
-    // 情况1：字符串
+      fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
-    if (isString(props.modelValue)) {
+      return
-      // 情况1.1：逗号分隔的多值
-      if (props.modelValue.includes(',')) {
-        files.concat(props.modelValue.split(','))
-      } else if (props.modelValue.length > 0) {
-        files.push(props.modelValue)
    }
-    } else if (isArray(props.modelValue)) {
-      // 情况2：字符串
+    fileList.value = [] // 保障数据为空
-      files.concat(props.modelValue)
+    // 情况1：字符串
-    } else if (props.modelValue == null) {
+    if (isString(val)) {
-      // 情况3：undefined 不处理
+      fileList.value.push(
-    } else {
+        ...val.split(',').map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
-      throw new Error('不支持的 modelValue 类型')
+      )
    }
-    fileList.value = files.map((url: string) => {
+    // 情况2：数组
-      return { url, name: url.substring(url.lastIndexOf('/') + 1) } as UploadUserFile
+    fileList.value.push(
-    })
+      ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
+    )
  },
-  { immediate: true }
+  { immediate: true, deep: true }
 )
 // 发送文件链接列表更新
 const emitUpdateModelValue = () => {
@@ -166,7 +163,7 @@ const emitUpdateModelValue = () => {
  emit('update:modelValue', result)
 }
 </script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .upload-file-uploader {
  margin-bottom: 5px;
 }

--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
 <template>
  <el-form
    ref="formRef"
+    v-loading="formLoading"
    :model="formData"
    :rules="formRules"
    label-width="80px"
-    v-loading="formLoading"
  >
    <el-form-item label="请假类型" prop="type">
-      <el-select v-model="formData.type" placeholder="请选择请假类型" clearable>
+      <el-select v-model="formData.type" clearable placeholder="请选择请假类型">
        <el-option
          v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
          :key="dict.value"
@@ -18,27 +18,27 @@
    </el-form-item>
    <el-form-item label="开始时间" prop="startTime">
      <el-date-picker
-        clearable
        v-model="formData.startTime"
+        clearable
+        placeholder="请选择开始时间"
        type="datetime"
        value-format="x"
-        placeholder="请选择开始时间"
      />
    </el-form-item>
    <el-form-item label="结束时间" prop="endTime">
      <el-date-picker
-        clearable
        v-model="formData.endTime"
+        clearable
+        placeholder="请选择结束时间"
        type="datetime"
        value-format="x"
-        placeholder="请选择结束时间"
      />
    </el-form-item>
    <el-form-item label="原因" prop="reason">
-      <el-input v-model="formData.reason" type="textarea" placeholder="请输请假原因" />
+      <el-input v-model="formData.reason" placeholder="请输请假原因" type="textarea" />
    </el-form-item>
    <el-form-item>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
    </el-form-item>
  </el-form>
 </template>
@@ -50,9 +50,6 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
 defineOptions({ name: 'BpmOALeaveCreate' })
 const message = useMessage() // 消息弹窗
-const { delView } = useTagsViewStore() // 视图操作
-const { currentRoute } = useRouter() // 路由
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formData = ref({
  type: undefined,
@@ -67,7 +64,8 @@ const formRules = reactive({
  endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
+const { delView } = useTagsViewStore() // 视图操作
+const { push, currentRoute } = useRouter() // 路由
 /** 提交表单 */
 const submitForm = async () => {
  // 校验表单
@@ -82,6 +80,7 @@ const submitForm = async () => {
    message.success('发起成功')
    // 关闭当前 Tab
    delView(unref(currentRoute))
+    await push({ name: 'BpmOALeave' })
  } finally {
    formLoading.value = false
  }

--- a/src/views/bpm/oa/leave/index.vue
+++ b/src/views/bpm/oa/leave/index.vue
@@ -2,18 +2,18 @@
  <ContentWrap>
    <!-- 搜索工作栏 -->
    <el-form
-      class="-mb-15px"
-      :model="queryParams"
      ref="queryFormRef"
      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
      label-width="68px"
    >
      <el-form-item label="请假类型" prop="type">
        <el-select
          v-model="queryParams.type"
-          placeholder="请选择请假类型"
-          clearable
          class="!w-240px"
+          clearable
+          placeholder="请选择请假类型"
        >
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
@@ -26,16 +26,16 @@
      <el-form-item label="申请时间" prop="createTime">
        <el-date-picker
          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
        />
      </el-form-item>
      <el-form-item label="结果" prop="result">
-        <el-select v-model="queryParams.result" placeholder="请选择结果" clearable class="!w-240px">
+        <el-select v-model="queryParams.result" class="!w-240px" clearable placeholder="请选择结果">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
            :key="dict.value"
@@ -47,17 +47,24 @@
      <el-form-item label="原因" prop="reason">
        <el-input
          v-model="queryParams.reason"
-          placeholder="请输入原因"
+          class="!w-240px"
          clearable
+          placeholder="请输入原因"
          @keyup.enter="handleQuery"
-          class="!w-240px"
        />
      </el-form-item>
      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <Icon class="mr-5px" icon="ep:search" />
-        <el-button type="primary" plain @click="handleCreate()">
+          搜索
-          <Icon icon="ep:plus" class="mr-5px" /> 发起请假
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button plain type="primary" @click="handleCreate()">
+          <Icon class="mr-5px" icon="ep:plus" />
+          发起请假
        </el-button>
      </el-form-item>
    </el-form>
@@ -66,63 +73,63 @@
  <!-- 列表 -->
  <ContentWrap>
    <el-table v-loading="loading" :data="list">
-      <el-table-column label="申请编号" align="center" prop="id" />
+      <el-table-column align="center" label="申请编号" prop="id" />
-      <el-table-column label="状态" align="center" prop="result">
+      <el-table-column align="center" label="状态" prop="result">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
        </template>
      </el-table-column>
      <el-table-column
-        label="开始时间"
+        :formatter="dateFormatter"
        align="center"
+        label="开始时间"
        prop="startTime"
        width="180"
-        :formatter="dateFormatter"
      />
      <el-table-column
-        label="结束时间"
+        :formatter="dateFormatter"
        align="center"
+        label="结束时间"
        prop="endTime"
        width="180"
-        :formatter="dateFormatter"
      />
-      <el-table-column label="请假类型" align="center" prop="type">
+      <el-table-column align="center" label="请假类型" prop="type">
        <template #default="scope">
          <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="scope.row.type" />
        </template>
      </el-table-column>
-      <el-table-column label="原因" align="center" prop="reason" />
+      <el-table-column align="center" label="原因" prop="reason" />
      <el-table-column
-        label="申请时间"
+        :formatter="dateFormatter"
        align="center"
+        label="申请时间"
        prop="createTime"
        width="180"
-        :formatter="dateFormatter"
      />
-      <el-table-column label="操作" align="center" width="200">
+      <el-table-column align="center" label="操作" width="200">
        <template #default="scope">
          <el-button
+            v-hasPermi="['bpm:oa-leave:query']"
            link
            type="primary"
            @click="handleDetail(scope.row)"
-            v-hasPermi="['bpm:oa-leave:query']"
          >
            详情
          </el-button>
          <el-button
+            v-hasPermi="['bpm:oa-leave:query']"
            link
            type="primary"
            @click="handleProcessDetail(scope.row)"
-            v-hasPermi="['bpm:oa-leave:query']"
          >
            进度
          </el-button>
          <el-button
+            v-if="scope.row.result === 1"
+            v-hasPermi="['bpm:oa-leave:create']"
            link
            type="danger"
            @click="cancelLeave(scope.row)"
-            v-hasPermi="['bpm:oa-leave:create']"
-            v-if="scope.row.result === 1"
          >
            取消
          </el-button>
@@ -131,9 +138,9 @@
    </el-table>
    <!-- 分页 -->
    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
      @pagination="getList"
    />
  </ContentWrap>
@@ -228,6 +235,14 @@ const handleProcessDetail = (row) => {
  })
 }
+// fix: 列表不刷新的问题。
+watch(
+  () => router.currentRoute.value,
+  () => {
+    getList()
+  }
+)
 /** 初始化 **/
 onMounted(() => {
  getList()