qiubinghui
/
zhywpt-web
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Attività
Sfoglia il codice sorgente

bug修改

xz
贺自立 6 mesi fa
parent
d199dbf773
commit
e02ff73d3a
6 ha cambiato i file con 122 aggiunte e 23 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 4
    4
      .env.development
  2. 3
    1
      package.json
  3. 10
    0
      src/views/onlineBusinessHall/productManagement/releaseProduct/consultativeManagementDialog.vue
  4. 3
    1
      src/views/onlineBusinessHall/productManagement/releaseProduct/index.vue
  5. 69
    3
      src/views/system/branch/index.vue
  6. 33
    14
      src/views/system/userManage/index.vue

+ 4
- 4
.env.development Vedi File

@@ -12,15 +12,15 @@ ENV = 'development'
# VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #试运行环境/青云环境/生成环境地址
# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/nDev/' #线上地址 nDev
# VITE_APP_BASE_URL = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod
VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod

# VITE_APP_BASE_URL = 'http://100.64.2.104:8086/html/'
# VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
# VITE_APP_BASE_URL = 'https://192.168.124.43:50001/' #宇轩服务器
# VITE_APP_BASE_URL = 'http://192.168.124.56:50001/' #试运行环境/青云环境/生成环境地址
# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 ndev
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址 prod
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 ndev
# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址 prod

# VITE_APP_BASE_URL_N = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
# VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址

+ 3
- 1
package.json Vedi File

@@ -6,7 +6,8 @@
"build:dev": "vite build --mode development",
"build:pro": "vite build --mode production",
"dev": "vite",
"prettier": "prettier --write ."
"prettier": "prettier --write .",
"fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
},
"dependencies": {
"@element-plus/icons-vue": "^2.0.4",
@@ -19,6 +20,7 @@
"element-plus": "^2.7.8",
"file-saver": "^2.0.5",
"fuse.js": "^6.6.2",
"increase-memory-limit": "^1.0.7",
"js-cookie": "^3.0.1",
"jsencrypt": "^3.2.1",
"less": "^4.1.3",

+ 10
- 0
src/views/onlineBusinessHall/productManagement/releaseProduct/consultativeManagementDialog.vue Vedi File

@@ -362,6 +362,16 @@ const field1 = ref({
// accept: '.docx',
},
},
{
prop: 'templateId',
label: '安心签模版编号',
form: {
width: '90%',
formLabelWidth: 140,
type: 'input',
required: true,
},
},
{
label: '文件名',
prop: 'name',

+ 3
- 1
src/views/onlineBusinessHall/productManagement/releaseProduct/index.vue Vedi File

@@ -1860,7 +1860,9 @@ let field = ref<any>({
prop: 'releaseId',
label: '产品编号',
form: {
// hideEdit: true,
// hideEdit: tru
checkContent: 'integer',
integerlength: 3,
disabled: true,
width: '45%',
digit: 20,

+ 69
- 3
src/views/system/branch/index.vue Vedi File

@@ -99,7 +99,45 @@
</div>
</el-form-item>
</el-form>
<!-- <div style="padding:30px;">办理点信息</div> -->
<div style="padding: 0 0 30px 0;text-align: right;">
<el-button type="success" icon="Plus" @click="addBtn" style="margin-bottom: 10px;">
添加
</el-button>
<template v-for="(item,index) in addForm.locationModels" :key="index">
<el-form-item label="名称:" prop="name">
<div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.name" placeholder="请输入网点名称" />
</div>
</el-form-item>
<el-form-item label="地址:" prop="address">
<div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.address" placeholder="请输入地址" />
</div>
</el-form-item>
<el-form-item label="经度:" prop="longitude">
<div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.longitude" placeholder="请输入经度" />
</div>
</el-form-item>
<el-form-item label="纬度:" prop="latitude">
<div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.latitude" placeholder="请输入纬度" />
</div>
</el-form-item>
<el-form-item label="半径距离(单位:米):" prop="radial">
<div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.radial" placeholder="请输入半径距离(单位:米)" />
</div>
</el-form-item>
<el-button class="op-btn" type="danger" @click="deleteHandle(index)">
删除
</el-button>
</template>
</div>
</template>
<template #footer>
<el-button type="default" @click="cancel" v-if="typeOption !== 'view'">
取消
@@ -123,7 +161,6 @@
import { useDebounce } from '@/utils/utils'
import { useRoute } from 'vue-router'
import { IsPermission } from '@/router/routerUtil'
import { log } from 'console'
const crudRef = ref()
const agencyIdC = ref()
const dataFormRef = ref()
@@ -151,6 +188,9 @@ import { log } from 'console'
tel: '',
orderSource: 'WEB',
agencyId: '',
locationModels:[
]
}
const addForm: any = ref(initItem)
const formLoding = ref(false)
@@ -179,7 +219,20 @@ import { log } from 'console'
getList()
getAgencyList()
})

// 添加
const addBtn = () => {
addForm.value.locationModels.push({
address: '',
latitude: '',
longitude: '',
name: '',
radial: '',
})
}
// 删除
const deleteHandle = (index) => {
addForm.value.locationModels.splice(index, 1)
}
// 搜索按钮
function btnSearch() {
field.value.paging.currentPage = 1
@@ -479,7 +532,20 @@ import { log } from 'console'
//编辑
function handleEdit(row: IObject) {
console.log('每项数据', row)

let params = {
orderSource: 'WEB',
serviceHallId:row.servicehallId
}
BaseService.postN('/userw/serviceHall/queryLocations', params).then((res: any) => {
if (res && res.code === 0) {
// ElMessage.success('操作成功')
// getList()
// cancel()
addForm.value.locationModels = res.data
} else {
ElMessage.error(res.message)
}
})
if (row.superServiceHallId) {
isFirstDot.value = false
} else {

+ 33
- 14
src/views/system/userManage/index.vue Vedi File

@@ -313,20 +313,39 @@
// importFn('a8f9dac698cb4793bb15f26fd608d2b3', getList(), { excelFileUrl: url })
BaseService.postN('/userw/staff/registerFullBath', { excelFileUrl: url }).then((res: any) => {
if (res && res.code === 0) {
console.log(res)
const errUrl = res.data?.path ?? ''
if (errUrl) {
ElMessage.error("导入失败，请查看下载到本地文件的具体错误信息");
BaseService.getDownload(
import.meta.env.VITE_APP_UPLOAD_URL + errUrl,
'错误信息文件'
)
} else {
ElMessage.success("导入成功");
}
getList()
} else {
ElMessage.error("导入失败，" + res.message);
// console.log(res)
// const errUrl = res.data?.path ?? ''
// if (errUrl) {
// ElMessage.error("导入失败，请查看下载到本地文件的具体错误信息");
// BaseService.getDownload(
// import.meta.env.VITE_APP_UPLOAD_URL + errUrl,
// '错误信息文件'
// )
// } else {
// ElMessage.success("导入成功");
// }
//处理导入失败问题
if (res && res.code === 0) {
let bizContent = res.data
let url = bizContent.url || "";
let fileName = bizContent.fileName ? `${bizContent.fileName}` : ''
if (url) {
//window.open(url)
//处理下载有文件名
BaseService.getDownloadFileName(import.meta.env.VITE_APP_UPLOAD_URL + url, fileName)
// btnLoding.value = false;
// clearData();
// emit("refreshDataList");
// emit("closeHandle");
ElMessage.success("导入成功");
} else {
ElMessage.error("导入失败");
}

} else {
// btnLoding.value = false;
ElMessage.error(res.message);
}
}
});
}

Write Preview
Loading…
Annulla
Salva