Commit dea95891 authored by 赵乐's avatar 赵乐

123

parent 6b96845e
...@@ -4,8 +4,8 @@ NODE_ENV=development ...@@ -4,8 +4,8 @@ NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
# VITE_BASE_URL='http://192.168.0.133:48080' VITE_BASE_URL='http://192.168.0.182:48080'
VITE_BASE_URL='https://hntqwl.com' # VITE_BASE_URL='https://hntqwl.com'
# VITE_BASE_URL='http://localhost:48080' # VITE_BASE_URL='http://localhost:48080'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
......
...@@ -105,17 +105,17 @@ ...@@ -105,17 +105,17 @@
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="创建时间" prop="createTime">--> <!-- <el-form-item label="创建时间" prop="createTime">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="queryParams.createTime"--> <!-- v-model="queryParams.createTime"-->
<!-- value-format="YYYY-MM-DD HH:mm:ss"--> <!-- value-format="YYYY-MM-DD HH:mm:ss"-->
<!-- type="daterange"--> <!-- type="daterange"-->
<!-- start-placeholder="开始日期"--> <!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"--> <!-- end-placeholder="结束日期"-->
<!-- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"--> <!-- :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
<!-- class="!w-220px"--> <!-- class="!w-220px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
...@@ -177,11 +177,17 @@ ...@@ -177,11 +177,17 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<!-- <el-table-column label="主键ID" align="center" prop="id" />--> <!-- <el-table-column label="主键ID" align="center" prop="id" />-->
<el-table-column label="拜访人姓名" align="center" prop="customerName" width="100px"/> <el-table-column label="拜访人姓名" align="center" prop="customerName" width="100px" />
<el-table-column label="联系方式" align="center" prop="contact" width="120px"/> <el-table-column label="联系方式" align="center" prop="contact" width="120px" />
<el-table-column label="客户公司名称" align="center" prop="companyName" width="240px" /> <el-table-column label="客户公司名称" align="center" prop="companyName" width="240px" />
<el-table-column label="所在地区" align="center" prop="regionFullName" width="160px" /> <el-table-column label="所在地区" align="center" prop="regionFullName" width="160px" />
<el-table-column <el-table-column
...@@ -198,7 +204,7 @@ ...@@ -198,7 +204,7 @@
</el-table-column> </el-table-column>
<el-table-column label="拜访品种" align="center" prop="visitProductIds" width="100px"> <el-table-column label="拜访品种" align="center" prop="visitProductIds" width="100px">
<template #default="scope"> <template #default="scope">
<ProductList :ids=scope.row.visitProductIds /> <ProductList :ids="scope.row.visitProductIds" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="拜访方式" align="center" prop="visitMethod"> <el-table-column label="拜访方式" align="center" prop="visitMethod">
...@@ -212,20 +218,16 @@ ...@@ -212,20 +218,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="业务经理" align="center" prop="creator" /> <el-table-column label="业务经理" align="center" prop="creator" />
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="创建时间"--> <!-- label="创建时间"-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="createTime"--> <!-- prop="createTime"-->
<!-- :formatter="dateFormatter2"--> <!-- :formatter="dateFormatter2"-->
<!-- width="180px"--> <!-- width="180px"-->
<!-- />--> <!-- />-->
<el-table-column label="操作" align="center" min-width="180px" fixed="right"> <el-table-column label="操作" align="center" min-width="180px" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button link type="primary" @click="openForm('detail', scope.row.id)">
link
type="primary"
@click="openForm('detail', scope.row.id)"
>
查看详情 查看详情
</el-button> </el-button>
<el-button <el-button
...@@ -264,20 +266,18 @@ ...@@ -264,20 +266,18 @@
<PrintContent ref="printComp" :dataList="printData" /> <PrintContent ref="printComp" :dataList="printData" />
</div> </div>
</Teleport> </Teleport>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {DICT_TYPE, getIntDictOptions} from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import {dateFormatter2} from '@/utils/formatTime' import { dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import {InfoApi, InfoVO} from '@/api/visit/info' import { InfoApi, InfoVO } from '@/api/visit/info'
import InfoForm from './InfoForm.vue' import InfoForm from './InfoForm.vue'
import ProductList from "@/views/visit/util/ProductList.vue"; import ProductList from '@/views/visit/util/ProductList.vue'
import {useRoute} from 'vue-router' import { useRoute } from 'vue-router'
import { usePrint } from '../util/print'
import {usePrint} from '../util/print'
import PrintContent from '../util/PrintContent.vue' import PrintContent from '../util/PrintContent.vue'
//========== //==========
...@@ -307,10 +307,11 @@ const handleUnionAllPrint = async () => { ...@@ -307,10 +307,11 @@ const handleUnionAllPrint = async () => {
if (list.value.length === 0) { if (list.value.length === 0) {
return message.warning('当前不存在可打印数据') return message.warning('当前不存在可打印数据')
} }
delete queryParams.pageSize let params ={
// queryParams.pageSize=100 ...queryParams
// 需要修改接口 最多只能100条数据 }
printData.value = await InfoApi.getUnionAllPrintListByIds(queryParams) params.pageSize = -1
printData.value = await InfoApi.getUnionAllPrintListByIds(params)
await nextTick() await nextTick()
const dom = printComp.value.printRef const dom = printComp.value.printRef
if (dom) usePrint(dom) if (dom) usePrint(dom)
...@@ -341,7 +342,7 @@ const queryParams = reactive({ ...@@ -341,7 +342,7 @@ const queryParams = reactive({
visitMethod: undefined, visitMethod: undefined,
visitType: undefined, visitType: undefined,
createTime: [], createTime: [],
creator: undefined, creator: undefined
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中 const exportLoading = ref(false) // 导出的加载中
...@@ -349,7 +350,7 @@ const multipleSelection = ref([]) //存储多选内容 ...@@ -349,7 +350,7 @@ const multipleSelection = ref([]) //存储多选内容
/** 多选操作**/ /** 多选操作**/
const handleSelectionChange = (val) => { const handleSelectionChange = (val) => {
multipleSelection.value = val.map(item=>item.id) multipleSelection.value = val.map((item) => item.id)
//console.log(val,multipleSelection) //console.log(val,multipleSelection)
} }
/** 查询列表 */ /** 查询列表 */
...@@ -429,7 +430,7 @@ const handleExport = async () => { ...@@ -429,7 +430,7 @@ const handleExport = async () => {
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {
const companyName = route.query.companyName const companyName = route.query.companyName
if (companyName){ if (companyName) {
queryParams.companyName = companyName queryParams.companyName = companyName
} }
getList() getList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment