Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

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

@@ -54,7 +54,7 @@ const PROPOSAL_INFO = {
                 <div class="process-title">
                     并案信息
                 </div>
-                <el-table :data="viewData.merges" size="small">
+                <el-table :data="viewData.merges" size="medium">
                     <el-table-column label="序号" type="index" width="100px"></el-table-column>
                     <el-table-column label="提案编号" prop="code" sortable></el-table-column>
                     <el-table-column label="提案名称" prop="name" show-overflow-tooltip></el-table-column>
@@ -69,6 +69,37 @@ const PROPOSAL_INFO = {
                 </el-table>
             </template>
 
+            <!--委员会成员意见-->
+            <template v-if="viewData.commissionerOpinions && viewData.commissionerOpinions.length">
+                <div class="process-title">
+                    委员会成员意见
+                </div>
+                <el-table :data="viewData.commissionerOpinions" size="medium">
+                    <el-table-column label="序号" type="index" width="100px"></el-table-column>
+                    <el-table-column label="委员" prop="commissionerName">
+                        <template slot-scope="{row}">
+                            {{row.commissionerName}}({{row.commissionerLoginName}})
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="立案结果" prop="caseFilingType">
+                        <template slot-scope="{row}">
+                            <div style="display: flex;justify-content: center">
+                                <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                                          :value="row.caseFilingResult"></dict-tag>
+                                <template v-if="row.caseFilingType">
+                                    (
+                                    <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_TYPE"
+                                              :value="row.caseFilingType"></dict-tag>
+                                    )
+                                </template>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="意见" prop="opinionText"></el-table-column>
+                    <el-table-column label="时间" prop="opinionTime"></el-table-column>
+                </el-table>
+            </template>
+
             <el-dialog title="提案详情" :visible.sync="viewDialogVisible" width="1200px" append-to-body top="5vh">
                 <div style="max-height: 80vh;overflow-y: auto">
                     <proposal-info ref="infoDialogRef"></proposal-info>
@@ -118,10 +149,17 @@ const PROPOSAL_INFO = {
                         </el-descriptions-item>
                         <el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
                         <el-descriptions-item label="立案结果">
-                            <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
+                            <div style="display: flex;justify-content: center">
-                                      :value="task.ext.tf_caseFilingResult"></dict-tag>
+                                <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_RESULT"
-                            <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_TYPE"
+                                          :value="task.ext.tf_caseFilingResult"></dict-tag>
-                                      :value="task.ext.tf_caseFilingType"></dict-tag>
+
+                                <template v-if="task.ext.tf_caseFilingType">
+                                    (
+                                    <dict-tag :options="dict.type.PROPOSAL_CASE_FILING_TYPE"
+                                              :value="task.ext.tf_caseFilingType"></dict-tag>
+                                    )
+                                </template>
+                            </div>
                         </el-descriptions-item>
                         <el-descriptions-item label="主办单位" :span="3">{{task.ext.tf_masterUnitName}}
                         </el-descriptions-item>

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

@@ -101,7 +101,7 @@ layout("/layouts/platform.html"){
                 businessNo: null,
                 tableColumns: [
                     {label: "提案编号", prop: "code"},
-                    {label: "提案名称", prop: "name"},
+                    {label: "提案名称", prop: "name", width: "200px"},
                     {label: "提案人", prop: "createUserName"},
                     {label: "提案类别", prop: "typeName"},
                     {label: "届次", prop: "sessionName"},

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

@@ -102,7 +102,7 @@ layout("/layouts/platform.html"){
             return {
                 tableColumns: [
                     {label: "提案编号", prop: "code"},
-                    {label: "提案名称", prop: "name"},
+                    {label: "提案名称", prop: "name", width: "200px"},
                     {label: "提案人", prop: "createUserName"},
                     {label: "提案类别", prop: "typeName"},
                     {label: "代表团", prop: "delegationName"},

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

@@ -71,24 +71,27 @@ layout("/layouts/platform.html"){
                     <el-input v-model="pageForm.name" placeholder="提案名称" @keyup.enter.native="doSearch" clearable
                               style="width: 100%"></el-input>
                 </search-item>
-                <search-item label="提案人姓名">
+                <search-item label="姓名/工号：">
-                    <el-input
+                    <el-input placeholder="请输入提案人姓名或工号查询" clearable v-model="pageForm.createUserKeyword"></el-input>
-                            @keyup.enter.native="doSearch"
-                            clearable
-                            placeholder="请输入提案人姓名"
-                            v-model="pageForm.createUserName"
-                            style="width: 100%"
-                    ></el-input>
-                </search-item>
-                <search-item label="提案人工号">
-                    <el-input
-                            @keyup.enter.native="doSearch"
-                            clearable
-                            placeholder="请输入提案人工号"
-                            v-model="pageForm.createUserLoginName"
-                            style="width: 100%"
-                    ></el-input>
                 </search-item>
+<!--                <search-item label="提案人姓名">-->
+<!--                    <el-input-->
+<!--                            @keyup.enter.native="doSearch"-->
+<!--                            clearable-->
+<!--                            placeholder="请输入提案人姓名"-->
+<!--                            v-model="pageForm.createUserName"-->
+<!--                            style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
+<!--                <search-item label="提案人工号">-->
+<!--                    <el-input-->
+<!--                            @keyup.enter.native="doSearch"-->
+<!--                            clearable-->
+<!--                            placeholder="请输入提案人工号"-->
+<!--                            v-model="pageForm.createUserLoginName"-->
+<!--                            style="width: 100%"-->
+<!--                    ></el-input>-->
+<!--                </search-item>-->
             </search>
         </el-card>
 
@@ -100,6 +103,7 @@ layout("/layouts/platform.html"){
                 </el-radio-group>
             </table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
+                <el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
                 <el-table-column
                         :label="column.label"
                         :prop="column.prop"
@@ -248,9 +252,8 @@ layout("/layouts/platform.html"){
             return {
                 tableColumns: [
                     {label: "提案编号", prop: "code"},
-                    {label: "提案名称", prop: "name"},
+                    {label: "提案名称", prop: "name", width: "200px"},
                     {label: "提案类别", prop: "typeName"},
-                    {label: "代表团", prop: "delegationName"},
                     {label: "立案结果", prop: "caseFilingResult"},
                     {label: "是否并案", prop: "merge"},
                     {label: "承办单位", prop: "underTakeName"},