Merge remote-tracking branch 'origin/dev' into dev

maven

14 小时以前 1755192ff6533145a6ed82da31d9f7816bbe00f5

Merge remote-tracking branch 'origin/dev' into dev

 src/layout/components/Settings/index.vue

@@ -1,66 +1,66 @@
<template>

  <el-drawer v-model="showSettings" direction="rtl" size="300px">

    <div class="setting-drawer-title">

      <h3 class="drawer-title">主题风格设置</h3>

    </div>

    <div class="setting-drawer-block-checbox">

      <div

        class="setting-drawer-block-checbox-item"

        @click="handleTheme('theme-dark')"

      >

        <img src="@/assets/images/dark.svg" alt="dark" />

        <div

          v-if="sideTheme === 'theme-dark'"

          class="setting-drawer-block-checbox-selectIcon"

          style="display: block"

        >

          <i aria-label="图标: check" class="anticon anticon-check">

            <svg

              viewBox="64 64 896 896"

              data-icon="check"

              width="1em"

              height="1em"

              :fill="theme"

              aria-hidden="true"

              focusable="false"

              class

            >

              <path

                d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"

              />

            </svg>

          </i>

        </div>

      </div>

      <div

        class="setting-drawer-block-checbox-item"

        @click="handleTheme('theme-light')"

      >

        <img src="@/assets/images/light.svg" alt="light" />

        <div

          v-if="sideTheme === 'theme-light'"

          class="setting-drawer-block-checbox-selectIcon"

          style="display: block"

        >

          <i aria-label="图标: check" class="anticon anticon-check">

            <svg

              viewBox="64 64 896 896"

              data-icon="check"

              width="1em"

              height="1em"

              :fill="theme"

              aria-hidden="true"

              focusable="false"

              class

            >

              <path

                d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"

              />

            </svg>

          </i>

        </div>

      </div>

    </div>

<!--    <div class="setting-drawer-title">-->

<!--      <h3 class="drawer-title">主题风格设置</h3>-->

<!--    </div>-->

<!--    <div class="setting-drawer-block-checbox">-->

<!--      <div-->

<!--        class="setting-drawer-block-checbox-item"-->

<!--        @click="handleTheme('theme-dark')"-->

<!--      >-->

<!--        <img src="@/assets/images/dark.svg" alt="dark" />-->

<!--        <div-->

<!--          v-if="sideTheme === 'theme-dark'"-->

<!--          class="setting-drawer-block-checbox-selectIcon"-->

<!--          style="display: block"-->

<!--        >-->

<!--          <i aria-label="图标: check" class="anticon anticon-check">-->

<!--            <svg-->

<!--              viewBox="64 64 896 896"-->

<!--              data-icon="check"-->

<!--              width="1em"-->

<!--              height="1em"-->

<!--              :fill="theme"-->

<!--              aria-hidden="true"-->

<!--              focusable="false"-->

<!--              class-->

<!--            >-->

<!--              <path-->

<!--                d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"-->

<!--              />-->

<!--            </svg>-->

<!--          </i>-->

<!--        </div>-->

<!--      </div>-->

<!--      <div-->

<!--        class="setting-drawer-block-checbox-item"-->

<!--        @click="handleTheme('theme-light')"-->

<!--      >-->

<!--        <img src="@/assets/images/light.svg" alt="light" />-->

<!--        <div-->

<!--          v-if="sideTheme === 'theme-light'"-->

<!--          class="setting-drawer-block-checbox-selectIcon"-->

<!--          style="display: block"-->

<!--        >-->

<!--          <i aria-label="图标: check" class="anticon anticon-check">-->

<!--            <svg-->

<!--              viewBox="64 64 896 896"-->

<!--              data-icon="check"-->

<!--              width="1em"-->

<!--              height="1em"-->

<!--              :fill="theme"-->

<!--              aria-hidden="true"-->

<!--              focusable="false"-->

<!--              class-->

<!--            >-->

<!--              <path-->

<!--                d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"-->

<!--              />-->

<!--            </svg>-->

<!--          </i>-->

<!--        </div>-->

<!--      </div>-->

<!--    </div>-->

    <div class="drawer-item">

      <span>主题颜色</span>

      <span class="comp-style">

@@ -146,7 +146,6 @@
  "#81D8D0",

  "#E85827",

  "#008C8C",

  "#002FA7",

  "#F9DC24",

  "#B05923",

  "#003153",


 src/layout/components/Sidebar/index.vue

@@ -37,7 +37,8 @@
  if (settingsStore.isDark) {

    return 'var(--sidebar-bg)'

  }

  return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBg

  // 浅色主题时，直接用主题色

  return sideTheme.value === 'theme-dark' ? variables.menuBg : settingsStore.theme

})



// 获取菜单文字颜色


 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -158,7 +158,6 @@
const { form } = toRefs(data);
// 节点标题
const getNodeTitle = (index, len) => {
  if (index === 0) return '发起';
  if (index === len - 1) return '结束';
  return '审批';
};

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -54,8 +54,7 @@
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>
                    <span v-if="index === 0">发起</span>
                    <span v-else>审批</span>
                    <span>审批人</span>
                    →
                  </div>
                  <el-select
@@ -179,7 +178,6 @@
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
    currentApproveStatus.value = row.approveStatus
    userListNoPageByTenantId().then((res) => {
    userList.value = res.data;
  });
@@ -194,6 +192,7 @@
  // 获取当前用户信息并设置部门ID
  form.value.approveDeptId = userStore.currentDeptId
  if (operationType.value === 'edit') {
        currentApproveStatus.value = row.approveStatus
    approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
            form.value = {...res.data}
      // 反显审批人

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -69,6 +69,8 @@
        return "审核中";
      } else if (params == 2) {
        return "审核完成";
      } else if (params == 4) {
        return "已重新提交";
      } else {
        return '不通过';
      }
@@ -78,8 +80,10 @@
        return "warning";
      } else if (params == 1) {
        return "primary";
      }  else if (params == 2) {
      } else if (params == 2) {
        return "success";
      } else if (params == 4) {
        return "";
      } else {
        return 'danger';
      }
@@ -132,7 +136,7 @@
        clickFun: (row) => {
          openForm("edit", row);
        },
                disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
                disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
      },
      {
        name: "审核",
@@ -140,7 +144,7 @@
        clickFun: (row) => {
          openApprovalDia("approval", row);
        },
                disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id
                disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id
      },
      {
        name: "详情",