Browse Source

'2025年8月8日16:48:46'

xz
wq 1 month ago
parent
commit
c961d7912d

+ 4
- 4
.env.development View File

# VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #试运行环境/青云环境/生成环境地址 # 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.65.11.2:8086/nDev/' #线上地址 nDev
# VITE_APP_BASE_URL = 'http://100.64.2.104:8087/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.104:8086/html/'
# VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
# VITE_APP_BASE_URL = 'https://192.168.124.43: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 = '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 = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
# VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址

+ 4
- 4
.env.production View File

# VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #生成环境地址/试运行环境
# VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境


# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 prod生产 ndev测试
VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址 prod生产 ndev测试


VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod
VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址 prod生产 ndev测试
# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod
# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址 prod生产 ndev测试




# VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址

+ 7
- 5
src/views/onlineBusinessHall/orderManagement/index.vue View File

let content = ref('') let content = ref('')
let form = ref() let form = ref()
let startTitle = ref('取消订单') //取消订单 换货 退货 let startTitle = ref('取消订单') //取消订单 换货 退货
let visiinfoDatable: any = reactive({})
let visiinfoDatable: any = ref({})
let activeName = null let activeName = null
let sizeForm: any = ref({ orderInfoExt: {} }) //发货对象 let sizeForm: any = ref({ orderInfoExt: {} }) //发货对象
const autdis: any = reactive({ auditStatus: 'true', reason: '', reason1: '' }) //审核对象 const autdis: any = reactive({ auditStatus: 'true', reason: '', reason1: '' }) //审核对象
autdisButton.value = type autdisButton.value = type
offset.value = 150 offset.value = 150
} }
visiinfoDatable = {}
visiinfoDatable.value = {}
BaseService.postN('/iaw/issue/order/orderDetailQuery', { id: data.id }).then((res: any) => { BaseService.postN('/iaw/issue/order/orderDetailQuery', { id: data.id }).then((res: any) => {
if (res && res.code === 0) { if (res && res.code === 0) {
try { try {
visiinfoDatable = res.data.data
console.log('---------',res.data.data);
visiinfoDatable.value = res.data.data
} catch (e) { } catch (e) {
console.log(e) console.log(e)
ElMessage.error('未知错误') ElMessage.error('未知错误')
} //渲详情数据 } //渲详情数据
if (visiinfoDatable) {
if (visiinfoDatable.value) {
if (type !== 0) { if (type !== 0) {
autdis.orderId = visiinfoDatable.orderNo
autdis.orderId = visiinfoDatable.value.orderNo
visible.value = true visible.value = true
} else { } else {
CompleteTeturnDialog.value = true CompleteTeturnDialog.value = true

+ 24
- 10
src/views/system/branch/index.vue View File

:show-file-list="false" :show-file-list="false"
:multiple="false" :multiple="false"
> >
<el-button type="primary" class="btn" icon="Upload" @click="handleImport(scope.row)" size="small">
导入
<el-button type="primary" class="btn" icon="Upload" @click="handleImport(scope.row,true)" size="small">
办理点导入
</el-button>
<el-button type="primary" class="btn" icon="Upload" @click="handleImport(scope.row,false)" size="small">
禁止办理点导入
</el-button> </el-button>
</el-upload> </el-upload>
<div style="padding: 0 0 30px 0;text-align: right;"> <div style="padding: 0 0 30px 0;text-align: right;">
<el-button type="success" icon="Plus" @click="addBtn" style="margin-bottom: 10px;">
添加
</el-button>
<div style="padding: 20px 50px;text-align: left;font-weight: 700;" v-if="addForm.locationModels.length > 0">办理点信息</div>
<el-form v-for="(item,index) in addForm.locationModels" :key="index" label-width="150" :rules="rules"> <el-form v-for="(item,index) in addForm.locationModels" :key="index" label-width="150" :rules="rules">
<div style="padding: 20px 50px;text-align: left;font-weight: 700;" v-if="addForm.locationModels.length > 0">{{item.isVerity?'办理点信息':'禁止办理点信息'}}</div>
<el-form-item label="名称:" prop="name" > <el-form-item label="名称:" prop="name" >
<div style="width: 100%"> <div style="width: 100%">
<el-input maxlength="60" v-trim clearable v-model="item.name" placeholder="请输入办理点名称" /> <el-input maxlength="60" v-trim clearable v-model="item.name" placeholder="请输入办理点名称" />
删除 删除
</el-button> </el-button>
</el-form> </el-form>

<el-button type="success" style="margin-top: 20px;" icon="Plus" @click="addBtn(true)" >
添加办理点信息
</el-button>
<el-button type="default" icon="Plus" @click="addBtn(false)" style="margin-top: 20px;">
添加禁止办理点信息
</el-button>
</div> </div>
</template> </template>
const dataFormRef = ref() const dataFormRef = ref()
const url = ref() const url = ref()
const servicehallId = ref() const servicehallId = ref()
const isVerity = ref()
const data = { bucket: 'default-bucket' } const data = { bucket: 'default-bucket' }
const parentSelectList = ref([] as IObject[]) const parentSelectList = ref([] as IObject[])
const upload = ref<UploadInstance>() const upload = ref<UploadInstance>()
getAgencyList() getAgencyList()
}) })
// 添加 // 添加
const addBtn = () => {
const addBtn = (start) => {
addForm.value.locationModels.push({ addForm.value.locationModels.push({
isVerity: start, // 可办理地点true/禁入区域false
address: '', address: '',
latitude: '', latitude: '',
longitude: '', longitude: '',
const { ossFilePath, originalFileName } = response.data const { ossFilePath, originalFileName } = response.data
url.value = 'default-bucket' + '/' + ossFilePath url.value = 'default-bucket' + '/' + ossFilePath
console.log(url.value, originalFileName) console.log(url.value, originalFileName)
BaseService.postN('/userw/serviceHall/registerLocationBath', { excelFileUrl: url.value, serviceHallId:servicehallId.value}).then((res: any) => {
BaseService.postN('/userw/serviceHall/registerLocationBath', { excelFileUrl: url.value, serviceHallId:servicehallId.value,isVerity:isVerity.value}).then((res: any) => {
if (res && res.code === 0) { if (res && res.code === 0) {
console.log(res) console.log(res)
const errUrl = res.data?.path ?? '' const errUrl = res.data?.path ?? ''
url.value = '' url.value = ''
} }
} }
}).catch((err) => {
ElMessage.success(err);
}) })
} }
const handleExceed: UploadProps['onExceed'] = (files) => { const handleExceed: UploadProps['onExceed'] = (files) => {
titleDialog: '', //table 标题 titleDialog: '', //table 标题
dataListLoading: false, dataListLoading: false,
operateTitle: '操作', //操作栏标题(默认为"") operateTitle: '操作', //操作栏标题(默认为"")
operateWidth: "350px", //操作栏宽度
operateWidth: "500px", //操作栏宽度
crud: { crud: {
add: IsPermission(route, 'ADD_BASE'), add: IsPermission(route, 'ADD_BASE'),
}, },
return newData return newData
} }
//导入 //导入
function handleImport(row) {
function handleImport(row,start) {
servicehallId.value = row.servicehallId servicehallId.value = row.servicehallId
isVerity.value = start
} }
//模板下载 //模板下载
function handleFileName() { function handleFileName() {

Loading…
Cancel
Save