From 6a298613fa523a8e62dd18dcbdcd4b38cb9b20cd Mon Sep 17 00:00:00 2001
From: = <=>
Date: Tue, 26 May 2026 10:02:34 +0800
Subject: [PATCH] commit

---
 .../proposal/transact/commissioner/index.html | 62 +++++++++++++------
 .../proposal/transact/commissioner/index.html | 44 ++++++-------
 2 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html
index ead3041..2534e8e 100644
--- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html
@@ -1,6 +1,28 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
+<style>
+    .commissioner-opinion-box {
+        border: 1px solid #DCDFE6;
+        border-radius: 4px;
+        padding: 10px;
+        background: #fff;
+    }
+
+    .commissioner-opinion-radio {
+        margin-bottom: 10px;
+    }
+
+    .commissioner-opinion-box .el-textarea__inner {
+        border: none;
+        padding: 0;
+        resize: none;
+    }
+
+    .commissioner-opinion-box .el-textarea__inner:focus {
+        box-shadow: none;
+    }
+</style>
 
 <div id="app">
     <guava ref="guava">
@@ -77,27 +99,27 @@ layout("/layouts/platform.html"){
                         提案委员会成员意见
                     </div>
                     <el-form :model="formData" ref="formRef" label-width="120px" :rules="formRules" label-suffix="">
-                        <el-form-item label="立案结果" prop="caseFilingResult"
-                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <el-radio-group v-model="formData.caseFilingResult" size="small">
-                                <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
-                                          border>{{item.label}}
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item v-if="['CONFIRM_FILING'].includes(formData.caseFilingResult)" label="立案类型"
-                                      prop="caseFilingType"
-                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <el-radio-group v-model="formData.caseFilingType" size="small">
-                                <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>
-                                    {{item.label}}
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                         <el-form-item label="审核意见" prop="opinion"
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-                            <user-opinion-textarea v-model="formData.opinion"></user-opinion-textarea>
+                            <div class="commissioner-opinion-box">
+                                <el-radio-group v-model="formData.caseFilingResult" size="small"
+                                                class="commissioner-opinion-radio">
+                                    <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
+                                              border>{{item.label}}
+                                    </el-radio>
+                                </el-radio-group>
+                                <user-opinion-textarea v-model="formData.opinion"></user-opinion-textarea>
+                            </div>
                         </el-form-item>
+<!--                        <el-form-item v-if="['CONFIRM_FILING'].includes(formData.caseFilingResult)" label="立案类型"-->
+<!--                                      prop="caseFilingType"-->
+<!--                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">-->
+<!--                            <el-radio-group v-model="formData.caseFilingType" size="small">-->
+<!--                                <el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE" :label="item.code" border>-->
+<!--                                    {{item.label}}-->
+<!--                                </el-radio>-->
+<!--                            </el-radio-group>-->
+<!--                        </el-form-item>-->
                     </el-form>
                     <el-row type="flex" justify="end">
                         <el-button @click="$refs.guava.index()" size="small">取消</el-button>
@@ -173,6 +195,10 @@ layout("/layouts/platform.html"){
             },
 
             doSubmit() {
+                if (!this.formData.caseFilingResult) {
+                    this.$message.warning("请选择立案结果")
+                    return
+                }
                 this.$refs.formRef.validate((valid) => {
                     if (!valid) return
                     this.$confirm("您确定要提交吗？", "提示", {
diff --git a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html
index e228a99..d891c5a 100644
--- a/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html
+++ b/src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html
@@ -58,7 +58,7 @@ layout("/layouts/platform_h5.html"){
                 <van-field
                         v-model="formData.caseFilingResultName"
                         name="caseFilingResultName"
-                        label="立案结果"
+                        label="审批意见"
                         placeholder="请选择立案结果"
                         :rules="[{ required: true, message: '请选择立案结果' }]"
                         required
@@ -74,31 +74,31 @@ layout("/layouts/platform_h5.html"){
                     ></van-picker>
                 </van-popup>
 
-                <template v-if="['CONFIRM_FILING'].includes(formData.caseFilingResult)">
-                    <van-field
-                            v-model="formData.caseFilingTypeName"
-                            name="caseFilingTypeName"
-                            label="立案类型"
-                            placeholder="请选择立案类型"
-                            :rules="[{ required: true, message: '请选择立案类型' }]"
-                            required
-                            is-link
-                            @click="openCaseFilingTypePicker"
-                    ></van-field>
-                    <van-popup v-model="showCaseFilingTypePicker" position="bottom">
-                        <van-picker
-                                show-toolbar
-                                :columns="caseFilingTypeColumns"
-                                @confirm="onCaseFilingTypeConfirm"
-                                @cancel="hideCaseFilingTypePicker"
-                        ></van-picker>
-                    </van-popup>
-                </template>
+<!--                <template v-if="['CONFIRM_FILING'].includes(formData.caseFilingResult)">-->
+<!--                    <van-field-->
+<!--                            v-model="formData.caseFilingTypeName"-->
+<!--                            name="caseFilingTypeName"-->
+<!--                            label="立案类型"-->
+<!--                            placeholder="请选择立案类型"-->
+<!--                            :rules="[{ required: true, message: '请选择立案类型' }]"-->
+<!--                            required-->
+<!--                            is-link-->
+<!--                            @click="openCaseFilingTypePicker"-->
+<!--                    ></van-field>-->
+<!--                    <van-popup v-model="showCaseFilingTypePicker" position="bottom">-->
+<!--                        <van-picker-->
+<!--                                show-toolbar-->
+<!--                                :columns="caseFilingTypeColumns"-->
+<!--                                @confirm="onCaseFilingTypeConfirm"-->
+<!--                                @cancel="hideCaseFilingTypePicker"-->
+<!--                        ></van-picker>-->
+<!--                    </van-popup>-->
+<!--                </template>-->
 
                 <van-field
                         v-model="formData.opinion"
                         name="opinion"
-                        label="审批意见"
+                        label=""
                         placeholder="请输入审批意见"
                         :rules="[{ required: true, message: '请填写审批意见' }]"
                         required