Compare commits

...

3 Commits

  1. 4
      src/api/clue/index.js
  2. 4
      src/api/clue/sign.js
  3. 18
      src/views/Clue/Order/Comp/OrderList.vue
  4. 12
      src/views/Clue/Pool/index.vue
  5. 2
      src/views/Home/Index.vue

@ -6,8 +6,8 @@ export const getSimpleClueList = async () => {
} }
// 查询列表 // 查询列表
export const getCluePage = async (params) => { export const getCluePage = async (data) => {
return await request.get({ url: '/admin-api/crm/sch-clue/page', params }) return await request.post({ url: '/admin-api/crm/sch-clue/page', data })
} }
// 查询详情 // 查询详情

@ -1,8 +1,8 @@
import request from '@/config/axios' import request from '@/config/axios'
// 查询列表 // 查询列表
export const getSignPage = async (params) => { export const getSignPage = async (data) => {
return await request.get({ url: '/admin-api/crm/sign/page', params }) return await request.post({ url: '/admin-api/crm/sign/page', data })
} }
// 查询详情 // 查询详情

@ -100,6 +100,16 @@
<span v-else-if="item.form?.component == 'DatePicker'"> <span v-else-if="item.form?.component == 'DatePicker'">
{{ formatDate(row[item.field]) }} {{ formatDate(row[item.field]) }}
</span> </span>
<div v-else-if="item.form?.component == 'UploadImg'">
<el-image
v-if="row[item.field]"
:src="row[item.field]"
preview-teleported
:lazy="true"
:preview-src-list="[row[item.field]]"
/>
<!-- <img v-if="row[item.field]" :src="row[item.field]" style="width: 100%; height: 100%" /> -->
</div>
<span v-else>{{ row[item.field] }}</span> <span v-else>{{ row[item.field] }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -150,6 +160,7 @@
type="primary" type="primary"
class="mr-10px" class="mr-10px"
link link
:disabled="scope.row.isCommissioned != '未发放'"
style="padding: 0; margin-left: 0" style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']" v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)" @click="cancelDeal(scope.row)"
@ -240,6 +251,11 @@ async function getTableList() {
pageNo: tableObject.value.pageNo, pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize pageSize: tableObject.value.pageSize
} }
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await SignApi.getSignPage(removeNullField(params)) const data = await SignApi.getSignPage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams })) tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total tableObject.value.total = data.total
@ -249,10 +265,12 @@ async function getTableList() {
} }
const loading = ref(true) const loading = ref(true)
const searchFieldList = ref([])
async function getCurdSchemas() { async function getCurdSchemas() {
loading.value = true loading.value = true
try { try {
const data = await getSimpleFieldList() const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => { data.forEach((elem) => {
if (['createUser'].includes(elem.field)) { if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value elem.search.options = userOptions.value

@ -228,11 +228,13 @@ const followRef = ref()
const loading = ref(true) const loading = ref(true)
const allSchemas = ref({}) const allSchemas = ref({})
const searchFieldList = ref([])
async function getCurdSchemas() { async function getCurdSchemas() {
loading.value = true loading.value = true
try { try {
const data = await getSimpleFieldList() const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => { data.forEach((elem) => {
if (['followUser', 'convertPeople'].includes(elem.field)) { if (['followUser', 'convertPeople'].includes(elem.field)) {
elem.search.options = userOptions.value elem.search.options = userOptions.value
@ -290,12 +292,18 @@ async function getTableList() {
getSearchCount() getSearchCount()
try { try {
const queryParams = await searchRef.value.getFormModel() const queryParams = await searchRef.value.getFormModel()
const params = { let params = {
...queryParams, ...queryParams,
pageNo: tableObject.value.pageNo, pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize, pageSize: tableObject.value.pageSize,
queryType: queryType.value queryType: queryType.value,
diyParams: {}
} }
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await ClueApi.getCluePage(removeNullField(params)) const data = await ClueApi.getCluePage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams })) tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total tableObject.value.total = data.total

@ -116,7 +116,7 @@
<el-table-column type="index" /> <el-table-column type="index" />
<el-table-column prop="username" label="姓名" width="100" /> <el-table-column prop="username" label="姓名" width="100" />
<el-table-column prop="followNum" label="成交数量" width="70" /> <el-table-column prop="followNum" label="成交数量" width="70" />
<el-table-column prop="deptName" label="所属组织" /> <el-table-column prop="deptName" label="所属组织" width="150" />
</el-table> </el-table>
</el-skeleton> </el-skeleton>
</el-card> </el-card>

Loading…
Cancel
Save