server_commit
This commit is contained in:
@@ -265,12 +265,12 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column align="center" header-align="center" label="上传时间" prop="hdsbsj"
|
||||
show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="申请状态"
|
||||
<!--<el-table-column align="center" header-align="center" label="申请状态"
|
||||
prop="auditState" sortable>
|
||||
<template scope="scope">
|
||||
<span :style="'color:'+scope.row.statecolor">{{scope.row.statename}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>-->
|
||||
<!-- <el-table-column align="center" header-align="center" label="总点赞数"
|
||||
prop="dz_znum" sortable>
|
||||
<template scope="scope">
|
||||
|
||||
@@ -721,9 +721,9 @@ layout("/layouts/platform.html"){
|
||||
// this.getActivitybxAgenda();
|
||||
this.getDifficultAgenda();
|
||||
this.getCondolenceAgenda();
|
||||
this.getTaAgenda();
|
||||
// this.getTaAgenda();
|
||||
this.getRxdjAgenda();
|
||||
this.getMemberAgenda();
|
||||
// this.getMemberAgenda();
|
||||
this.getSyrAgenda();
|
||||
this.getOfferAdviceAgenda()
|
||||
}
|
||||
|
||||
@@ -187,7 +187,7 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="资料阅览" :visible.sync="viewDialogVisible">
|
||||
<el-dialog title="资料阅览" :visible.sync="viewDialogVisible" :modal-append-to-body="false">
|
||||
<el-descriptions class="margin-top" title="" :column="2" border>
|
||||
<el-descriptions-item span="2">
|
||||
<template slot="label">资料名称</template>
|
||||
|
||||
@@ -193,11 +193,11 @@ layout("/layouts/platform.html"){
|
||||
<el-col :lg="24" :sm="24">
|
||||
<el-form-item required label="附件上传" prop="files">
|
||||
<file-upload :files.sync="formData.files" card :max="10"
|
||||
:type="['doc','docx','xls','xlsx','pdf','ppt','mp4', 'jpg', 'png', 'jpeg']">
|
||||
:type="['doc','docx','xls','xlsx','pdf','ppt', 'jpg', 'png', 'jpeg']">
|
||||
<template #el-upload__tip>
|
||||
</template>
|
||||
</file-upload>
|
||||
<div class="el-upload__tip">可上传照片、视频、文档等资料,视频只能上传MP4格式</div>
|
||||
<div class="el-upload__tip">可上传照片、文档等资料</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -248,7 +248,7 @@ layout("/layouts/platform.html"){
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
setTimeout(() => {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/mine')
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/mine')
|
||||
}, 500)
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
@@ -270,7 +270,7 @@ layout("/layouts/platform.html"){
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
setTimeout(() => {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/mine')
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/mine')
|
||||
}, 500)
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
@@ -296,7 +296,7 @@ layout("/layouts/platform.html"){
|
||||
this.$set(this.formData, 'applyTime', moment().format('YYYY-MM-DD'))
|
||||
this.$set(this.formData, 'unionName', "${@shiro.getPrincipalProperty('union').getUnionname()}")
|
||||
} else {
|
||||
const resp = await $.get('/platform/wakeshome/declaration/mine/getInfoById',{id:this.id})
|
||||
const resp = await $.get('/platform/wakeshome/info/mine/getInfoById',{id:this.id})
|
||||
if (resp.code === 0){
|
||||
this.formData = {...resp.data}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ layout("/layouts/platform.html"){
|
||||
</el-button>
|
||||
<el-button @click="openEdit(row)"
|
||||
size="mini" type="primary"
|
||||
v-if="[8100].includes(row.state) || !row.state">编辑
|
||||
v-if="[8100,8125].includes(row.state) || !row.state">编辑
|
||||
</el-button>
|
||||
<el-button @click="doDelete(row)"
|
||||
size="mini" type="danger"
|
||||
@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
},
|
||||
openEdit(row) {
|
||||
sublime.jumpPagePjax('/platform/wakeshome/declaration/apply?id=' + row.id)
|
||||
sublime.jumpPagePjax('/platform/wakeshome/info/apply?id=' + row.id)
|
||||
},
|
||||
async flushUnits() {
|
||||
this.$set(this.pageForm, "unitId", null)
|
||||
|
||||
@@ -164,7 +164,7 @@ layout("/layouts/platform.html"){
|
||||
align="center">
|
||||
<template scope="{row}">
|
||||
<el-input v-model="row.inspection"
|
||||
readonly></el-input>
|
||||
readonly type="textarea" rows="4"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@@ -286,7 +286,7 @@ layout("/layouts/platform.html"){
|
||||
'union-comment-zb': httpVueLoader('/components/wakeshome/review/UnionCommentZb.vue?v=' + moment(new Date()).unix()),
|
||||
'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
|
||||
},
|
||||
methods: {
|
||||
methods: async {
|
||||
async openReview(row){
|
||||
const resp = await $.get(loc() + "/getPeoId",{id:row.id})
|
||||
if (resp.code === 0) {
|
||||
@@ -376,7 +376,7 @@ layout("/layouts/platform.html"){
|
||||
bzList.push(o)
|
||||
})
|
||||
})
|
||||
this.formData.bzList = bzList
|
||||
this.formData.bzList = JSON.stringify(bzList)
|
||||
this.formData.id = this.id
|
||||
this.formData.president = this.president
|
||||
this.formData.files = JSON.stringify(this.formData.files)
|
||||
|
||||
Reference in New Issue
Block a user