c-zhouhf1/zhgh_hgu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-11-21 10:50:35 +08:00
parent 7b114dbaeb
commit e865951a7c
15 changed files with 84 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/proposal/export/comprehensive/index.html
+1 -1
View File
@@ -199,7 +199,7 @@ layout("/layouts/platform.html"){
{label: "届次", prop: "sessionName"},
{label: "代表团", prop: "delegationName"},
{label: "立案结果", prop: "caseFilingResult"},
{label: "立案类型", prop: "caseFilingType"},
// {label: "立案类型", prop: "caseFilingType"},
{label: "是否并案", prop: "merge"},
{label: "案由", prop: "brief", visible: false},
{label: "建议措施", prop: "measures", visible: false},
src/main/resources/views/platform/zhgh/democratic/proposal/senior/basic/index.html
+13 -3
View File
@@ -134,15 +134,22 @@ layout("/layouts/platform.html"){
<el-input maxlength="100" placeholder="提案名称" v-model="formData.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提案编号" prop="code"
:rules="[{required:true,message:'请输入提案编号',trigger:'blur'}]">
<el-input maxlength="100" placeholder="提案编号" v-model="formData.code"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex">
<el-col :span="12">
<el-form-item label="提案方式" prop="source">
<el-input :value="dict.type.PROPOSAL_SOURCE.find(v=>v.code === formData.source)?.name"
disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" type="flex">
<el-col :span="12">
<el-form-item label="提案类别" prop="typeId">
<el-select v-model="formData.typeId" style="width: 100%">
@@ -170,6 +177,9 @@ layout("/layouts/platform.html"){
v-for="item in suggestUnitOptions"></el-option>
</el-select>
</el-form-item>
<el-form-item label="调研情况" prop="researchFindings">
<text-editor v-model="formData.researchFindings" key="researchFindings" placeholder="调研情况"></text-editor>
</el-form-item>
<el-form-item label="案由" prop="brief">
<text-editor v-model="formData.brief" key="brief" placeholder="案由"></text-editor>
</el-form-item>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/feedback/index.html
+2 -2
View File
@@ -92,7 +92,7 @@ layout("/layouts/platform.html"){
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
<template v-if="['SATISFIED','FAIRLY_SATISFIED'].includes(formData.tf_feedback)">
<!-- <template v-if="['SATISFIED','FAIRLY_SATISFIED'].includes(formData.tf_feedback)">
<el-form-item label="通讯地址" prop="tf_address" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-input v-model="formData.tf_address" placeholder="请输入通讯地址" clearable></el-input>
</el-form-item>
@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
<el-form-item label="邮政编码" prop="tf_postcode" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-input v-model="formData.tf_postcode" placeholder="请输入邮政编码" clearable></el-input>
</el-form-item>
</template>
</template>-->
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html
+3
View File
@@ -131,6 +131,9 @@ layout("/layouts/platform.html"){
v-for="item in suggestUnitOptions"></el-option>
</el-select>
</el-form-item>
<el-form-item label="调研情况" prop="researchFindings">
<text-editor v-model="formData.researchFindings" key="researchFindings" placeholder="调研情况"></text-editor>
</el-form-item>
<el-form-item label="案由" prop="brief">
<text-editor v-model="formData.brief" key="brief" placeholder="案由"></text-editor>
</el-form-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+1 -1
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
<el-select v-model="pageForm.unionId" filterable @change="listUnit" clearable style="width: 100%">
<el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
<el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js
+5 -6
View File
@@ -63,7 +63,7 @@ const pushProgress = {
</div>
</div>
<div class="progress-bar">
<div class="progress-bar-inner bg-primary"
<div class="progress-bar-inner bg-success"
:style="{width: metrics.seniorTeacher.progress * 100 + '%'}"></div>
</div>
<div class="progress-info">
@@ -96,7 +96,7 @@ const pushProgress = {
</div>
<div class="progress-bar">
<div
class="progress-bar-inner bg-primary"
class="progress-bar-inner bg-success"
:style="{width: metrics.intermediateBelow.progress * 100 + '%'}"
></div>
</div>
@@ -128,9 +128,8 @@ const pushProgress = {
</div>
</div>
<div class="progress-bar">
<div class="progress-bar-inner bg-primary"
:style="{width: metrics.cadre.progress * 100 + '%'}"
></div>
<div class="progress-bar-inner bg-success"
:style="{width: metrics.cadre.progress * 100 + '%'}"></div>
</div>
<div class="progress-info">
<span v-if="metrics.cadre.progress>=1 || metrics.cadre.target===0"
@@ -160,7 +159,7 @@ const pushProgress = {
</div>
</div>
<div class="progress-bar">
<div class="progress-bar-inner bg-primary"
<div class="progress-bar-inner bg-success"
:style="{width: metrics.worker.progress * 100 + '%'}"
></div>
</div>
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js
+2 -2
View File
@@ -96,8 +96,8 @@ const write = {
</el-col>
<el-col :span="12">
<el-form-item label="政治面貌" prop="political">
<el-input maxlength="100" placeholder="政治面貌"
v-model="formData.political"></el-input>
<dict-select v-model="formData.political" style="width: 100%" placeholder="请选择政治面貌"
code="USER_POLITICAL"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html
+4 -4
View File
@@ -83,7 +83,7 @@ layout("/layouts/platform_h5.html"){
show-word-limit
></van-field>
<template v-if="['SATISFIED','FAIRLY_SATISFIED'].includes(formData.tf_feedback)">
<!-- <template v-if="['SATISFIED','FAIRLY_SATISFIED'].includes(formData.tf_feedback)">
<van-field
v-model="formData.tf_address"
name="tf_address"
@@ -93,7 +93,7 @@ layout("/layouts/platform_h5.html"){
required
show-word-limit
></van-field>
<!--联系电话-->
&lt;!&ndash;联系电话&ndash;&gt;
<van-field
v-model="formData.tf_phone"
name="tf_phone"
@@ -103,7 +103,7 @@ layout("/layouts/platform_h5.html"){
required
show-word-limit
></van-field>
<!--邮政编码-->
&lt;!&ndash;邮政编码&ndash;&gt;
<van-field
v-model="formData.tf_postcode"
name="tf_postcode"
@@ -112,7 +112,7 @@ layout("/layouts/platform_h5.html"){
:rules="[{ required: true, message: '请输入邮政编码' }]"
required
show-word-limit
></van-field>
></van-field>-->
</template>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html
+32 -42
View File
@@ -235,9 +235,9 @@ layout("/layouts/platform_h5.html"){
<!-- 搜索框 -->
<div class="search-container">
<van-search
v-model="suggestionUnitSearchText"
placeholder="搜索承办单位"
@input="onSuggestionUnitSearch"
v-model="suggestionUnitSearchText"
placeholder="搜索承办单位"
@input="onSuggestionUnitSearch"
></van-search>
</div>
@@ -246,18 +246,18 @@ layout("/layouts/platform_h5.html"){
<van-checkbox-group v-model="selectedSuggestionUnits">
<van-cell-group>
<van-cell
v-for="item in filteredSuggestionUnits"
:key="item.id"
clickable
@click="toggleSuggestionUnit(item)"
v-for="item in filteredSuggestionUnits"
:key="item.id"
clickable
@click="toggleSuggestionUnit(item)"
>
<template #title>
<div class="option-item">
<van-checkbox
:name="item.name"
:checked="selectedSuggestionUnits.includes(item.name)"
@click.stop
/>
:name="item.name"
:checked="selectedSuggestionUnits.includes(item.name)"
@click.stop
></van-checkbox>
<span class="option-text">{{ item.name }}</span>
</div>
</template>
@@ -270,39 +270,29 @@ layout("/layouts/platform_h5.html"){
</van-cell-group>
<van-cell-group title="提案内容" class="form-group">
<van-field
v-model="formData.researchFindings"
name="researchFindings"
label="调研情况"
type="textarea"
rows="4"
autosize
placeholder="请输入调研情况"
:rules="[{ required: true, message: '请填写调研情况' }]"
required
></van-field>
<van-field class="direction-column-field" name="researchFindings" label="调研情况" required
:rules="[{ required: true, message: '请填写调研情况' }]">
<template #input>
<text-editor v-model="formData.researchFindings" key="researchFindings"
placeholder="调研情况"></text-editor>
</template>
</van-field>
<van-field
v-model="formData.brief"
label="提案案由"
type="textarea"
rows="6"
autosize
placeholder="请输入案由"
:rules="[{ required: true, message: '请填写案由' }]"
required
></van-field>
<van-field class="direction-column-field" name="brief" label="提案案由" required
:rules="[{ required: true, message: '请填写案由' }]">
<template #input>
<text-editor v-model="formData.brief" key="brief"
placeholder="提案案由"></text-editor>
</template>
</van-field>
<van-field
v-model="formData.measures"
label="建议措施"
type="textarea"
rows="6"
autosize
placeholder="请输入建议措施"
:rules="[{ required: true, message: '请填写建议措施' }]"
required
></van-field>
<van-field class="direction-column-field" name="measures" label="建议措施" required
:rules="[{ required: true, message: '请填写建议措施' }]">
<template #input>
<text-editor v-model="formData.measures" key="measures"
placeholder="建议措施"></text-editor>
</template>
</van-field>
</van-cell-group>