提交 810e8768 authored 作者: lidongxu's avatar lidongxu

Merge branch 'dev'

...@@ -182,7 +182,7 @@ export const dynamicRoutes = [ ...@@ -182,7 +182,7 @@ export const dynamicRoutes = [
const router = createRouter({ const router = createRouter({
// 路由模式:createWebHashHistory,createWebHistory // 路由模式:createWebHashHistory,createWebHistory
history: createWebHashHistory(), history: createWebHashHistory(),
routes: isMobile() ? [...constantMobileRoutes] : [...constantPCRoutes], // 移动端单独静态公共路由表 routes: isMobile() ? [...constantMobileRoutes, ...constantRoutes] : [...constantPCRoutes], // 移动端单独静态公共路由表
scrollBehavior(to, from, savedPosition) { scrollBehavior(to, from, savedPosition) {
if (savedPosition) { if (savedPosition) {
return savedPosition return savedPosition
......
...@@ -490,7 +490,7 @@ const deleteLongTimePictureArr = async (file, { name, index }) => { ...@@ -490,7 +490,7 @@ const deleteLongTimePictureArr = async (file, { name, index }) => {
span { span {
display: inline-block; display: inline-block;
width: 100px; width: 120px;
} }
.van-cell { .van-cell {
......
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
label-position="top" label-position="top"
label="门店类型:" label="门店类型:"
:model-value="form.selectedType" :model-value="form.selectedType"
placeholder="请选择"> placeholder="请选择"
:rules="[{ required: true, message: '请选择门店类型' }]">
<template #input> <template #input>
<el-select v-model="form.selectedType" <el-select v-model="form.selectedType"
placeholder="请选择"> placeholder="请选择">
......
...@@ -118,6 +118,13 @@ const clickRecord = () => { ...@@ -118,6 +118,13 @@ const clickRecord = () => {
// 门店点击 // 门店点击
const handleClickStore = (item) => { const handleClickStore = (item) => {
// 确实提示
showConfirmDialog({
title: '提示',
message: '是否创建本店稽查任务?',
confirmButtonText: '前往',
cancelButtonText: '取消'
}).then(() => {
router.push({ router.push({
path: '/inspectionTask', path: '/inspectionTask',
query: { query: {
...@@ -126,6 +133,7 @@ const handleClickStore = (item) => { ...@@ -126,6 +133,7 @@ const handleClickStore = (item) => {
storePicture: item.storePictures?.split(",")[0] storePicture: item.storePictures?.split(",")[0]
} }
}) })
})
} }
// 新建终端 // 新建终端
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论