-
-
- 申请
-
-
-
-
-
-
{{ parseTime(scope.row[column.prop], '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -34,7 +17,7 @@
- {{ action.text }}
+ {{ action.text }}
@@ -88,6 +71,13 @@ export default {
},
methods: {
parseTime,
+ filteredActions(applyStatus) {
+ if (applyStatus === 3) {
+ return this.actions;
+ } else {
+ return this.actions.filter(action => action.text !== '退回意见');
+ }
+ },
//父组件搜索方法
getList(query){
this.$emit('getList', query);
diff --git a/src/store/index.js b/src/store/index.js
index 31cf42e..681274c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
import app from './modules/app'
import dict from './modules/dict'
import user from './modules/user'
-import apply from './modules/apply'
+import apply from './modules/reward'
import tagsView from './modules/tagsView'
import permission from './modules/permission'
import settings from './modules/settings'
diff --git a/src/store/modules/apply.js b/src/store/modules/reward.js
similarity index 100%
rename from src/store/modules/apply.js
rename to src/store/modules/reward.js
diff --git a/src/views/reward/aduit/index.vue b/src/views/reward/aduit/index.vue
index 9c53aad..77e3e06 100644
--- a/src/views/reward/aduit/index.vue
+++ b/src/views/reward/aduit/index.vue
@@ -1,26 +1,27 @@
+
-
+
-
+
-
-
+
+
重置
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
- 修改
- 删除
-
-
-
-
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dict.label}}
+
+
+ 是
+ 否
-
-
+
+
+
@@ -169,13 +91,125 @@
+
diff --git a/src/views/reward/apply/index.vue b/src/views/reward/apply/index.vue
index fa4cd2e..7a3ccf4 100644
--- a/src/views/reward/apply/index.vue
+++ b/src/views/reward/apply/index.vue
@@ -33,6 +33,18 @@
重置
+
+
+ 申请
+
+
+
@@ -103,6 +117,8 @@
:dialog-type="dialogType"
:table-data="fileData"
:isShowButton="isShowButton"
+ :isShowUploadButton="isShowUploadButton"
+ :template-type="templateType"
ref="childComponent"
>
@@ -127,14 +143,16 @@ import {
delApply, listFile
} from "@/api/reward/apply";
import CustomTable from "@/components/CustomTable/CustomTable.vue";
-import Update from './update.vue'
+import Update from '@/components/AllTypeFile/update.vue'
export default {
name: "apply",
components: {CustomTable,Update},
dicts: ['rew_apply_status'],
data() {
return {
+ templateType:'apply',
dialogType:'edit',
+ isShowUploadButton:false,
//列数据
tableColumns: [
{ label: '创建者', prop: 'createBy', align: 'center' },
@@ -147,7 +165,8 @@ export default {
tableActions: [
{ text: '查看', icon: 'el-icon-view', handler: this.handleView,},
{ text: '修改', icon: 'el-icon-edit', handler: this.handleUpdate, },
- { text: '删除', icon: 'el-icon-delete', handler: this.handleDelete,}
+ { text: '删除', icon: 'el-icon-delete', handler: this.handleDelete,},
+ { text: '退回意见', icon: 'el-icon-s-comment', handler: this.applyMsg,}
],
//文件上传配置项
fileData:[
@@ -283,6 +302,9 @@ export default {
},
applyId:''
};
+ },
+ computed: {
+
},
created() {
@@ -302,15 +324,9 @@ export default {
let queryObj = {
pageNum: 1,
pageSize: 10,
- createId:null,
applyStatus:'0,1,3',
applyType: this.applyParam.applyType
}
- this.$store.dispatch('GetInfo').then((res) => {
- if (res.user.userId !== '1'){
- queryObj.createId = res.user.userId
- }
- });
listApply(item ==='mounted' ? queryObj:this.queryParams).then(response => {
this.noticeList = response.rows;
this.total = response.total;
@@ -355,12 +371,18 @@ export default {
this.single = selection.length!=1
this.multiple = !selection.length
},
+ applyMsg(row){
+ let applyMsg = row.applyMsg
+ this.$alert(applyMsg, '退回意见', {
+ confirmButtonText: '确定',
+ });
+ },
/**查看按钮 */
handleView(row){
this.editOpen = true;
this.title = "查看奖项";
const applyId = row.applyId || this.ids
- this.isShowButton = false
+ this.isShowUploadButton = false
getDetail(applyId).then(response => {
this.form = response.data;
console.log(this.form)
@@ -395,15 +417,16 @@ export default {
this.open = true;
this.isReadOnly = false
this.isShowButton = true
+ this.isShowUploadButton = true
this.title = "添加奖项";
console.log(this.applyParam)
- if(this.noticeList.length === 0){
+ // if(this.noticeList.length === 0){
getApplyId(this.applyParam).then(response => {
this.$store.dispatch('apply/setApplyId', { key: 'applyId', value: response.data.applyId });
this.applyId = localStorage.getItem('applyId')
this.getList()
});
- }
+ // }
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -412,6 +435,7 @@ export default {
this.applyId = row.applyId
this.isReadOnly = false
this.isShowButton = true
+ this.isShowUploadButton = true
const applyId = row.applyId || this.ids
getDetail(applyId).then(response => {
this.form.isReward = response.data.isReward;