1d839bd0fca331b565deb640bbec0c85e3711791..0a83c5e811ff2a3ab0bb63b045ae35dc34198128
3 天以前 zhengyiming
Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient
0a83c5 对比 | 目录
3 天以前 zhengyiming
fix: env
e4205d 对比 | 目录
3 天以前 wupengfei
fix: bug
b376e0 对比 | 目录
3 天以前 wupengfei
fix: bug
d96783 对比 | 目录
3 天以前 wupengfei
fix: bug
2a009e 对比 | 目录
6个文件已修改
37 ■■■■ 已修改文件
index.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/WeMap/WeMap.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.ts 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/ServiceChargeDetail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ServiceChargeManage/ServiceChargeManage.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
index.html
@@ -7,6 +7,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="renderer" content="webkit" />
    <meta name="referrer" content="no-referrer" />
    <meta http-equiv="Permissions-Policy" content="geolocation=(self)" />
    <title><%- title %></title>
    <link rel="stylesheet" href="<%- subMenuIconCssPath %>" />
    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.min.js"></script>
src/components/WeMap/WeMap.vue
@@ -7,6 +7,7 @@
    :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&policy=1&mapdraggable=1&key=${VITE_WEMAP_KEY}&${
      modelValue.latitude ? 'coord=' + modelValue.latitude + ',' + modelValue.longitude : ''
    }&referer=myJobAddress`"
    allow="geolocation"
  >
  </iframe>
</template>
src/router/index.ts
@@ -256,19 +256,19 @@
          icon: 'home',
        },
      },
      {
        path: '/BalanceManage',
        name: 'BalanceManage',
        hidden: false,
        alwaysShow: true,
        component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'),
        meta: {
          rank: 10042,
          title: '余额管理',
          // rootMenu: true,
          icon: 'home',
        },
      },
      // {
      //   path: '/BalanceManage',
      //   name: 'BalanceManage',
      //   hidden: false,
      //   alwaysShow: true,
      //   component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'),
      //   meta: {
      //     rank: 10042,
      //     title: '余额管理',
      //     // rootMenu: true,
      //     icon: 'home',
      //   },
      // },
      {
        path: '/ServiceChargeDetail/:id',
        name: 'ServiceChargeDetail',
src/views/EmploymentManage/components/AddOrEditEmploymentView.vue
@@ -162,9 +162,7 @@
              <ProFormItemV2
                label="任务地点:"
                prop="weMapInfo"
                :check-rules="[
                  { message: '请选择任务地点', validator: FormValidator.validatorWeMap },
                ]"
                :check-rules="[{ message: '请选择任务地点', type: 'weMap' }]"
              >
                <WeMap v-if="!isDetail" v-model="form.weMapInfo" />
                <div v-else>
src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -90,7 +90,7 @@
          :auto-height="false"
          ref="proTable"
          :tableProps="{
            maxHeight: '400px',
            maxHeight: '250px',
          }"
        >
        </ProTableV2>
src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -201,7 +201,7 @@
      onClick: (role) => handleExport(role),
    },
    extraProps: {
      hide: () => false,
      hide: () => true,
    },
  },
]);
@@ -288,7 +288,6 @@
});
async function handleAddOrEdit() {
  console.log('editForm: ', editForm);
  goDetail(editForm.id, editForm.settlementUrl[0]?.path);
}