Commit 2cd3ef074473c91615fc2b0ef1de9276e10d06ba
Exists in
master
Merge remote-tracking branch 'origin/master'
Showing
3 changed files
with
7 additions
and
6 deletions
Show diff stats
frontend/front/src/components/dialog/projectSubmissionDialog.vue
@@ -41,7 +41,7 @@ export default { | @@ -41,7 +41,7 @@ export default { | ||
41 | }, | 41 | }, |
42 | rules:{ | 42 | rules:{ |
43 | textarea:[ | 43 | textarea:[ |
44 | - { required: true, message: '请填写入库说明', trigger: 'blur' } | 44 | + { required: true, message: this.dialogType =='rk'?'请填写入库说明':this.dialogType=='zf'?'请填写作废说明':this.dialogType == 'xmjz'?'请填写本次项目进展说明':'请填写内容', trigger: 'blur' } |
45 | ] | 45 | ] |
46 | } | 46 | } |
47 | } | 47 | } |
@@ -51,6 +51,7 @@ export default { | @@ -51,6 +51,7 @@ export default { | ||
51 | console.log('打印type',type); | 51 | console.log('打印type',type); |
52 | console.log('打印row',row); | 52 | console.log('打印row',row); |
53 | this.dialogType = type; | 53 | this.dialogType = type; |
54 | + console.log('打印this.dialogType',this.dialogType); | ||
54 | this.dialogForm.fProjectId = row.id_; | 55 | this.dialogForm.fProjectId = row.id_; |
55 | this.dialogForm.dialogVisible = true; | 56 | this.dialogForm.dialogVisible = true; |
56 | switch (type){ | 57 | switch (type){ |
@@ -69,7 +70,7 @@ export default { | @@ -69,7 +70,7 @@ export default { | ||
69 | this.dialogForm.label ='本次项目进展说明:'; | 70 | this.dialogForm.label ='本次项目进展说明:'; |
70 | this.dialogForm.fEventType = 'xiangmujinzhan'; | 71 | this.dialogForm.fEventType = 'xiangmujinzhan'; |
71 | break; | 72 | break; |
72 | - case 'zf': | 73 | + case 'ck': |
73 | this.dialogForm.label = '出库说明:'; | 74 | this.dialogForm.label = '出库说明:'; |
74 | this.dialogForm.title = '出库'; | 75 | this.dialogForm.title = '出库'; |
75 | this.dialogForm.fEventType = 'chuku'; | 76 | this.dialogForm.fEventType = 'chuku'; |
@@ -88,7 +89,9 @@ export default { | @@ -88,7 +89,9 @@ export default { | ||
88 | console.log('打印res',res); | 89 | console.log('打印res',res); |
89 | if(res.code == 200){ | 90 | if(res.code == 200){ |
90 | this.$emit('handleRefresh'); | 91 | this.$emit('handleRefresh'); |
92 | + // this.$emit("RefreshTable"); | ||
91 | } | 93 | } |
94 | + this.$emit("RefreshTable"); | ||
92 | this.dialogForm.dialogVisible = false; | 95 | this.dialogForm.dialogVisible = false; |
93 | }) | 96 | }) |
94 | 97 |
frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
frontend/manage/src/components/form/dataTemplate/ManageSetting.vue
@@ -3159,7 +3159,8 @@ export default { | @@ -3159,7 +3159,8 @@ export default { | ||
3159 | 'addData', | 3159 | 'addData', |
3160 | 'searchData', | 3160 | 'searchData', |
3161 | 'batchSave', | 3161 | 'batchSave', |
3162 | - 'js' | 3162 | + 'js', |
3163 | + 'moduleButton' | ||
3163 | ].indexOf(row.name) === -1 | 3164 | ].indexOf(row.name) === -1 |
3164 | ) | 3165 | ) |
3165 | }, | 3166 | }, |