server_commit
This commit is contained in:
zhaoxinyu
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -35,6 +35,10 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="成果" :span="2">
|
||||
<file-upload :files="viewData.resultsFiles"
|
||||
:view="true"></file-upload>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label="附件" name="100">
|
||||
|
||||
@@ -28,7 +28,7 @@ class AlertMenu extends BtnMenu {
|
||||
|
||||
clickHandler() {
|
||||
const _this = this
|
||||
const inputFileElement = document.querySelector('#' + this.editor.textElemId).parentElement.parentElement.nextElementSibling
|
||||
const inputFileElement = document.querySelector('#'+this.editor.textElemId).parentElement.parentElement.nextElementSibling
|
||||
inputFileElement.click()
|
||||
inputFileElement.addEventListener('change', function () {
|
||||
const file = this.files[0];
|
||||
@@ -160,8 +160,9 @@ module.exports = {
|
||||
// if (_this.isEmptyEditor()) {
|
||||
// content = ''
|
||||
// }
|
||||
_this.$emit('input', content)
|
||||
_this.$emit('catchData', content, text)
|
||||
const newContent = content.replaceAll('<img', '<image');
|
||||
_this.$emit('input', newContent)
|
||||
_this.$emit('catchData', newContent, text)
|
||||
}
|
||||
|
||||
//配置图片上传
|
||||
@@ -172,7 +173,7 @@ module.exports = {
|
||||
Promise.all(_this.uploadFiles(resultFiles)).then(res => {
|
||||
res.forEach(v => {
|
||||
if (v.code === 0) {
|
||||
insertImgFn(CREATE_PREVIEW_URL(v.data.filepath))
|
||||
insertImgFn(APP_DOMAIN + CREATE_PREVIEW_URL(v.data.filepath))
|
||||
} else {
|
||||
ELEMENT.message.warning('图片上传失败')
|
||||
}
|
||||
|
||||
@@ -65,6 +65,8 @@
|
||||
<script src="${base!}/assets/platform/plugins/echarts/westeros.js"></script><!--主题-->
|
||||
<script src="${base!}/assets/platform/plugins/echarts/walden.js"></script><!--主题-->
|
||||
<script src="${base!}/assets/platform/plugins/echarts/macarons.js"></script><!--主题-->
|
||||
<script src="${base!}/assets/platform/plugins/echarts/echarts.js"></script>
|
||||
<script src="${base!}/assets/platform/plugins/echarts/langZH.js"></script>
|
||||
<!-- <script src="https://cdn.staticfile.org/echarts/5.2.2/echarts.js"></script>-->
|
||||
<!-- <script src="https://cdn.staticfile.org/echarts/5.2.2/i18n/langZH.js"></script>-->
|
||||
|
||||
|
||||
@@ -9,10 +9,11 @@
|
||||
/>
|
||||
<van-number-keyboard safe-area-inset-bottom/>
|
||||
<title></title>
|
||||
<link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/index.min.css"/>
|
||||
<!-- <link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/index.min.css"/>-->
|
||||
|
||||
<link rel="stylesheet" href="${base!}/assets/mobile/css/theme.css">
|
||||
<link rel="stylesheet" href="${base!}/assets/mobile/css/main.css">
|
||||
<link rel="stylesheet" href="${base!}/assets/platform/plugins/vant/vant.css">
|
||||
|
||||
<script>
|
||||
window._AMapSecurityConfig = {
|
||||
@@ -21,7 +22,8 @@
|
||||
</script>
|
||||
|
||||
<script src="${base!}/assets/platform/plugins/vue/vue.min.js"></script>
|
||||
<script src="${base!}/assets/platform/plugins/vant/vant.min.js"></script>
|
||||
<script src="${base!}/assets/platform/plugins/vant/vant.js"></script>
|
||||
<!-- <script src="${base!}/assets/platform/plugins/vant/vant.min.js"></script>-->
|
||||
<script src="${base!}/assets/platform/plugins/vue-loader/httpVueLoader.js"></script>
|
||||
<script src="${base!}/assets/mobile/js/basic.js?v=0.0.1"></script>
|
||||
|
||||
|
||||
@@ -245,9 +245,9 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-table :data="hasApplyUserTableData" border height="480" size="mini">
|
||||
<el-table-column align="center" header-align="center" label="序号"
|
||||
type="index"
|
||||
type="index" fixed
|
||||
width="70"></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="姓名"
|
||||
<el-table-column align="center" header-align="center" label="姓名" fixed
|
||||
prop="username" width="100"></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="工号"
|
||||
prop="loginname" width="120"></el-table-column>
|
||||
@@ -276,7 +276,19 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="获奖名称">
|
||||
<el-table-column align="center" header-align="center" label="上车地点" width="200">
|
||||
<template scope="{row}">
|
||||
<div>
|
||||
<el-select v-model="row.scdd" placeholder="请选择上车地点" :disabled="row.bmzt&&row.bmzt!=4">
|
||||
<el-option label="西康路校区" value="西康路校区"></el-option>
|
||||
<el-option label="江宁校区" value="江宁校区"></el-option>
|
||||
<el-option label="常州新校区（金坛）" value="常州新校区（金坛）"></el-option>
|
||||
<el-option label="常州老校区" value="常州老校区"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="获奖名称" width="250">
|
||||
<template scope="{row}">
|
||||
<div class="tableInput">
|
||||
<el-input :disabled="row.bmzt&&row.bmzt!=4" :rows="2"
|
||||
@@ -286,7 +298,7 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="备注">
|
||||
<el-table-column align="center" header-align="center" label="备注" width="250">
|
||||
<template scope="{row}">
|
||||
<div class="tableInput">
|
||||
<el-input :disabled="row.bmzt&&row.bmzt!=4" :rows="2"
|
||||
@@ -715,10 +727,10 @@ display: -webkit-box;
|
||||
}
|
||||
if (flag) {
|
||||
for (let i = 0; i < array.length; i++) {
|
||||
if (array[i].files === undefined) {
|
||||
this.$message.warning("请选择上传材料!")
|
||||
return
|
||||
}
|
||||
// if (array[i].files === undefined) {
|
||||
// this.$message.warning("请选择上传材料!")
|
||||
// return
|
||||
// }
|
||||
if (!array[i].idcard) {
|
||||
this.$message.warning("请填写身份证号!")
|
||||
return
|
||||
@@ -727,6 +739,10 @@ display: -webkit-box;
|
||||
this.$message.warning("请填写手机号!")
|
||||
return
|
||||
}
|
||||
if (!array[i].scdd) {
|
||||
this.$message.warning("请选择上车地点!")
|
||||
return
|
||||
}
|
||||
}
|
||||
const confirm = await this.$confirm('是否提交，提交后表示分工会审核通过！', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
|
||||
@@ -58,15 +58,30 @@ layout("/layouts/platform.html"){
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-input placeholder="请输入工号或姓名" v-model="pageForm.searchKey"></el-input>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-select v-model="pageForm.scdd" placeholder="请选择上车地点" clearable>
|
||||
<el-option label="西康路校区" value="西康路校区"></el-option>
|
||||
<el-option label="江宁校区" value="江宁校区"></el-option>
|
||||
<el-option label="常州新校区（金坛）" value="常州新校区（金坛）"></el-option>
|
||||
<el-option label="常州老校区" value="常州老校区"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-select v-model="pageForm.bmzt" placeholder="请选择审核状态" clearable>
|
||||
<el-option label="待校工会审核" :value="3"></el-option>
|
||||
<el-option label="校工会审核不通过" :value="4"></el-option>
|
||||
<el-option label="报名成功" value="5"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
|
||||
<div class="btn-group tool-button mt5">
|
||||
<el-button @click="doSearch" icon="el-icon-search" type="primary"></el-button>
|
||||
</div>
|
||||
|
||||
<div class="pull-right offscreen-right mt5">
|
||||
<el-button :disabled="!pageForm.hdid" @click="$refs.customMessage.open()"
|
||||
type="primary">一键发送
|
||||
</el-button>
|
||||
<!-- <el-button :disabled="!pageForm.hdid" @click="$refs.customMessage.open()"-->
|
||||
<!-- type="primary">一键发送-->
|
||||
<!-- </el-button>-->
|
||||
<el-button @click="doExport" icon="el-icon-download" type="primary">导 出</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
@@ -94,7 +109,23 @@ layout("/layouts/platform.html"){
|
||||
prop="unionname" show-overflow-tooltip sortable></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="单位"
|
||||
prop="unitname" show-overflow-tooltip sortable></el-table-column>
|
||||
|
||||
<el-table-column align="center" header-align="center" label="上车地点"
|
||||
prop="scdd" show-overflow-tooltip sortable></el-table-column>
|
||||
<el-table-column align="center" header-align="center"
|
||||
label="审核状态" width="100">
|
||||
<template scope="{row}">
|
||||
<span class="text-primary" v-if="row.bmzt==1">待分工会审核</span>
|
||||
<span class="text-danger"
|
||||
v-else-if="row.bmzt==2">分工会审核不通过</span>
|
||||
<span class="text-primary"
|
||||
v-else-if="row.bmzt==3">待校工会审核</span>
|
||||
<span class="text-danger"
|
||||
v-else-if="row.bmzt==4">校工会审核不通过</span>
|
||||
<span class="text-success"
|
||||
v-else-if="row.bmzt==5">报名成功</span>
|
||||
<span class="text-muted" v-else>预选</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column align="center" fixed="right" header-align="center" label="操作"
|
||||
width="180px">
|
||||
@@ -242,6 +273,7 @@ display: -webkit-box;
|
||||
hdid: "",
|
||||
year: "",
|
||||
ghid: "",
|
||||
bmzt: "",
|
||||
searchKey: "",
|
||||
pageNumber: 1,
|
||||
pageSize: 10,
|
||||
@@ -305,7 +337,10 @@ display: -webkit-box;
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(async () => {
|
||||
window.location.href = '/platform/zgfw/lxy/hdtj/doExport?hdid=' + this.pageForm.hdid + '&ghid=' + this.pageForm.ghid + '&hdname=' + obj.name
|
||||
window.location.href = '/platform/zgfw/lxy/hdtj/doExport?hdid=' + this.pageForm.hdid
|
||||
+ '&ghid=' + this.pageForm.ghid
|
||||
+ '&bmzt=' + this.pageForm.bmzt
|
||||
+ '&hdname=' + obj.name
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
@@ -170,7 +170,9 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column align="center" header-align="center" label="手机号码"
|
||||
prop="mobile"></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="身份证号"
|
||||
prop="idcard"></el-table-column>
|
||||
prop="idcard" width="200"></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="上车地点"
|
||||
prop="scdd"></el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="获奖名称"
|
||||
prop="zyhj"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
@@ -279,6 +281,11 @@ layout("/layouts/platform.html"){
|
||||
{{ viewData.idcard }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="上车地点：">
|
||||
{{ viewData.scdd }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="获奖名称：">
|
||||
{{ viewData.zyhj }}
|
||||
|
||||
@@ -59,9 +59,9 @@
|
||||
<el-tab-pane label="名额分配信息" name="2">
|
||||
<!--#include("/platform/zgfw/lxy/dialogViewFp.html"){}#-->
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="报名人员信息" name="3">
|
||||
<!--#include("/platform/zgfw/lxy/dialogViewBm.html"){}#-->
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label="报名人员信息" name="3">-->
|
||||
<!-- <!–#include("/platform/zgfw/lxy/dialogViewBm.html"){}#–>-->
|
||||
<!-- </el-tab-pane>-->
|
||||
</el-tabs>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
|
||||
Reference in New Issue
Block a user