Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -144,7 +144,7 @@ const PROPOSAL_INFO = {
|
||||
|
||||
<!--提案委员会立案-->
|
||||
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
|
||||
v-else-if="task.taskName === 'committee'||task.taskName === 'committeeFilingUnit'">
|
||||
v-else-if="task.taskName === 'committee'||task.taskName === 'committeeFilingUnit'||task.taskName === 'committeeFiling'">
|
||||
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
|
||||
}}({{task.taskFormData.loginName}})
|
||||
</el-descriptions-item>
|
||||
|
||||
+23
-1
@@ -296,12 +296,34 @@ layout("/layouts/platform.html"){
|
||||
taskName: row.taskName,
|
||||
proposalId: row.id,
|
||||
underTakeName: row.underTakeName,
|
||||
underTakeIsMaster: row.underTakeIsMaster
|
||||
underTakeIsMaster: row.underTakeIsMaster,
|
||||
tf_opinion: this.getDefaultReplyOpinion(row)
|
||||
}
|
||||
this.$refs.proposalInfoRef.onOpen(row)
|
||||
})
|
||||
},
|
||||
|
||||
getDefaultReplyOpinion(row) {
|
||||
const contentPlaceholder = "<p> 【请在此处填写答复内容】</p><br/>"
|
||||
|
||||
if (row.underTakeIsMaster) {
|
||||
return [
|
||||
"<p>×××代表(仅写第一提案人姓名):</p>",
|
||||
"<p> 您提出的关于“……”的提案收悉,现答复如下:</p>",
|
||||
contentPlaceholder,
|
||||
"<p> 感谢您对学校工作的关心和支持。</p>"
|
||||
].join("")
|
||||
}
|
||||
|
||||
return [
|
||||
"<p>××××(主办单位名称):</p>",
|
||||
"<p> ××代表在校六届五次教代会上提出的关于“……”的提案收悉。根据要求,由我部(处、室、中心等)协助你们办理此提案。经研究,并与×××委员沟通,现提出我单位的协办意见:</p>",
|
||||
contentPlaceholder,
|
||||
"<p> 以上意见,供你们在正式答复代表时参考。</p>",
|
||||
"<p> 联系人:×××,电话:×××××××。</p>"
|
||||
].join("")
|
||||
},
|
||||
|
||||
handleTaskAction(val) {
|
||||
this.$refs.formRef.validate(valid => {
|
||||
if (!valid) return
|
||||
|
||||
Reference in New Issue
Block a user