diff --git a/frontend/front/src/components/dialog/projectSubmissionDialog.vue b/frontend/front/src/components/dialog/projectSubmissionDialog.vue index 3d5294f..96545a0 100644 --- a/frontend/front/src/components/dialog/projectSubmissionDialog.vue +++ b/frontend/front/src/components/dialog/projectSubmissionDialog.vue @@ -41,7 +41,7 @@ export default { }, rules:{ textarea:[ - { required: true, message: '请填写入库说明', trigger: 'blur' } + { required: true, message: this.dialogType =='rk'?'请填写入库说明':this.dialogType=='zf'?'请填写作废说明':this.dialogType == 'xmjz'?'请填写本次项目进展说明':'请填写内容', trigger: 'blur' } ] } } @@ -51,6 +51,7 @@ export default { console.log('打印type',type); console.log('打印row',row); this.dialogType = type; + console.log('打印this.dialogType',this.dialogType); this.dialogForm.fProjectId = row.id_; this.dialogForm.dialogVisible = true; switch (type){ @@ -69,7 +70,7 @@ export default { this.dialogForm.label ='本次项目进展说明:'; this.dialogForm.fEventType = 'xiangmujinzhan'; break; - case 'zf': + case 'ck': this.dialogForm.label = '出库说明:'; this.dialogForm.title = '出库'; this.dialogForm.fEventType = 'chuku'; @@ -88,7 +89,9 @@ export default { console.log('打印res',res); if(res.code == 200){ this.$emit('handleRefresh'); + // this.$emit("RefreshTable"); } + this.$emit("RefreshTable"); this.dialogForm.dialogVisible = false; }) diff --git a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue index a07dd4c..cd64525 100644 --- a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue +++ b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue @@ -12,9 +12,6 @@ export default { searchForms:{ type:Object }, - selectRows: { - type: Object - } }, data(){ return { diff --git a/frontend/manage/src/components/form/dataTemplate/ManageSetting.vue b/frontend/manage/src/components/form/dataTemplate/ManageSetting.vue index 8fb5c0f..db2134f 100644 --- a/frontend/manage/src/components/form/dataTemplate/ManageSetting.vue +++ b/frontend/manage/src/components/form/dataTemplate/ManageSetting.vue @@ -3159,7 +3159,8 @@ export default { 'addData', 'searchData', 'batchSave', - 'js' + 'js', + 'moduleButton' ].indexOf(row.name) === -1 ) }, -- libgit2 0.21.2