qsh 5 days ago
parent 9cdfa01d33
commit 72341a96a5
  1. 18
      src/views/Clue/Order/Comp/AfterSales.vue
  2. 17
      src/views/Clue/Order/Comp/Reback.vue
  3. 4
      src/views/Profile/components/UserSocial.vue

@ -83,6 +83,18 @@
style="width: 240px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
<el-form-item> <el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']"> <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
查询 查询
@ -189,6 +201,7 @@
<script setup name="AfterSales"> <script setup name="AfterSales">
import * as AfterSaleApi from '@/api/clue/afterSale' import * as AfterSaleApi from '@/api/clue/afterSale'
import { getSimpleUserList as getUserOption } from '@/api/system/user' import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue' import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
@ -292,7 +305,12 @@ function handleAudit(row) {
afterSaleAuditDialog.value.open(row) afterSaleAuditDialog.value.open(row)
} }
const areaOptions = ref([])
function getOptions() { function getOptions() {
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => { getUserOption().then((data) => {
userOptions.value = data userOptions.value = data
}) })

@ -94,6 +94,16 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template> </template>
<el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2"> <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
<el-select <el-select
@ -404,6 +414,7 @@ import * as FeebackApi from '@/api/clue/payment'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user' import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getPlaceList } from '@/api/school/place' import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class' import { getClassTypeList } from '@/api/school/class'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { DICT_TYPE, getDictOptions } from '@/utils/dict' import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
@ -471,6 +482,7 @@ function handleReset() {
signSchool: undefined, signSchool: undefined,
signPlace: undefined, signPlace: undefined,
signClass: undefined, signClass: undefined,
area: undefined,
pageNo: 1, pageNo: 1,
pageSize: 20 pageSize: 20
} }
@ -541,12 +553,17 @@ function handleAudit(row) {
feebackDialog.value.open(row) feebackDialog.value.open(row)
} }
const areaOptions = ref([])
function getOptions() { function getOptions() {
// //
getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => { getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
schoolOptions.value = data.schoolList schoolOptions.value = data.schoolList
allPlaceOptions.value = data.placeList allPlaceOptions.value = data.placeList
}) })
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => { getUserOption().then((data) => {
userOptions.value = data userOptions.value = data
}) })

@ -61,8 +61,8 @@ const bindSocial = () => {
}) })
} }
const bind = (row) => { const bind = (row) => {
message.info('暂未开放,敬请期待') // message.info('')
return // return
const redirectUri = location.origin + '/user/profile?type=' + row.type const redirectUri = location.origin + '/user/profile?type=' + row.type
// //
socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => { socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {

Loading…
Cancel
Save