yujialong 10 months ago
parent 11902a5aa9
commit b3cc7fc97f
  1. 16
      src/layouts/header/index.vue
  2. 41
      src/pages/activity/manage/matchSignup.vue
  3. 11
      src/pages/miniProgramMg/index/banner/add/index.vue
  4. 11
      src/pages/miniProgramMg/index/hot/add/index.vue
  5. 11
      src/pages/preschool/manage/auth.vue
  6. 6
      src/pages/preschool/manage/basic.vue
  7. 13
      src/pages/supplier/manage/auth.vue
  8. 6
      src/pages/supplier/manage/basic.vue
  9. 28
      src/pages/user/list/index.vue
  10. 2
      src/setting.js
  11. 11
      src/styles/common.scss

@ -23,7 +23,7 @@
</div>
</template>
<script>
import { mapState, mapActions } from 'vuex'
import { mapState, mapMutations, mapActions } from 'vuex'
import breadcrumb from '@/components/breadcrumb'
import Setting from '@/setting'
import Util from '@/libs/util'
@ -32,6 +32,7 @@ export default {
return {
sites: [],
crumbRefresh: true,
info: {}
};
},
components: {
@ -54,12 +55,23 @@ export default {
},
},
mounted () {
this.getInfo()
},
methods: {
...mapMutations('user', [
'setAvatar', 'setUserName'
]),
...mapActions("user", [
'logout'
]),
//
getInfo () {
this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
const info = result.hrUserInfo
this.setUserName(info.userName)
this.setAvatar(info.userAvatars)
}).catch(err => { })
},
//
userCommand (command) {
if (command == 'person') {

@ -25,10 +25,6 @@
:value="item.id"></el-option>
</el-select>
</li>
</ul>
</div>
<div class="tool">
<ul class="filter">
<li>
<label>签到情况</label>
<el-select v-model="form.signInStatus"
@ -151,8 +147,8 @@
style="width: 100%">
<el-option v-for="(item, i) in orgs"
:key="i"
:label="item.schoolName"
:value="item.schoolId"></el-option>
:label="item.organizationName"
:value="item.teamId"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="memberForm.id"
@ -160,6 +156,7 @@
label="签到时间">
<el-date-picker v-model="memberForm.signInTime"
style="width: 100%"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="请选择">
</el-date-picker>
@ -177,14 +174,14 @@
</template>
<script>
import util from "@/libs/util";
import Util from "@/libs/util";
import axios from 'axios'
import Setting from "@/setting";
export default {
name: "matchSignup",
data () {
return {
token: util.local.get(Setting.tokenKey),
token: Util.local.get(Setting.tokenKey),
id: this.$route.query.id,
teamId: this.$route.query.teamId,
form: {
@ -316,13 +313,11 @@ export default {
})
.then(() => {
this.$post(`${this.api.delActivityApplicant}?id=${row.id}`).then(res => {
util.successMsg("删除成功");
Util.successMsg("删除成功");
this.getData();
}).catch(res => {
});
}).catch(res => { });
})
.catch(() => {
});
.catch(() => { });
},
//
sortChange (column) {
@ -341,7 +336,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
Util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
}).catch(res => { })
} else {
axios.get(`${this.api.excelExportCom}?competitionId=${this.id}`, {
@ -350,7 +345,7 @@ export default {
},
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
Util.downloadFileDirect(`报名人员.xls`, new Blob([res.data]))
}).catch(res => { })
}
},
@ -361,7 +356,11 @@ export default {
this.timer = setTimeout(async () => {
const { data } = await this.$post(`${this.api.getOrganizationInformationByPhone}?phone=${val}`)
const peoole = data.find(e => !e.organizationName) //
const org = data.find(e => e.organizationName) //
const orgs = data.filter(e => e.platformId === '幼儿园' || e.platformId === '供应商') //
orgs.forEach(e => {
if (!e.organizationName) e.organizationName = e.userName
})
this.orgs = orgs
this.memberForm.username = peoole.userName
this.memberForm.accountId = peoole.accountId
// this.memberForm.username = org.organizationName
@ -369,11 +368,13 @@ export default {
}
},
//
edit (row, disalbed) {
async edit (row, disalbed) {
// const res = await this.$post(`${this.api.detailsOfApplicants}?competitionId=${this.id}&accountId=${row.accountId}`)
row.phone && this.phoneChange(row.phone)
this.memberForm = {
accountId: row.accountId,
identification: 1,
signInTime: row.createTime,
signInTime: row.signInStatus === '待签到' ? '' : new Date(),
teamId: '',
phone: row.phone,
username: row.username,
@ -405,10 +406,12 @@ export default {
if (valid) {
if (this.submiting) return false
this.submiting = true
const form = this.memberForm
const form = JSON.parse(JSON.stringify(this.memberForm))
form.competitionId = this.id
if (!form.signInTime) form.signInTime = Util.formatDate('yyyy-MM-dd hh:mm:ss', new Date())
await this.$post(this.api[form.id ? 'editRegistrationInformation' : 'addNewApplicantsInTheBackground'], form)
this.memberVisible = false
this.submiting = false
this.getData()
}
})

@ -397,15 +397,4 @@ $upload-lg-height: 150px;
}
}
}
/deep/.req {
.el-form-item__label {
&:before {
content: '*';
margin-right: 5px;
font-size: 18px;
vertical-align: middle;
color: #f00;
}
}
}
</style>

@ -341,15 +341,4 @@ export default {
</script>
<style scoped lang="scss">
/deep/.req {
.el-form-item__label {
&:before {
content: '*';
margin-right: 5px;
font-size: 18px;
vertical-align: middle;
color: #f00;
}
}
}
</style>

@ -4,6 +4,7 @@
<span v-if="form.auditStatus !== '' && !editing"
class="status">{{ auditStatus.find(e => e.id === form.auditStatus).name }}</span>
<el-button v-if="!editing"
type="primary"
@click="edit">编辑</el-button>
</div>
<el-form label-width="170px"
@ -13,6 +14,7 @@
:disabled="!editing">
<el-form-item label="认证状态">
<el-select v-model="form.authenticationStatus"
class="req"
clearable>
<el-option v-for="(item, i) in authenticationStatus"
:key="i"
@ -20,17 +22,20 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="幼儿园名称">
<el-form-item label="幼儿园名称"
class="req">
<div class="d-inline-block">
<el-input v-model="form.companyName" />
</div>
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-form-item label="统一社会信用代码"
class="req">
<div class="d-inline-block">
<el-input v-model="form.creditCode" />
</div>
</el-form-item>
<el-form-item label="法人">
<el-form-item label="法人"
class="req">
<div class="d-inline-block">
<el-input v-model="form.legalPerson" />
</div>

@ -30,7 +30,8 @@
</div>
</el-upload>
</el-form-item>
<el-form-item label="幼儿园名称">
<el-form-item label="幼儿园名称"
class="req">
<div class="d-inline-block">
<el-input v-model="form.classificationName" />
</div>
@ -348,6 +349,9 @@ export default {
}
}
}
.input-form.model {
height: calc(100vh - 310px);
}
$upload-width: 140px;
$upload-height: 140px;
$upload-lg-height: 150px;

@ -4,6 +4,7 @@
<span v-if="form.auditStatus !== '' && !editing"
class="status">{{ auditStatus.find(e => e.id === form.auditStatus).name }}</span>
<el-button v-if="!editing"
type="primary"
@click="edit">编辑</el-button>
</div>
<el-form label-width="170px"
@ -11,7 +12,8 @@
class="input-form model"
size="small"
:disabled="!editing">
<el-form-item label="认证状态">
<el-form-item label="认证状态"
class="req">
<el-select v-model="form.authenticationStatus"
clearable>
<el-option v-for="(item, i) in authenticationStatus"
@ -20,17 +22,20 @@
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商名称">
<el-form-item label="供应商名称"
class="req">
<div class="d-inline-block">
<el-input v-model="form.companyName" />
</div>
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-form-item label="统一社会信用代码"
class="req">
<div class="d-inline-block">
<el-input v-model="form.creditCode" />
</div>
</el-form-item>
<el-form-item label="法人">
<el-form-item label="法人"
class="req">
<div class="d-inline-block">
<el-input v-model="form.legalPerson" />
</div>

@ -30,7 +30,8 @@
</div>
</el-upload>
</el-form-item>
<el-form-item label="供应商名称">
<el-form-item label="供应商名称"
class="req">
<div class="d-inline-block">
<el-input v-model="form.classificationName" />
</div>
@ -392,6 +393,9 @@ export default {
}
}
}
.input-form.model {
height: calc(100vh - 310px);
}
$upload-width: 140px;
$upload-height: 140px;
$upload-lg-height: 150px;

@ -4,19 +4,19 @@
<ul class="filter">
<li>
<label>来源</label>
<el-select v-model="form.platformId"
<el-select v-model="form.source"
clearable
placeholder="请选择来源"
@change="initData">
<el-option v-for="item in platformList"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
:label="item.name"
:value="item.id"></el-option>
</el-select>
</li>
<li>
<label>用户端权限</label>
<el-select v-model="form.platformId1"
<el-select v-model="form.platformId"
clearable
placeholder="请选择用户端权限"
@change="initData">
@ -151,9 +151,7 @@ export default {
searchTimer: null,
form: {
name: '',
countries: '中国',
provinces: '',
city: '',
source: '',
platformId: '',
keyword: '',
date: '',
@ -189,8 +187,16 @@ export default {
}],
platformList: [
{
value: '',
label: '不限'
id: '',
name: '不限'
},
{
id: 1,
name: '自行注册'
},
{
id: 2,
name: '邀请'
},
],
platformSource: Const.platformSource,
@ -240,9 +246,7 @@ export default {
getData () {
this.loading = true
this.$post(this.api.queryUserInfoList, {
countries: this.form.countries,
provinceId: this.form.provinces,
cityId: this.form.city,
source: this.form.source,
platformId: this.form.platformId,
month: this.form.month,
creationTime: this.form.startTime,

@ -5,7 +5,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/`
if (isDev) {
host = 'http://124.71.79.122/'
// host = 'http://192.168.31.51:10010/'
host = 'http://192.168.31.217:10010/'
}
const Setting = {

@ -183,6 +183,17 @@
vertical-align: -4px;
color: #f5222d;
}
.req {
.el-form-item__label {
&:before {
content: '*';
margin-right: 5px;
font-size: 18px;
vertical-align: middle;
color: #f00;
}
}
}
}
.btns {
position: absolute;

Loading…
Cancel
Save