yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改

pull/781/head
苑坤 2025-05-25 14:13:52 +08:00
parent 25563315ed
commit c0bfe5ef03
11 changed files with 1092 additions and 1075 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -12,7 +12,7 @@
"test-server": "vite --mode test",
"ts:check": "vue-tsc --noEmit",
"build:local": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build",
"build:dev": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode dev",
"build:dev": "node --max_old_space_size=5048 ./node_modules/vite/bin/vite.js build --mode dev",
"build:test": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode test",
"build:stage": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode stage",
"build:prod": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode prod",

2095
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

4
src/utils/dict.ts
View File

@ -397,7 +397,7 @@ export enum DICT_TYPE {
// 考核类型
HRM_ASSESS_TYPE = 'hrm_assess_type',
//需求部门
HRM_EMAND_DEPARTMENT = 'hrm_emand_department'
HRM_EMAND_DEPARTMENT = 'hrm_emand_department',
HRM_CLOCK_STATUS = 'hrm-clock-status',
}

2
src/views/crm/contact/components/ContactList.vue
View File

@ -42,7 +42,7 @@
</el-table-column>
<el-table-column align="center" label="手机号" prop="mobile" />
<el-table-column align="center" label="职位" prop="post" />
<el-table-column align="center" label="直属上级" prop="parentName" />
<!-- <el-table-column align="center" label="直属上级" prop="parentName" />-->
<el-table-column align="center" label="是否关键决策人" min-width="100" prop="master">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />

4
src/views/crm/contact/components/ContactListModal.vue
View File

@ -7,7 +7,7 @@
:inline="true"
:model="queryParams"
class="-mb-15px"
label-width="90px"
label-width="120px"
>
<el-form-item label="联系人名称" prop="name">
<el-input
@ -54,7 +54,7 @@
</el-table-column>
<el-table-column align="center" label="手机号" prop="mobile" />
<el-table-column align="center" label="职位" prop="post" />
<el-table-column align="center" label="直属上级" prop="parentName" />
<!-- <el-table-column align="center" label="直属上级" prop="parentName" />-->
<el-table-column align="center" label="是否关键决策人" min-width="100" prop="master">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />

2
src/views/crm/contact/index.vue
View File

@ -102,7 +102,7 @@
</el-link>
</template>
</el-table-column>
<el-table-column align="center" fixed="left" label="客户名称" prop="customerName" width="220">
<el-table-column align="center" fixed="left" label="客户名称" prop="customerName" width="280">
<!-- <template #default="scope">
<el-link
:underline="false"

2
src/views/crm/contract/components/ContractAAuthorizedCompanyForm.vue
View File

@ -176,4 +176,4 @@ const getData = () => {
}
defineExpose({ validate, getData })
</script>
</script>

2
src/views/crm/followup/components/FollowUpRecordContactForm.vue
View File

@ -9,7 +9,7 @@
</el-table-column>
<el-table-column label="手机号" align="center" prop="mobile" />
<el-table-column label="职位" align="center" prop="post" />
<el-table-column label="直属上级" align="center" prop="parentName" />
<!-- <el-table-column label="直属上级" align="center" prop="parentName" />-->
<el-table-column label="是否关键决策人" align="center" prop="master" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />

44
src/views/crm/servicefeecollectionmethod/index.vue
View File

@ -32,30 +32,6 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="客单价" prop="customerPrice">
<el-input
v-model="queryParams.customerPrice"
placeholder="请输入客单价"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-select
v-model="queryParams.unit"
placeholder="请选择单位"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_UNIT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="采购成本" prop="procurementCost">
<el-input
v-model="queryParams.procurementCost"
@ -65,24 +41,6 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="客单价 - 采购成本" prop="profit">
<el-input
v-model="queryParams.profit"
placeholder="请输入客单价 - 采购成本"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="说明" prop="describe">
<el-input
v-model="queryParams.describe"
placeholder="请输入说明"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
@ -271,4 +229,4 @@ const handleExport = async () => {
onMounted(() => {
getList()
})
</script>
</script>

4
src/views/hrm/attendrecord/AttendRecordForm.vue
View File

@ -19,7 +19,7 @@
<el-form-item label="打卡状态（正常、迟到、早退、缺卡等）" prop="clockStatus">
<el-select v-model="formData.clockStatus" placeholder="请选择打卡状态（正常、迟到、早退、缺卡等）">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.HRM_ CLOCK_STATUS)"
v-for="dict in getStrDictOptions(DICT_TYPE.HRM_CLOCK_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -151,4 +151,4 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
</script>
</script>

6
src/views/hrm/attendrecord/index.vue
View File

@ -43,7 +43,7 @@
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.HRM_ CLOCK_STATUS)"
v-for="dict in getStrDictOptions(DICT_TYPE.HRM_CLOCK_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -140,7 +140,7 @@
<el-table-column label="岗位ID" align="center" prop="postId" />
<el-table-column label="打卡状态（正常、迟到、早退、缺卡等）" align="center" prop="clockStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HRM_ CLOCK_STATUS" :value="scope.row.clockStatus" />
<dict-tag :type="DICT_TYPE.HRM_CLOCK_STATUS" :value="scope.row.clockStatus" />
</template>
</el-table-column>
<el-table-column label="打卡类型（正常上下班、加班）" align="center" prop="clockType">
@ -298,4 +298,4 @@ const handleExport = async () => {
onMounted(() => {
getList()
})
</script>
</script>