|
|
@@ -97,10 +97,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column min-width="120" align="center" prop="createTime" label="上传时间"></el-table-column>
|
|
|
- <el-table-column fixed="right" align="center" label="操作" width="160px" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column fixed="right" align="center" label="操作" width="160px"
|
|
|
+ class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" size="small" @click="handleClickViewCite(scope.row, 'view')">查看</el-button>
|
|
|
- <el-button v-if="scope.row.status=='12' || scope.row.status=='22'" type="success" size="small" @click="handleClickViewCite(scope.row, 'edit')">修改</el-button>
|
|
|
+ <el-button v-if="scope.row.status == '12' || scope.row.status == '22'" type="success" size="small"
|
|
|
+ @click="handleClickViewCite(scope.row, 'edit')">修改</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -179,12 +181,14 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column min-width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
|
|
|
-
|
|
|
-
|
|
|
- <el-table-column fixed="right" align="center" label="操作" width="160px" class-name="small-padding fixed-width">
|
|
|
+
|
|
|
+
|
|
|
+ <el-table-column fixed="right" align="center" label="操作" width="160px"
|
|
|
+ class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" size="small" @click="handleClickView(scope.row, 'view')">查看</el-button>
|
|
|
- <el-button v-if="scope.row.status=='21' || scope.row.status=='31'" type="success" size="small" @click="handleClickView(scope.row, 'edit')">修改</el-button>
|
|
|
+ <el-button v-if="scope.row.status == '21' || scope.row.status == '31'" type="success" size="small"
|
|
|
+ @click="handleClickView(scope.row, 'edit')">修改</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -201,7 +205,7 @@
|
|
|
<div v-else v-html="integralRules"></div>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="积分充值" name="fifth">
|
|
|
- <Ipay v-if="activeName=='fifth'"></Ipay>
|
|
|
+ <Ipay v-if="activeName == 'fifth'"></Ipay>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="抖音叶盏点赞活动" name="sixth">
|
|
|
<el-table size="small" :data="dataListZan" border style="margin-top: 20px;width: 960px">
|
|
|
@@ -227,9 +231,11 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column fixed="right" align="center" label="操作" width="80px" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column fixed="right" align="center" label="操作" width="80px"
|
|
|
+ class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button :disabled="scope.row.uploadStatus=='未上传' ? false : true" type="primary" size="small" @click="handleClickViewZan(scope.row.id)">上传</el-button>
|
|
|
+ <el-button :disabled="scope.row.uploadStatus == '未上传' ? false : true" type="primary" size="small"
|
|
|
+ @click="handleClickViewZan(scope.row.id)">上传</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -267,70 +273,78 @@
|
|
|
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisibleCite" width="40%">
|
|
|
<el-form :rules="rulesCite" ref="dataFormCite" :model="dataFormCite" label-width="100px">
|
|
|
<el-form-item label="表彰类型:" prop="type">
|
|
|
- <el-select :disabled="dialogStatus=='view'?true:false" clearable size="small" style="width: 95%;" v-model="dataFormCite.type" placeholder="请选择表彰类型">
|
|
|
- <el-option v-for="item in typeListCite" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
|
|
|
+ <el-select :disabled="dialogStatus == 'view' ? true : false" clearable size="small" style="width: 95%;"
|
|
|
+ v-model="dataFormCite.type" placeholder="请选择表彰类型">
|
|
|
+ <el-option v-for="item in typeListCite" :key="item.dictValue" :label="item.dictLabel"
|
|
|
+ :value="item.dictValue">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="dataFormCite.type == '1'" label="集体人员:" prop="groupIds">
|
|
|
- <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormCite.groupIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
|
|
|
- style="width: 95%;">
|
|
|
+ <el-select :disabled="dialogStatus == 'view' ? true : false" size="small" v-model="dataFormCite.groupIds" multiple
|
|
|
+ filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
|
|
|
<el-option :key="item.loginId" v-for="item in recipientsList"
|
|
|
:label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="客户名称:" prop="customerName">
|
|
|
- <el-input :disabled="dialogStatus=='view'?true:false" clearable style="width: 95%;" size="small" v-model="dataFormCite.customerName"></el-input>
|
|
|
+ <el-input :disabled="dialogStatus == 'view' ? true : false" clearable style="width: 95%;" size="small"
|
|
|
+ v-model="dataFormCite.customerName"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="表彰名称:" prop="title">
|
|
|
- <el-input :disabled="dialogStatus=='view'?true:false" clearable style="width: 95%;" size="small" v-model="dataFormCite.title"></el-input>
|
|
|
+ <el-input :disabled="dialogStatus == 'view' ? true : false" clearable style="width: 95%;" size="small"
|
|
|
+ v-model="dataFormCite.title"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="表彰描述:" prop="content">
|
|
|
- <el-input :disabled="dialogStatus=='view'?true:false" type="textarea" :rows="5" maxlength="500" show-word-limit style="width: 95%;" size="small"
|
|
|
- v-model="dataFormCite.content"></el-input>
|
|
|
+ <el-input :disabled="dialogStatus == 'view' ? true : false" type="textarea" :rows="5" maxlength="500"
|
|
|
+ show-word-limit style="width: 95%;" size="small" v-model="dataFormCite.content"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="表彰附件:" prop="fileIds">
|
|
|
- <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormCite.files" :on-success="handleAvatarSuccessCite"
|
|
|
- :before-upload="beforeUploadFileCite" :on-remove="handleRemoveCite">
|
|
|
+ <el-upload :disabled="dialogStatus == 'view' ? true : false" :action="fileUrl" :file-list="dataFormCite.files"
|
|
|
+ :on-success="handleAvatarSuccessCite" :before-upload="beforeUploadFileCite" :on-remove="handleRemoveCite">
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
- <el-table v-if="dialogStatus=='create'?false:true" :data="citeLogsList" border size="mini">
|
|
|
- <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
- <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
- <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
- </el-table>
|
|
|
+ <el-table v-if="dialogStatus == 'create' ? false : true" :data="citeLogsList" border size="mini">
|
|
|
+ <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
+ <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
+ <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
+ </el-table>
|
|
|
</el-form>
|
|
|
- <span v-if="dialogStatus!='view'" slot="footer" class="dialog-footer">
|
|
|
+ <span v-if="dialogStatus != 'view'" slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" type="primary" @click="submitFormCite">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogVisibleTrain" width="40%">
|
|
|
<el-form :rules="rulesTrain" ref="dataFormTrain" :model="dataFormTrain" label-width="100px">
|
|
|
<el-form-item label="培训主题:" prop="title">
|
|
|
- <el-input :disabled="dialogStatus=='view'?true:false" clearable style="width: 95%;" size="small" v-model="dataFormTrain.title"></el-input>
|
|
|
+ <el-input :disabled="dialogStatus == 'view' ? true : false" clearable style="width: 95%;" size="small"
|
|
|
+ v-model="dataFormTrain.title"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="开始时间:" prop="startTime">
|
|
|
- <el-date-picker :disabled="dialogStatus=='view'?true:false" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
|
|
|
- v-model="dataFormTrain.startTime" placeholder="请选择开始时间" style="width: 95%">
|
|
|
+ <el-date-picker :disabled="dialogStatus == 'view' ? true : false" format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetime" v-model="dataFormTrain.startTime" placeholder="请选择开始时间"
|
|
|
+ style="width: 95%">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结束时间:" prop="endTime">
|
|
|
- <el-date-picker :disabled="dialogStatus=='view'?true:false" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" type="datetime"
|
|
|
- v-model="dataFormTrain.endTime" placeholder="请选择结束时间" style="width: 95%">
|
|
|
+ <el-date-picker :disabled="dialogStatus == 'view' ? true : false" format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss" type="datetime" v-model="dataFormTrain.endTime" placeholder="请选择结束时间"
|
|
|
+ style="width: 95%">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="培训讲师:" prop="lecturer">
|
|
|
- <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.lecturer" filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
|
|
|
+ <el-select :disabled="dialogStatus == 'view' ? true : false" size="small" v-model="dataFormTrain.lecturer"
|
|
|
+ filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
|
|
|
<el-option :key="item.loginId" v-for="item in recipientsList"
|
|
|
:label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="参加人员:" prop="traineeIds">
|
|
|
- <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.traineeIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
|
|
|
- style="width: 95%;">
|
|
|
+ <el-select :disabled="dialogStatus == 'view' ? true : false" size="small" v-model="dataFormTrain.traineeIds"
|
|
|
+ multiple filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
|
|
|
<el-option :key="item.loginId" v-for="item in recipientsList"
|
|
|
:label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
|
|
|
</el-option>
|
|
|
@@ -338,39 +352,42 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="培训内容:" prop="content">
|
|
|
- <el-input :disabled="dialogStatus=='view'?true:false" type="textarea" :rows="5" maxlength="500" show-word-limit style="width: 95%;" size="small"
|
|
|
- v-model="dataFormTrain.content"></el-input>
|
|
|
+ <el-input :disabled="dialogStatus == 'view' ? true : false" type="textarea" :rows="5" maxlength="500"
|
|
|
+ show-word-limit style="width: 95%;" size="small" v-model="dataFormTrain.content"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="培训材料:" prop="materials">
|
|
|
- <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormTrain.materialFiles" :on-success="handleAvatarSuccessTrain"
|
|
|
+ <el-upload :disabled="dialogStatus == 'view' ? true : false" :action="fileUrl"
|
|
|
+ :file-list="dataFormTrain.materialFiles" :on-success="handleAvatarSuccessTrain"
|
|
|
:before-upload="beforeUploadFileTrain" :on-remove="handleRemoveTrain">
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="签到表:" prop="signPhotos">
|
|
|
- <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormTrain.signPhotoFiles" :on-success="handleAvatarSuccessTrain1"
|
|
|
+ <el-upload :disabled="dialogStatus == 'view' ? true : false" :action="fileUrl"
|
|
|
+ :file-list="dataFormTrain.signPhotoFiles" :on-success="handleAvatarSuccessTrain1"
|
|
|
:before-upload="beforeUploadFileTrain" :on-remove="handleRemoveTrain1">
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="现场照片:" prop="sitePhotos">
|
|
|
- <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormTrain.sitePhotoFiles" :on-success="handleAvatarSuccessTrain2"
|
|
|
+ <el-upload :disabled="dialogStatus == 'view' ? true : false" :action="fileUrl"
|
|
|
+ :file-list="dataFormTrain.sitePhotoFiles" :on-success="handleAvatarSuccessTrain2"
|
|
|
:before-upload="beforeUploadFileTrain" :on-remove="handleRemoveTrain2">
|
|
|
<el-button size="small" type="primary">点击上传</el-button>
|
|
|
</el-upload>
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-if="dialogStatus!='view'" label="上传说明:">
|
|
|
+ <el-form-item v-if="dialogStatus != 'view'" label="上传说明:">
|
|
|
<el-card shadow="never" style="width: 95%;padding: 0;min-height: 100px;line-height: normal;">
|
|
|
<div v-html="remarkHtml"></div>
|
|
|
</el-card>
|
|
|
</el-form-item>
|
|
|
- <el-table v-if="dialogStatus=='create'?false:true" :data="trainLogsList" border size="mini">
|
|
|
- <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
- <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
- <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
- </el-table>
|
|
|
+ <el-table v-if="dialogStatus == 'create' ? false : true" :data="trainLogsList" border size="mini">
|
|
|
+ <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
|
|
|
+ <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
|
|
|
+ <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
|
|
|
+ </el-table>
|
|
|
</el-form>
|
|
|
- <span v-if="dialogStatus!='view'" slot="footer" class="dialog-footer">
|
|
|
+ <span v-if="dialogStatus != 'view'" slot="footer" class="dialog-footer">
|
|
|
<el-button size="small" type="primary" @click="submitFormTrain">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
@@ -380,8 +397,11 @@
|
|
|
<el-input clearable style="width: 95%;" size="small" v-model="dataFormZan.tiktokAccount"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="事项" prop="matters">
|
|
|
- <el-checkbox-group v-model="dataFormZan.matters">
|
|
|
- <el-checkbox v-for="item in typeListZan" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel }}</el-checkbox>
|
|
|
+ <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
|
|
|
+ @change="handleCheckAllChange">全选</el-checkbox>
|
|
|
+ <el-checkbox-group v-model="dataFormZan.matters" @change="changeChecked">
|
|
|
+ <el-checkbox v-for="item in typeListZan" :key="item.dictValue" :label="item.dictValue">{{ item.dictLabel
|
|
|
+ }}</el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="证明附件:" prop="fileIds">
|
|
|
@@ -404,7 +424,7 @@
|
|
|
</template>
|
|
|
<script scoped>
|
|
|
import Ipay from '@/views/Ipay.vue'
|
|
|
-import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain,editTrain,remarkHtml } from "@/api/allApi";
|
|
|
+import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain, editTrain, remarkHtml } from "@/api/allApi";
|
|
|
import { zanList, uploadZan } from "@/api/zanApi";
|
|
|
import { handleTree } from '@/utils/index'
|
|
|
export default {
|
|
|
@@ -414,10 +434,9 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
currentPage: 1,
|
|
|
- remarkHtml:'',
|
|
|
- citeLogsList:[],
|
|
|
- typeListZan: [],
|
|
|
- trainLogsList:[],
|
|
|
+ remarkHtml: '',
|
|
|
+ citeLogsList: [],
|
|
|
+ trainLogsList: [],
|
|
|
integralRules: '',
|
|
|
typeList: [],
|
|
|
activeName: 'first',
|
|
|
@@ -510,6 +529,11 @@ export default {
|
|
|
content: '',
|
|
|
},
|
|
|
|
|
|
+ // checkbox全选
|
|
|
+ isIndeterminate: false,
|
|
|
+ checkAll: false,
|
|
|
+ mattersArr: [],
|
|
|
+ typeListZan: [],
|
|
|
dataListZan: [],
|
|
|
dialogVisibleZan: false,
|
|
|
rulesZan: {
|
|
|
@@ -529,7 +553,7 @@ export default {
|
|
|
files: [],
|
|
|
},
|
|
|
|
|
|
- dialogStatus:'',
|
|
|
+ dialogStatus: '',
|
|
|
textMap: {
|
|
|
create: "上传",
|
|
|
edit: "修改",
|
|
|
@@ -546,13 +570,26 @@ export default {
|
|
|
this.getIntegralNotice();
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeChecked(val) {
|
|
|
+ console.log(val, '勾选val')
|
|
|
+ let checkedCount = val.length
|
|
|
+ this.checkAll = checkedCount === this.mattersArr.length
|
|
|
+ this.isIndeterminate = checkedCount > 0 && checkedCount < this.mattersArr.length
|
|
|
+ },
|
|
|
+ handleCheckAllChange(val) {
|
|
|
+ console.log(val, '全选val')
|
|
|
+ this.dataFormZan.matters = val ? this.mattersArr : []
|
|
|
+ this.isIndeterminate = false
|
|
|
+ },
|
|
|
getRemarkHtml(val) {
|
|
|
remarkHtml({ noticeType: val }).then(response => {
|
|
|
- console.log(response.data.data);
|
|
|
- this.remarkHtml = response.data.data.content
|
|
|
- })
|
|
|
+ console.log(response.data.data);
|
|
|
+ this.remarkHtml = response.data.data.content
|
|
|
+ })
|
|
|
},
|
|
|
- handleClickViewZan(id){
|
|
|
+ handleClickViewZan(id) {
|
|
|
+ this.isIndeterminate = false;
|
|
|
+ this.checkAll = false;
|
|
|
this.dialogVisibleZan = true;
|
|
|
this.dataFormZan = {
|
|
|
videoId: id,
|
|
|
@@ -562,11 +599,11 @@ export default {
|
|
|
files: [],
|
|
|
}
|
|
|
},
|
|
|
- handleClickCreate(val){
|
|
|
+ handleClickCreate(val) {
|
|
|
this.dialogStatus = 'create';
|
|
|
- if(val=='上传表彰'){
|
|
|
+ if (val == '上传表彰') {
|
|
|
this.dialogVisibleCite = true;
|
|
|
- this.dataFormCite = {
|
|
|
+ this.dataFormCite = {
|
|
|
type: '',
|
|
|
groupIds: [],
|
|
|
customerName: '',
|
|
|
@@ -575,10 +612,10 @@ export default {
|
|
|
files: [],
|
|
|
content: ''
|
|
|
};
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.dialogVisibleTrain = true;
|
|
|
-
|
|
|
- this.dataFormTrain = {
|
|
|
+
|
|
|
+ this.dataFormTrain = {
|
|
|
title: '',
|
|
|
startTime: '',
|
|
|
endTime: '',
|
|
|
@@ -593,11 +630,11 @@ export default {
|
|
|
content: '',
|
|
|
};
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
handleClickViewCite(row, val) {
|
|
|
this.citeLogsList = row.logs;
|
|
|
- if(row.groupUsers && row.groupUsers.length>0){
|
|
|
+ if (row.groupUsers && row.groupUsers.length > 0) {
|
|
|
let groupIds = [];
|
|
|
for (let i in row.groupUsers) {
|
|
|
groupIds.push(row.groupUsers[i].loginId);
|
|
|
@@ -616,7 +653,7 @@ export default {
|
|
|
this.dataFormCite.files.push({
|
|
|
name: name,
|
|
|
url: url,
|
|
|
- response: { error: "0", data: { url: url,id:id } },
|
|
|
+ response: { error: "0", data: { url: url, id: id } },
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -625,7 +662,7 @@ export default {
|
|
|
},
|
|
|
handleClickView(row, val) {
|
|
|
this.trainLogsList = row.trainLogs;
|
|
|
- if(row.trainees && row.trainees.length>0){
|
|
|
+ if (row.trainees && row.trainees.length > 0) {
|
|
|
let traineeIds = [];
|
|
|
for (let i in row.trainees) {
|
|
|
traineeIds.push(row.trainees[i].loginId);
|
|
|
@@ -644,7 +681,7 @@ export default {
|
|
|
this.dataFormTrain.materialFiles.push({
|
|
|
name: name,
|
|
|
url: url,
|
|
|
- response: { error: "0", data: { url: url,id:id } },
|
|
|
+ response: { error: "0", data: { url: url, id: id } },
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -659,7 +696,7 @@ export default {
|
|
|
this.dataFormTrain.signPhotoFiles.push({
|
|
|
name: name,
|
|
|
url: url,
|
|
|
- response: { error: "0", data: { url: url,id:id } },
|
|
|
+ response: { error: "0", data: { url: url, id: id } },
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -674,7 +711,7 @@ export default {
|
|
|
this.dataFormTrain.sitePhotoFiles.push({
|
|
|
name: name,
|
|
|
url: url,
|
|
|
- response: { error: "0", data: { url: url,id:id } },
|
|
|
+ response: { error: "0", data: { url: url, id: id } },
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -719,11 +756,11 @@ export default {
|
|
|
},
|
|
|
handleClick(tab, event) {
|
|
|
console.log(tab.name, event);
|
|
|
- if(tab.name == 'fourth'){
|
|
|
+ if (tab.name == 'fourth') {
|
|
|
this.getRemarkHtml('trainrule');
|
|
|
this.getDataListTrain();
|
|
|
}
|
|
|
- if(tab.name == 'sixth'){
|
|
|
+ if (tab.name == 'sixth') {
|
|
|
this.getRemarkHtml('interactiveRule');
|
|
|
this.getTypeListZan();
|
|
|
this.getDataListZan()
|
|
|
@@ -823,7 +860,14 @@ export default {
|
|
|
},
|
|
|
getTypeListZan() {
|
|
|
dictList({ dictType: 'matter' }).then(response => {
|
|
|
- this.typeListZan = response.data.data;
|
|
|
+ let dataList = response.data.data;
|
|
|
+ this.typeListZan = dataList;
|
|
|
+ // 勾选的数组绑定的是数组中的item.dictValue
|
|
|
+ let dictValueArr = []
|
|
|
+ dataList.forEach(item => {
|
|
|
+ dictValueArr.push(item.dictValue)
|
|
|
+ })
|
|
|
+ this.mattersArr = dictValueArr
|
|
|
})
|
|
|
},
|
|
|
getAllUserList() {
|
|
|
@@ -871,41 +915,41 @@ export default {
|
|
|
submitFormCite() {
|
|
|
this.$refs['dataFormCite'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if(this.dialogStatus=='create'){
|
|
|
+ if (this.dialogStatus == 'create') {
|
|
|
uploadCite(this.dataFormCite)
|
|
|
- .then((response) => {
|
|
|
- this.dialogVisibleCite = false;
|
|
|
- this.$notify({
|
|
|
- title: "成功",
|
|
|
- message: "表彰上传成功",
|
|
|
- type: "success",
|
|
|
- duration: 2000,
|
|
|
- });
|
|
|
- this.dataFormCite.type = [];
|
|
|
- this.dataFormCite.fileIds = '';
|
|
|
- this.dataFormCite.files = [];
|
|
|
- this.listQueryCite.page = 1;
|
|
|
- this.getDataListCite();
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ .then((response) => {
|
|
|
+ this.dialogVisibleCite = false;
|
|
|
+ this.$notify({
|
|
|
+ title: "成功",
|
|
|
+ message: "表彰上传成功",
|
|
|
+ type: "success",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ this.dataFormCite.type = [];
|
|
|
+ this.dataFormCite.fileIds = '';
|
|
|
+ this.dataFormCite.files = [];
|
|
|
+ this.listQueryCite.page = 1;
|
|
|
+ this.getDataListCite();
|
|
|
+ })
|
|
|
+ .catch(() => { });
|
|
|
}
|
|
|
- if(this.dialogStatus=='edit'){
|
|
|
+ if (this.dialogStatus == 'edit') {
|
|
|
editCite(this.dataFormCite)
|
|
|
- .then((response) => {
|
|
|
- this.dialogVisibleCite = false;
|
|
|
- this.$notify({
|
|
|
- title: "成功",
|
|
|
- message: "表彰修改成功",
|
|
|
- type: "success",
|
|
|
- duration: 2000,
|
|
|
- });
|
|
|
- this.dataFormCite.type = [];
|
|
|
- this.dataFormCite.fileIds = '';
|
|
|
- this.dataFormCite.files = [];
|
|
|
- this.listQueryCite.page = 1;
|
|
|
- this.getDataListCite();
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ .then((response) => {
|
|
|
+ this.dialogVisibleCite = false;
|
|
|
+ this.$notify({
|
|
|
+ title: "成功",
|
|
|
+ message: "表彰修改成功",
|
|
|
+ type: "success",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ this.dataFormCite.type = [];
|
|
|
+ this.dataFormCite.fileIds = '';
|
|
|
+ this.dataFormCite.files = [];
|
|
|
+ this.listQueryCite.page = 1;
|
|
|
+ this.getDataListCite();
|
|
|
+ })
|
|
|
+ .catch(() => { });
|
|
|
}
|
|
|
} else {
|
|
|
return false;
|
|
|
@@ -1025,35 +1069,35 @@ export default {
|
|
|
submitFormTrain() {
|
|
|
this.$refs['dataFormTrain'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- if(this.dialogStatus=='create'){
|
|
|
+ if (this.dialogStatus == 'create') {
|
|
|
uploadTrain(this.dataFormTrain)
|
|
|
- .then((response) => {
|
|
|
- this.dialogVisibleTrain = false;
|
|
|
- this.$notify({
|
|
|
- title: "成功",
|
|
|
- message: "培训上传成功",
|
|
|
- type: "success",
|
|
|
- duration: 2000,
|
|
|
- });
|
|
|
- this.listQueryTrain.page = 1;
|
|
|
- this.getDataListTrain();
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ .then((response) => {
|
|
|
+ this.dialogVisibleTrain = false;
|
|
|
+ this.$notify({
|
|
|
+ title: "成功",
|
|
|
+ message: "培训上传成功",
|
|
|
+ type: "success",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ this.listQueryTrain.page = 1;
|
|
|
+ this.getDataListTrain();
|
|
|
+ })
|
|
|
+ .catch(() => { });
|
|
|
}
|
|
|
- if(this.dialogStatus=='edit'){
|
|
|
+ if (this.dialogStatus == 'edit') {
|
|
|
editTrain(this.dataFormTrain)
|
|
|
- .then((response) => {
|
|
|
- this.dialogVisibleTrain = false;
|
|
|
- this.$notify({
|
|
|
- title: "成功",
|
|
|
- message: "培训修改成功",
|
|
|
- type: "success",
|
|
|
- duration: 2000,
|
|
|
- });
|
|
|
- this.listQueryTrain.page = 1;
|
|
|
- this.getDataListTrain();
|
|
|
- })
|
|
|
- .catch(() => { });
|
|
|
+ .then((response) => {
|
|
|
+ this.dialogVisibleTrain = false;
|
|
|
+ this.$notify({
|
|
|
+ title: "成功",
|
|
|
+ message: "培训修改成功",
|
|
|
+ type: "success",
|
|
|
+ duration: 2000,
|
|
|
+ });
|
|
|
+ this.listQueryTrain.page = 1;
|
|
|
+ this.getDataListTrain();
|
|
|
+ })
|
|
|
+ .catch(() => { });
|
|
|
}
|
|
|
} else {
|
|
|
return false;
|