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

Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa

pull/781/head
zy 2025-05-01 20:18:54 +08:00
parent 79126ca91a 6d28eb51f6
commit 57a3ac118f
7 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/crm/backlog/components/CustomerFollowList.vue
View File

@ -31,21 +31,22 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160"> <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
<template #default="scope"> <template #default="scope">
<el-link :underline="false" type="primary" @click="openDetail(scope.row.id)"> <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
{{ scope.row.name }} {{ scope.row.name }}
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
<el-table-column align="center" label="客户来源" prop="source" width="100"> <el-table-column align="center" label="客户来源" prop="source" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机" align="center" prop="mobile" width="120" /> <!-- <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
<el-table-column label="电话" align="center" prop="telephone" width="130" /> <!-- <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
<el-table-column label="邮箱" align="center" prop="email" width="180" /> <!-- <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
<el-table-column align="center" label="客户级别" prop="level" width="135"> <el-table-column align="center" label="客户级别" prop="level" width="135">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />

9
src/views/crm/backlog/components/CustomerPutPoolRemindList.vue
View File

@ -29,21 +29,22 @@
</ContentWrap> </ContentWrap>
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160"> <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
<template #default="scope"> <template #default="scope">
<el-link :underline="false" type="primary" @click="openDetail(scope.row.id)"> <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
{{ scope.row.name }} {{ scope.row.name }}
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
<el-table-column align="center" label="客户来源" prop="source" width="100"> <el-table-column align="center" label="客户来源" prop="source" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机" align="center" prop="mobile" width="120" /> <!-- <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
<el-table-column label="电话" align="center" prop="telephone" width="130" /> <!-- <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
<el-table-column label="邮箱" align="center" prop="email" width="180" /> <!-- <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
<el-table-column align="center" label="客户级别" prop="level" width="135"> <el-table-column align="center" label="客户级别" prop="level" width="135">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />

9
src/views/crm/backlog/components/CustomerTodayContactList.vue
View File

@ -43,21 +43,22 @@
</ContentWrap> </ContentWrap>
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160"> <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
<template #default="scope"> <template #default="scope">
<el-link :underline="false" type="primary" @click="openDetail(scope.row.id)"> <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
{{ scope.row.name }} {{ scope.row.name }}
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
<el-table-column align="center" label="客户来源" prop="source" width="100"> <el-table-column align="center" label="客户来源" prop="source" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机" align="center" prop="mobile" width="120" /> <!-- <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
<el-table-column label="电话" align="center" prop="telephone" width="130" /> <!-- <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
<el-table-column label="邮箱" align="center" prop="email" width="180" /> <!-- <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
<el-table-column align="center" label="客户级别" prop="level" width="135"> <el-table-column align="center" label="客户级别" prop="level" width="135">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" /> <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />

10
src/views/crm/backlog/index.vue
View File

@ -93,11 +93,11 @@ const leftSides = ref([
// menu: 'receivablePlanRemind', // menu: 'receivablePlanRemind',
// count: receivablePlanRemindCount // count: receivablePlanRemindCount
// }, // },
// { {
// name: '即将到期的合同', name: '即将到期的合同',
// menu: 'contractRemind', menu: 'contractRemind',
// count: contractRemindCount count: contractRemindCount
// } }
]) ])
/** 侧边点击 */ /** 侧边点击 */

6
src/views/crm/business/BusinessForm.vue
View File

@ -203,7 +203,7 @@
</ContentWrap> </ContentWrap>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="线上总金额" prop="onlinePrice"> <el-form-item label="线上总金额（元）" prop="onlinePrice">
<el-input <el-input
disabled disabled
v-model="formData.onlinePrice" v-model="formData.onlinePrice"
@ -212,7 +212,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="线下总金额" prop="offlinePrice"> <el-form-item label="线下总金额（元）" prop="offlinePrice">
<el-input <el-input
disabled disabled
v-model="formData.offlinePrice" v-model="formData.offlinePrice"
@ -221,7 +221,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="总金额" prop="totalPrice"> <el-form-item label="总金额（元）" prop="totalPrice">
<el-input <el-input
disabled disabled
v-model="formData.totalPrice" v-model="formData.totalPrice"

12
src/views/crm/business/components/BusinessProductForm.vue
View File

@ -10,14 +10,14 @@
> >
<el-table :data="formData" class="-mt-10px"> <el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" align="center" width="60" /> <el-table-column label="序号" type="index" align="center" width="60" />
<el-table-column label="产品名称" align="center" prop="productName" /> <el-table-column label="产品名称" align="left" prop="productName" width="200" />
<el-table-column label="产品类别" align="center" prop="category" width="160"> <el-table-column label="产品类别" align="center" prop="category" width="160">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="scope.row.category" /> <dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="scope.row.category" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品明细" align="center" prop="detailType" width="160"> <el-table-column label="产品明细" align="center" prop="detailType" width="240">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!"> <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
<el-select v-model="row.detailType" placeholder="请选择状态" > <el-select v-model="row.detailType" placeholder="请选择状态" >
@ -31,12 +31,12 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" min-width="80"> <el-table-column label="单位" align="center" min-width="80">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.productUnit" /> <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.productUnit" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="线上价格（元）" fixed="right" min-width="140"> <el-table-column label="线上价格（元）" fixed="right" min-width="100">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!"> <el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!">
<el-input-number <el-input-number
@ -49,7 +49,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="线下价格（元）" fixed="right" min-width="140"> <el-table-column label="线下价格（元）" fixed="right" min-width="100">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!"> <el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!">
<el-input-number <el-input-number
@ -62,7 +62,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="totalPrice" fixed="right" min-width="140"> <el-table-column label="合计(元)" prop="totalPrice" fixed="right" min-width="100">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!"> <el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
<el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" /> <el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" />

17
src/views/crm/quotation/components/QuotationProductForm.vue
View File

@ -8,12 +8,13 @@
:inline-message="true" :inline-message="true"
> >
<el-table :data="formData" class="-mt-10px"> <el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" width="100" /> <el-table-column label="序号" type="index" width="80" />
<el-table-column label="产品名称" min-width="150"> <el-table-column label="产品名称" min-width="240">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.productName`" :rules="formRules.productName" class="mb-0px!"> <el-form-item :prop="`${$index}.productName`" :rules="formRules.productName" class="mb-0px!">
<el-input v-model="row.productName" placeholder="请输入产品名称" disabled /> <el-input v-model="row.productName" placeholder="请输入产品名称" disabled />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品类型" min-width="150"> <el-table-column label="产品类型" min-width="150">
@ -31,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品明细类型" min-width="150"> <el-table-column label="产品明细" min-width="220">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!"> <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
<el-select v-model="row.detailType" placeholder="请选择状态" class="!w-240px"> <el-select v-model="row.detailType" placeholder="请选择状态" class="!w-240px">
@ -59,21 +60,21 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="线上价格" min-width="150"> <el-table-column label="线上价格（元）" min-width="120">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!"> <el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!">
<el-input v-model="row.onlinePrice" placeholder="请输入线上价格" /> <el-input v-model="row.onlinePrice" placeholder="请输入线上价格" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="线下价格" min-width="150"> <el-table-column label="线下价格（元）" min-width="120">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!"> <el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!">
<el-input v-model="row.offlinePrice" placeholder="请输入线下价格" /> <el-input v-model="row.offlinePrice" placeholder="请输入线下价格" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总计价格" min-width="150"> <el-table-column label="总计价格（元）" min-width="120">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.totalPrice`" :rules="formRules.totalPrice" class="mb-0px!"> <el-form-item :prop="`${$index}.totalPrice`" :rules="formRules.totalPrice" class="mb-0px!">
<el-input v-model="row.totalPrice" placeholder="请输入总计价格" disabled /> <el-input v-model="row.totalPrice" placeholder="请输入总计价格" disabled />
@ -94,7 +95,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品开具项目" min-width="160"> <el-table-column label="产品开具项目" min-width="220">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.productInvoiceItem`" :rules="formRules.productInvoiceItem" class="mb-0px!"> <el-form-item :prop="`${$index}.productInvoiceItem`" :rules="formRules.productInvoiceItem" class="mb-0px!">
<el-select v-model="row.productInvoiceItem" placeholder="请选择状态" clearable class="!w-240px"> <el-select v-model="row.productInvoiceItem" placeholder="请选择状态" clearable class="!w-240px">
@ -122,7 +123,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="服务开具项目" min-width="160"> <el-table-column label="服务开具项目" min-width="240">
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.serviceInvoiceItem`" :rules="formRules.serviceInvoiceItem" class="mb-0px!"> <el-form-item :prop="`${$index}.serviceInvoiceItem`" :rules="formRules.serviceInvoiceItem" class="mb-0px!">
<el-select v-model="row.serviceInvoiceItem" placeholder="请选择状态" clearable class="!w-240px"> <el-select v-model="row.serviceInvoiceItem" placeholder="请选择状态" clearable class="!w-240px">