commit

src/main/resources/views/platform/sys/unit/unitManage.js

@@ -9,7 +9,7 @@ const UNIT_MANAGE_TEMPLATE = {
                 </el-card>
                 <el-card shadow="never" style="border: 1px solid var(--border-color-lighter); margin-top: 10px">
                     <table-tool label="单位列表">
-                        <el-button @click="openAdd" type="primary" size="small">新建单位</el-button>
+<!--                        <el-button @click="openAdd" type="primary" size="small">新建单位</el-button>-->
                     </table-tool>
                     <el-table :data="tableData" size="mini">
                          <el-table-column label="序号" type="index" width="60">

src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/approval/index.html

@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
-                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到提案人</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
                         <el-button @click="handleTaskAction(20)" size="small" type="danger">不同意</el-button>
                         <el-button @click="handleTaskAction(1)" size="small" type="primary">同意</el-button>
                     </el-row>

src/main/resources/views/platform/zhgh/democratic/proposal/common/info.js

@@ -28,9 +28,9 @@ const PROPOSAL_INFO = {
                     <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
                               :value="viewData.caseFilingResult"></dict-tag>
                 </el-descriptions-item>
-                <el-descriptions-item label="调研情况" :span="3">
+                <!--<el-descriptions-item label="调研情况" :span="3">
                     <div class="text-left">{{viewData.researchFindings}}</div>
-                </el-descriptions-item>
+                </el-descriptions-item>-->
                 <el-descriptions-item label="提案案由" :span="3">
                     <div class="text-left" v-html="viewData.brief"></div>
                 </el-descriptions-item>

src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html

@@ -231,6 +231,14 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
+					// 是否有协办单位
+                    let tf_helpunitreply;
+                    if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
+	                    tf_helpunitreply = 'HAS_HELP_UNIT'
+					} else {
+	                    tf_helpunitreply = 'NO_HELP_UNIT'
+                    }
+					
                     const loading = createLoading('提交中')
                     this.$axios.post("/flow/common/executeTask", {
                         data: JSON.stringify({
@@ -239,6 +247,7 @@ layout("/layouts/platform.html"){
                             tf_masterUnitName: this.formData.tf_masterUnitId ? this.underTakeOptions.find(v => v.id === this.formData.tf_masterUnitId)?.name : null,
                             tf_slaveUnitNames: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name),
                             tf_slaveUnitNameStr: this.formData.tf_slaveUnitIds.map(v => this.underTakeOptions.find(v2 => v2.id === v)?.name).join(','),
+	                        tf_helpunitreply: tf_helpunitreply
                         })
                     }).then((res) => {
                         if (res.code === 0) {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html

@@ -137,6 +137,7 @@ layout("/layouts/platform.html"){
                     {label: "提案类别", prop: "typeName"},
                     {label: "是否并案", prop: "merge"},
                     {label: "当前节点", prop: "curTaskName"},
+                    {label: "审核人", prop: "auditUser"},
                     {label: "流程状态", prop: "instanceState"}
                 ],
                 pageForm: {

src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitReply/index.html

@@ -260,6 +260,7 @@ layout("/layouts/platform.html"){
                     {label: "承办单位", prop: "underTakeName"},
                     {label: "承办类型", prop: "underTakeIsMaster"},
                     {label: "当前节点", prop: "curTaskName"},
+                    {label: "审核人", prop: "auditUser"},
                     {label: "流程状态", prop: "instanceState"}
                 ],
                 pageForm: {

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html

@@ -270,7 +270,7 @@ layout("/layouts/platform_h5.html"){
             </van-cell-group>
 
             <van-cell-group title="提案内容" class="form-group">
-                <van-field
+                <!--<van-field
                         v-model="formData.researchFindings"
                         name="researchFindings"
                         label="调研情况"
@@ -280,7 +280,7 @@ layout("/layouts/platform_h5.html"){
                         placeholder="请输入调研情况"
                         :rules="[{ required: true, message: '请填写调研情况' }]"
                         required
-                ></van-field>
+                ></van-field>-->
 
                 <van-field
                         v-model="formData.brief"