From 31a6fa4e4a4e342345d5320451715a08fa35004a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Sep 2021 18:20:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue       | 101 +++++++++---------
 .../standardForComments/index.vue             |   7 ++
 2 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 8e4f32a12..fbaf6a859 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -8,52 +8,58 @@
           <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
           <!--            <el-tab-pane label="标准预警" name="STANDARD">-->
           <div class="dynamic-content">
-            <h5>实施预警</h5>
-            <div class="more">
-              <el-form :inline="true" :model="dynamic" class="demo-form-inline">
-                <el-form-item label="标准编号">
-                  <el-input clearable size="small"
-                            v-model="dynamic.standCode"
-                            placeholder="根据标准编号查找">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="标准名称">
-                  <el-input clearable size="small"
-                            v-model="dynamic.standName"
-                            placeholder="根据标准名称查找">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="实施日期" class="choose-time-area">
-                  <el-datePicker
-                    clearable size="small"
-                    v-model="dynamic.putTime"
-                    value-format="yyyy-MM-dd"
-                    placeholder="根据实施日期查找">
-                  </el-datePicker>
-                </el-form-item>
-                <el-form-item label="适用车型">
-                  <el-input clearable size="small"
-                            v-model="dynamic.applyType"
-                            placeholder="根据适用车型查找">
-                  </el-input>
-                </el-form-item>
-                <el-form-item>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    @click="searchBtnClick"
-                    class="common-button-primary">
-                    查询
-                  </el-button>
-                  <el-button
-                    size="small"
-                    @click="clearBtnClick"
-                    class="common-button-primary">
-                    清空
-                  </el-button>
-                </el-form-item>
-              </el-form>
-            </div>
+            <el-row>
+              <el-col>
+                <h5>实施预警</h5>
+              </el-col>
+              <el-col>
+                <div class="more">
+                  <el-form :inline="true" :model="dynamic" class="demo-form-inline">
+                    <el-form-item label="标准编号">
+                      <el-input clearable size="small"
+                                v-model="dynamic.standCode"
+                                placeholder="根据标准编号查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="标准名称">
+                      <el-input clearable size="small"
+                                v-model="dynamic.standName"
+                                placeholder="根据标准名称查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item label="实施日期" style="margin-right: -40px" class="choose-time-area">
+                      <el-datePicker
+                        clearable size="small"
+                        v-model="dynamic.putTime"
+                        value-format="yyyy-MM-dd"
+                        placeholder="根据实施日期查找">
+                      </el-datePicker>
+                    </el-form-item>
+                    <el-form-item label="适用车型">
+                      <el-input clearable size="small"
+                                v-model="dynamic.applyType"
+                                placeholder="根据适用车型查找">
+                      </el-input>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button
+                        type="primary"
+                        size="small"
+                        @click="searchBtnClick"
+                        class="common-button-primary">
+                        查询
+                      </el-button>
+                      <el-button
+                        size="small"
+                        @click="clearBtnClick"
+                        class="common-button-primary">
+                        清空
+                      </el-button>
+                    </el-form-item>
+                  </el-form>
+                </div>
+              </el-col>
+            </el-row>
             <div class="content" style="height: 100%; padding-top: 5px; ">
               <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
               <el-table
@@ -1081,14 +1087,13 @@ export default {
         }
 
         .more {
-
           /deep/ .el-input__inner {
             width: 155px;
           }
 
           .choose-time-area {
             /deep/ .el-input__inner {
-              width: 220px;
+              width: 170px;
             }
           }
 
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index a52dee2d8..59d4a3b3b 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -139,11 +139,18 @@ export default {
       this.splitInfoPage = 1;
       this.sarStandCompareHis();
     },
+//     getTime(time){
+//       let date = new Date(time + 8 * 3600 * 1000); // 增加8小时
+//       console.log(date.toJSON().substr(0, 19).replace('T', ' '));
+//       return  date.toJSON().substr(0, 19).replace('T', ' ');
+//     },
     // 查询表格
     sarStandCompareHis() {
       this.spinShow = true;
+      this.standCommonlySearch.start = new Date(this.standCommonlySearch.start).getTime() //转换为毫秒时间戳
       this.standCommonlySearch.type = 1;
       var form = this.standCommonlySearch;
+      console.log(form);
       this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
         _this: this
       }, res => {

From d42da3d955ac0c23a1c5ce1d9b689df9383c8c55 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 9 Sep 2021 18:39:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step1-1.vue     | 1461 +++++++++--------
 .../pages/creatProcess/bzzqyj/step1.vue       |   20 +-
 .../pags/consultationDetails.vue              |  977 +++++------
 3 files changed, 1276 insertions(+), 1182 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 311d62d39..a08c60aa6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -1,730 +1,757 @@
 <template>
-    <div class="bzzqyjStep1-1">
-        <!--    标准征求意见流程-->
-        <ProcessHeader toggle>
-            <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">申请人发起流程</template>
-        </ProcessHeader>
-        <div class="headerTabs">
-            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
-        </div>
-        <div class="content" v-show="active === '1'">
-            <div style="flex: auto; overflow: auto;">
-                <el-form
-                        ref="bzzqyjForm"
-                        :model="form"
-                        :rules="formRules"
-                        class="label-input-form"
-                        label-width="210px"
-                >
-                    <ProcessTitle>
-                        <template slot="title">基础信息</template>
-                    </ProcessTitle>
-                    <div class="prc-content-border">
-                        <el-row :gutter="24">
-                            <el-col :span="24">
-                                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
-                                    <div class="addButton">
-                                        <el-button  size="small" type="primary" @click="addZqyjList">选择标准</el-button>
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cid"
-                                            placeholder="请输入标准编号"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.endTime"
-                                            type="date"
-                                            placeholder="请选择结束日期">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
-                                    <div class="addButton">
-                                        <el-button  size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.fjListId"
-                                            style="display: none;"
-                                    ></el-input>
-                                    <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </div>
-                </el-form>
-            </div>
-            <el-collapse accordion>
-                <el-collapse-item title="意见填写">
-                    <div style="margin: 10px 0;">
-                        <el-input
-                                type="textarea"
-                                :rows="3"
-                                resize="none"
-                                placeholder="请输入意见"
-                                v-model="commentText">
-                        </el-input>
-                    </div>
-                </el-collapse-item>
-            </el-collapse>
-        </div>
-        <div class="content" v-show="active === '2'">
-            <div class="block" style="padding-top: 20px;">
-                <el-timeline>
-                    <el-form
-                            ref="Form"
-                            :model="roleForm"
-                            :rules="roleFormRules"
-                            class="label-input-form myForm">
-                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="startUserName" style="margin-bottom: 0">
-                                    <h4>流程发起人</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.startUser" style="display: none;"/>
-                                        <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="dockUserList" style="margin-bottom: 0">
-                                    <h4>责任部门对接人</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.dockUserList" style="display: none;"/>
-                                        <el-input
-                                                v-model="roleForm.dockUserListName"
-                                                placeholder="选择责任部门对接人"
-                                                @click.native="choiceZRRS">
-                                        </el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="ministerUser" style="margin-bottom: 0">
-                                    <h4>标准法规部部长</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.ministerUser" style="display: none;"/>
-                                        <el-input
-                                                v-model="roleForm.ministerUserName"
-                                                placeholder="选择标准法规部部长·"
-                                                @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
-                                        />
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="directorUser" style="margin-bottom: 0">
-                                    <h4>技术管理中心主任</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.directorUser" style="display: none;"/>
-                                        <el-input
-                                                v-model="roleForm.directorUserName"
-                                                placeholder="选择技术管理中心主任"
-                                                @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
-                                        />
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="presidentUser" style="margin-bottom: 0">
-                                    <h4>工程研究总院院长</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.presidentUser" style="display: none;"/>
-                                        <el-input
-                                                v-model="roleForm.presidentUserName"
-                                                placeholder="选择工程研究总院院长"
-                                                @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
-                                        />
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                    </el-form>
-                </el-timeline>
-            </div>
-        </div>
-        <ProcessFooter
-                show-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
-                @submit="handleSubmit"
-        >
-        </ProcessFooter>
-        <el-drawer
-                title="标准库"
-                :visible.sync="listModel"
-                size="900px"
-                custom-class="demo-drawer"
-        >
-            <div class="standardForComments">
-                <div class="content">
-                    <!-- 顶部工具栏 -->
-                    <table-tools-bar>
-                        <div slot="left">
-                            <div class="search-area">
-                                <el-form :model="standCommonlySearch" inline class="label-input-form">
-                                    <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
-                                        <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
-                                    </el-formItem>
-                                    <el-formItem label="标准类别" prop="standSort" class="search-item">
-                                        <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
-                                            <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
-                                            </el-option>
-                                        </el-select>
-                                    </el-formItem>
-                                    <el-formItem label="标准来源" prop="standType" class="search-item">
-                                        <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
-                                            <el-option value="INLAND" key="1" label="国内标准"></el-option>
-                                            <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
-                                        </el-select>
-                                    </el-formItem>
-                                    <el-formItem class="search-item btn-box">
-                                        <el-button
-                                                type="primary"
-                                                size="mini"
-                                                class="common-button-primary"
-
-                                                @click="sarStandCompareHisInfo">查询</el-button>
-                                        <el-button
-                                                class="common-button-default"
-                                                size="mini"
-                                                @click="clearSearchStand">清空</el-button>
-                                    </el-formItem>
-                                </el-form>
-                            </div>
-                        </div>
-                    </table-tools-bar>
-                    <div class="table-wrap">
-                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
-                            <el-table
-                                    ref="selection"
-                                    :data="standInfoList"
-                                    tooltip-effect="dark"
-                                    style="width: 100%;padding:0 0 20px 0;"
-                                    height="100%"
-                                    border
-                                    @selection-change="handleSelection"
-                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                                <el-table-column type="selection" width="55" align="center"/>
-                                <el-table-column label="标准号" align="center">
-                                    <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
-                                        <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column prop="cname" label="标准名称" align="center">
-                                    <template slot-scope="scope">
-                                        <div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </div>
-                </div>
-                <pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
-                <loading :loading="spinShow">数据加载中……</loading>
-                <div class="demo-drawer-footer">
-                    <el-button size="mini" @click="closeDrawer">取消</el-button>
-                    <el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
-                </div>
-            </div>
-        </el-drawer>
-        <Role-tree
-                is-title="选择责任部门对接人"
-                :is-visible.sync="modalshowflag2"
-                @checkedRole="checkedRole2"
-                :nodeList="nodeList2"
-        ></Role-tree>
-        <Role-tree
-                check-box
-                :is-title="drawerTitle"
-                :is-visible.sync="modalshowflag"
-                @checkedRole="checkedRole"
-                :nodeList="nodeList"
-        ></Role-tree>
-        <el-drawer
-                title="选择附件"
-                :visible.sync="fzlistModel"
-                size="900px"
-                custom-class="demo-drawer"
-        >
-            <div class="standardForComments">
-                <div class="content" style="height: calc(100% - 57px);">
-                    <div class="table-wrap">
-                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
-                            <el-table
-                                    ref="selection"
-                                    :data="fjList"
-                                    tooltip-effect="dark"
-                                    style="width: 100%;padding:0 0 20px 0;"
-                                    height="100%"
-                                    border
-                                    @selection-change="handleSelection2"
-                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                                <el-table-column type="selection" width="55" align="center"/>
-                                <el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
-                            </el-table>
-                        </div>
-                    </div>
-                </div>
-                <loading :loading="fzShow">数据加载中……</loading>
-                <div class="demo-drawer-footer">
-                    <el-button size="mini" @click="closeDrawer2">取消</el-button>
-                    <el-button type="primary" size="mini" @click="enterDrawer2">带入</el-button>
-                </div>
-            </div>
-        </el-drawer>
+  <div class="bzzqyjStep1-1">
+    <!--    标准征求意见流程-->
+    <ProcessHeader toggle>
+      <template slot="proName">标准征求意见流程</template>
+      <template slot="proNode">申请人发起流程</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto;">
+        <el-form
+          ref="bzzqyjForm"
+          :model="form"
+          :rules="formRules"
+          class="label-input-form"
+          label-width="210px"
+        >
+          <ProcessTitle>
+            <template slot="title">基础信息</template>
+          </ProcessTitle>
+          <div class="prc-content-border">
+            <el-row :gutter="24">
+              <el-col :span="24">
+                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
+                  <div class="addButton">
+                    <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cid"
+                    placeholder="请输入标准编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model="form.cname"
+                    placeholder="请输入标准名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                  <el-date-picker
+                    v-model="form.endTime"
+                    type="date"
+                    placeholder="请选择结束日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                  <div class="addButton">
+                    <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="form.fjListId"
+                    style="display: none;"
+                  ></el-input>
+                  <div style="display: flex;">
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+      <el-collapse accordion>
+        <el-collapse-item title="意见填写">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <div class="block" style="padding-top: 20px;">
+        <el-timeline>
+          <el-form
+            ref="Form"
+            :model="roleForm"
+            :rules="roleFormRules"
+            class="label-input-form myForm">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="startUserName" style="margin-bottom: 0">
+                  <h4>流程发起人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.startUser" style="display: none;"/>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled/>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="dockUserList" style="margin-bottom: 0">
+                  <h4>责任部门对接人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUserList" style="display: none;"/>
+                    <el-input
+                      v-model="roleForm.dockUserListName"
+                      placeholder="选择责任部门对接人"
+                      @click.native="choiceZRRS">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审核征求意见" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="ministerUser" style="margin-bottom: 0">
+                  <h4>标准法规部部长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"/>
+                    <el-input
+                      v-model="roleForm.ministerUserName"
+                      placeholder="选择标准法规部部长·"
+                      @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
+                    />
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="审定征求意见" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="directorUser" style="margin-bottom: 0">
+                  <h4>技术管理中心主任</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.directorUser" style="display: none;"/>
+                    <el-input
+                      v-model="roleForm.directorUserName"
+                      placeholder="选择技术管理中心主任"
+                      @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
+                    />
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <el-timeline-item timestamp="批准征求意见" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="presidentUser" style="margin-bottom: 0">
+                  <h4>工程研究总院院长</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.presidentUser" style="display: none;"/>
+                    <el-input
+                      v-model="roleForm.presidentUserName"
+                      placeholder="选择工程研究总院院长"
+                      @click.native="choiceZRR('presidentUser', '选择工程研究总院院长', roleForm.presidentUser)"
+                    />
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+          </el-form>
+        </el-timeline>
+      </div>
+    </div>
+    <ProcessFooter
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <el-drawer
+      title="标准库"
+      :visible.sync="listModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content">
+          <!-- 顶部工具栏 -->
+          <table-tools-bar>
+            <div slot="left">
+              <div class="search-area">
+                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                  <el-formItem label="标准号/名称" prop="standNumber" class="search-item">
+                    <el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
+                  </el-formItem>
+                  <el-formItem label="标准类别" prop="standSort" class="search-item">
+                    <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
+                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                        {{ opt.label }}
+                      </el-option>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem label="标准来源" prop="standType" class="search-item">
+                    <el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
+                      <el-option value="INLAND" key="1" label="国内标准"></el-option>
+                      <el-option value="FOREIGN" key="2" label="海外标准"></el-option>
+                    </el-select>
+                  </el-formItem>
+                  <el-formItem class="search-item btn-box">
+                    <el-button
+                      type="primary"
+                      size="mini"
+                      class="common-button-primary"
+
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
+                    <el-button
+                      class="common-button-default"
+                      size="mini"
+                      @click="clearSearchStand">清空
+                    </el-button>
+                  </el-formItem>
+                </el-form>
+              </div>
+            </div>
+          </table-tools-bar>
+          <div class="table-wrap">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="standInfoList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelection"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column label="标准号" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">
+                      {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+                    </div>
+                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                      {{ scope.row.standNumber }}
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cname" label="标准名称" align="center">
+                  <template slot-scope="scope">
+                    <div @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</div>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </div>
+        <pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <loading :loading="spinShow">数据加载中……</loading>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="closeDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <el-drawer
+      title="选择附件"
+      :visible.sync="fzlistModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: calc(100% - 57px);">
+          <div class="table-wrap">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="fjList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelection2"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </div>
+        <loading :loading="fzShow">数据加载中……</loading>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="closeDrawer2">取消</el-button>
+          <el-button type="primary" size="mini" @click="enterDrawer2">带入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
 </template>
 
 
 <script>
-    import ProcessHeader from '../../components/ProcessHeader'
-    import ProcessFooter from '../../components/ProcessFooter'
-    import ProcessTitle from '../../components/ProcessTitle'
-    import { saveTaskFirst, queryTaskFirst } from 'api/process'
+import ProcessHeader from '../../components/ProcessHeader'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {saveTaskFirst, queryTaskFirst} from 'api/process'
 
-    export default {
-        name: "bzzqyjStep1-1",
-        data() {
-            return {
-                addFjList: [],
-                fzShow: false,
-                fzlistModel: false,
-                fjList: [],
-                commentText: '',
-                textarea: '', // 意见
-                title: '', // 新增抽屉标题
-                listModel: false, // 新增抽屉开关
-                active: '1', // 默认显示
-                isSubmit: false,
-                saveLoading: false,
-                // 基础信息form表单
-                form: {
-                    cid: '', // 编号
-                    endTime: '', // 结束日期
-                    cname: '', // 名称
-                    standType: '',
-                    standId: '',
-                    fjList: [],
-                    fjListId: ''
-                },
-                formRules: {
-                    cid: [
-                        { required: true, message: '请输入标准编号', trigger: 'change' },
-                    ],
-                    endTime: [
-                        { required: true, message: '请输入标准结束日期', trigger: 'change' },
-                    ],
-                    cname: [
-                        { required: true, message: '请输入标准名称', trigger: 'change' },
-                    ],
-                    fjListId: [
-                        { required: true, message: '请选择附件', trigger: 'change' },
-                    ]
-                },
-                // 标准征求意见数据可库
-                standCommonlySearch: {
-                    standSort: '',
-                    standNumber: '',
-                    standType: '',
-                    page: 1,
-                    pageSize: this.$store.getters.userInfo.configContent
-                },
-                spinShow: false,
-                standInfoList: [],
-                tableHeight: null,
-                total: 0,
-                selectedList: [],
-                data: [],
-                roleForm: {
-                    startUserName: this.$store.getters.userInfo.userName,
-                    startUser: this.$store.getters.userInfo.userId,
-                    dockUserList: '',
-                    dockUserListName: '',
-                    ministerUser: '',
-                    ministerUserName: '',
-                    directorUser: '',
-                    directorUserName: '',
-                    presidentUser: '',
-                    presidentUserName: '',
-                },
-                roleFormRules: {
-                    dockUserList: [
-                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
-                    ],
-                    ministerUser: [
-                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
-                    ],
-                    directorUser: [
-                        { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
-                    ],
-                    presidentUser: [
-                        { required: true, message: '请选择工程研究院院长', trigger: 'change' },
-                    ]
-                },
-                nodeList: [],
-                nodeList2: [],
-                type: '',
-                drawerTitle: '',
-                modalshowflag: false,
-                modalshowflag2: false,
-                standSortOptions: [],
-            }
-        },
-        components: {
-            ProcessHeader,
-            ProcessFooter,
-            ProcessTitle
-        },
-        mounted () {
-            this.getData()
-            this.sarStandCompareHis()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-            }, e => {
-            })
-            this.tableHeight = $('.content').height() - 44
-            window.onresize = () => {
-                this.tableHeight = $('.content').height() - 44
-            }
-        },
-        methods: {
-            updataFj (item) {
-                let id
-                let type = item.fileName.split('.')
-                if (type[1] === 'pdf') {
-                    id = item.attId
-                } else {
-                    id = item.oriAttId
-                }
-                window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
-            },
-            addfjList () {
-                this.$http.get('lawss/sarStandFile/queryFileInfo', {
-                    standId: this.form.standId
-                }, {}, res => {
-                    this.fjList = res.data
-                })
-                this.fzlistModel = true
-            },
-            handleSelection2 (data) {
-                this.addFjList = data
-            },
-            closeDrawer2 () {
-                this.fzlistModel = false
-                this.addFjList = []
-            },
-            enterDrawer2 () {
-                this.fzlistModel = false
-                this.form.fjList = this.addFjList
-                let idList
-                this.addFjList.forEach( item => {
-                    idList += item.id + ','
-                })
-                this.form.fjListId = idList
-            },
-            // 点击查看
-            handlePreview (item) {
-                let pageType
-                if (item.standType === 'FOREIGN') {
-                    pageType = 'FOREIGN_STAND'
-                } else {
-                    pageType = 'INLAND_STAND'
-                }
-                let routeUrl = this.$router.resolve({
-                    name: 'OtherStandardDetails',
-                    params: {
-                        id: item.id,
-                        pageType: pageType
-                    }
-                })
-                window.open(routeUrl.href, '_blank')
-            },
-            getData () {
-                queryTaskFirst({
-                    bpnId: this.$route.query.bpnId
-                }).then(res => {
-                    let mes = JSON.parse(res.mes)
-                    mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
-                    this.form = mes.form
-                    this.roleForm = mes.roleForm
-                    this.commentText = mes.commentText
-                })
-            },
-            addZqyjList() {
-                this.title = '国内外标准库'
-                this.listModel = true
-            },
-            /** 标准征求意见库方法*
-             * **********************************************/
-            // 清空
-            clearSearchStand () {
-                this.standCommonlySearch.page = 1
-                this.standCommonlySearch.standSort = ''
-                this.standCommonlySearch.standNumber = ''
-                this.standCommonlySearch.standType = ''
-                this.sarStandCompareHis()
-            },
-            // 搜索
-            sarStandCompareHisInfo() {
-                this.standCommonlySearch.page = 1
-                this.sarStandCompareHis()
-            },
-            // 查询表格
-            sarStandCompareHis () {
-                this.spinShow = true
-                var formData = this.standCommonlySearch
-                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
-                    _this: this
-                }, res => {
-                    this.standInfoList = res.data.list
-                    this.total = res.data.count
-                    this.spinShow = false
-                })
-                // var form = this.standCommonlySearch
-                // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-                //   _this: this
-                // }, res => {
-                //   this.standInfoList = res.data.records
-                //   this.total = res.data.total
-                //   this.spinShow = false
-                // }, e => {
-                // })
-            },
-            pageChange (page) {
-                this.standCommonlySearch.page = page
-                this.sarStandCompareHis()
-            },
-            // 分页每页显示数改变后方法
-            pageSizeChange (pageSize) {
-                this.$store.getters.userInfo.configContent = pageSize
-                this.standCommonlySearch.size = pageSize
-                this.sarStandCompareHis()
-            },
-            /** 选择带入数据的方法操作
-             * */
-            handleSelection(data) {
-                this.selectedList = [];
-                for (let i = 0; i < data.length; i++) {
-                    this.selectedList.push(data[i].id);
-                }
-            },
-            closeDrawer() {
-                this.listModel = false
-            },
-            enterDrawer() {
-                if (this.selectedList.length === 1) {
-                    let deposit = new Map();
-                    this.standInfoList.forEach(item => {
-                        deposit.set(item.id, item);
-                    });
-                    let bringData = [];
-                    for (let i = 0; i < this.selectedList.length; i++) {
-                        bringData.push(deposit.get(this.selectedList[i]));
-                    }
-                    if (bringData[0].standYear) {
-                        this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
-                    } else {
-                        this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
-                    }
-                    this.form.cname = bringData[0].standName;
-                    this.listModel = false;
-                } else if (this.selectedList.length > 1) {
-                    this.$message.warning("只能选择一条数据进行带入");
-                } else {
-                    this.$message.warning("请选择一条数据进行带入");
-                }
-            },
-            /*** **********************************************/
-            /** 流程节点负责人的选择 *****************************/
-            checkedRole2 (data) {
-                var idList = ''
-                var nameList = ''
-                data.forEach( item => {
-                    if (nameList.length > 0) {
-                        nameList += ','
-                        idList += ','
-                    }
-                    idList += item.id
-                    nameList += item.name
-                })
-                this.roleForm.dockUserList = idList
-                this.roleForm.dockUserListName = nameList
-            },
-            checkedRole (data) {
-                if (this.type === 'ministerUser') {
-                    this.roleForm.ministerUser = data[0].id
-                    this.roleForm.ministerUserName = data[0].name
-                } else if (this.type === 'directorUser') {
-                    this.roleForm.directorUser = data[0].id
-                    this.roleForm.directorUserName = data[0].name
-                } else if (this.type === 'presidentUser') {
-                    this.roleForm.presidentUser = data[0].id
-                    this.roleForm.presidentUserName = data[0].name
-                }
-            },
-            choiceZRRS () {
-                this.nodeList2 = []
-                if ( this.roleForm.dockUserList.length > 0) {
-                    this.nodeList2 = this.roleForm.dockUserList.split(',')
-                }
-                this.modalshowflag2 = true
-            },
-            choiceZRR (type, title, id) {
-                this.nodeList = []
-                this.nodeList.push(id)
-                this.type = type
-                this.drawerTitle = title
-                this.modalshowflag = true
-            },
-            handleTabs(name) {
-                this.active = name
-            },
-            handleSave() {},
-            handleSubmit() {
-                this.$refs['bzzqyjForm'].validate((valid) => {
-                    if (valid) {
-                        this.$refs['Form'].validate((valid) => {
-                            if (valid) {
-                                this.isSubmit = true
-                                this.$http.get('lawss/activiti/startProcess', {
-                                    type: '3'
-                                }, {}, res => {
-                                    if (res.ok) {
-                                        var json = Object.assign(this.form, this.roleForm)
-                                        json.commentText = this.commentText
-                                        this.$http.post('lawss/activiti/completeTask', {
-                                            json: JSON.stringify(json),
-                                            taskId: res.data,
-                                            userId: this.$store.getters.userInfo.userId
-                                        }, {}, res => {
-                                            if (res.success) {
-                                                this.$message.success('流程发起成功')
-                                                this.$router.push('/processCenter')
-                                            }
-                                        })
-                                    } else {
-                                        this.$message.warning('流程启动失败')
-                                      this.isSubmit = false
-                                    }
-                                })
-                            } else {
-                                return this.$message.warning('请完善人员信息')
-                            }
-                        })
-                    } else {
-                        return this.$message.warning('请完善基础信息')
-                    }
-                })
-            }
-        }
+export default {
+  name: "bzzqyjStep1-1",
+  data() {
+    return {
+      addFjList: [],
+      fzShow: false,
+      fzlistModel: false,
+      fjList: [],
+      commentText: '',
+      textarea: '', // 意见
+      title: '', // 新增抽屉标题
+      listModel: false, // 新增抽屉开关
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      // 基础信息form表单
+      form: {
+        cid: '', // 编号
+        endTime: '', // 结束日期
+        cname: '', // 名称
+        standType: '',
+        standId: '',
+        fjList: [],
+        fjListId: ''
+      },
+      formRules: {
+        cid: [
+          {required: true, message: '请输入标准编号', trigger: 'change'},
+        ],
+        endTime: [
+          {required: true, message: '请输入标准结束日期', trigger: 'change'},
+        ],
+        cname: [
+          {required: true, message: '请输入标准名称', trigger: 'change'},
+        ],
+        fjListId: [
+          {required: true, message: '请选择附件', trigger: 'change'},
+        ]
+      },
+      // 标准征求意见数据可库
+      standCommonlySearch: {
+        standSort: '',
+        standNumber: '',
+        standType: '',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
+      spinShow: false,
+      standInfoList: [],
+      tableHeight: null,
+      total: 0,
+      selectedList: [],
+      data: [],
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        dockUserList: '',
+        dockUserListName: '',
+        ministerUser: '',
+        ministerUserName: '',
+        directorUser: '',
+        directorUserName: '',
+        presidentUser: '',
+        presidentUserName: '',
+      },
+      roleFormRules: {
+        dockUserList: [
+          {required: true, message: '请选择责任部门对接人', trigger: 'change'},
+        ],
+        ministerUser: [
+          {required: true, message: '请选择标准法规部部长', trigger: 'change'},
+        ],
+        directorUser: [
+          {required: true, message: '请选择技术管理中心主任', trigger: 'change'},
+        ],
+        presidentUser: [
+          {required: true, message: '请选择工程研究院院长', trigger: 'change'},
+        ]
+      },
+      nodeList: [],
+      nodeList2: [],
+      type: '',
+      drawerTitle: '',
+      modalshowflag: false,
+      modalshowflag2: false,
+      standSortOptions: [],
     }
+  },
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  mounted() {
+    this.getData()
+    this.sarStandCompareHis()
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+    }, e => {
+    })
+    this.tableHeight = $('.content').height() - 44
+    window.onresize = () => {
+      this.tableHeight = $('.content').height() - 44
+    }
+  },
+  methods: {
+    updataFj(item) {
+      let id
+      let type = item.fileName.split('.')
+      if (type[1] === 'pdf') {
+        id = item.attId
+      } else {
+        id = item.oriAttId
+      }
+      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+    },
+    addfjList() {
+      this.$http.get('lawss/sarStandFile/queryFileInfo', {
+        standId: this.form.standId
+      }, {}, res => {
+        this.fjList = res.data
+      })
+      this.fzlistModel = true
+    },
+    handleSelection2(data) {
+      this.addFjList = data
+    },
+    closeDrawer2() {
+      this.fzlistModel = false
+      this.addFjList = []
+    },
+    enterDrawer2() {
+      this.fzlistModel = false
+      this.form.fjList = this.addFjList
+      let idList
+      this.addFjList.forEach(item => {
+        idList += item.id + ','
+      })
+      this.form.fjListId = idList
+    },
+    // 点击查看
+    handlePreview(item) {
+      let pageType
+      if (item.standType === 'FOREIGN') {
+        pageType = 'FOREIGN_STAND'
+      } else {
+        pageType = 'INLAND_STAND'
+      }
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: pageType
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+        this.commentText = mes.commentText
+      })
+    },
+    addZqyjList() {
+      this.title = '国内外标准库'
+      this.listModel = true
+    },
+    /** 标准征求意见库方法*
+     * **********************************************/
+    // 清空
+    clearSearchStand() {
+      this.standCommonlySearch.page = 1
+      this.standCommonlySearch.standSort = ''
+      this.standCommonlySearch.standNumber = ''
+      this.standCommonlySearch.standType = ''
+      this.sarStandCompareHis()
+    },
+    // 搜索
+    sarStandCompareHisInfo() {
+      this.standCommonlySearch.page = 1
+      this.sarStandCompareHis()
+    },
+    // 查询表格
+    sarStandCompareHis() {
+      this.spinShow = true
+      var formData = this.standCommonlySearch
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+        _this: this
+      }, res => {
+        this.standInfoList = res.data.list
+        this.total = res.data.count
+        this.spinShow = false
+      })
+      // var form = this.standCommonlySearch
+      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
+      //   _this: this
+      // }, res => {
+      //   this.standInfoList = res.data.records
+      //   this.total = res.data.total
+      //   this.spinShow = false
+      // }, e => {
+      // })
+    },
+    pageChange(page) {
+      this.standCommonlySearch.page = page
+      this.sarStandCompareHis()
+    },
+    // 分页每页显示数改变后方法
+    pageSizeChange(pageSize) {
+      this.$store.getters.userInfo.configContent = pageSize
+      this.standCommonlySearch.size = pageSize
+      this.sarStandCompareHis()
+    },
+    /** 选择带入数据的方法操作
+     * */
+    handleSelection(data) {
+      this.selectedList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id);
+      }
+    },
+    closeDrawer() {
+      this.listModel = false
+    },
+    enterDrawer() {
+      if (this.selectedList.length === 1) {
+        let deposit = new Map();
+        this.standInfoList.forEach(item => {
+          deposit.set(item.id, item);
+        });
+        let bringData = [];
+        for (let i = 0; i < this.selectedList.length; i++) {
+          bringData.push(deposit.get(this.selectedList[i]));
+        }
+        if (bringData[0].standYear) {
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+        } else {
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+        }
+        this.form.cname = bringData[0].standName;
+        this.listModel = false;
+      } else if (this.selectedList.length > 1) {
+        this.$message.warning("只能选择一条数据进行带入");
+      } else {
+        this.$message.warning("请选择一条数据进行带入");
+      }
+    },
+    /*** **********************************************/
+    /** 流程节点负责人的选择 *****************************/
+    checkedRole2(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.roleForm.dockUserList = idList
+      this.roleForm.dockUserListName = nameList
+    },
+    checkedRole(data) {
+      if (this.type === 'ministerUser') {
+        this.roleForm.ministerUser = data[0].id
+        this.roleForm.ministerUserName = data[0].name
+      } else if (this.type === 'directorUser') {
+        this.roleForm.directorUser = data[0].id
+        this.roleForm.directorUserName = data[0].name
+      } else if (this.type === 'presidentUser') {
+        this.roleForm.presidentUser = data[0].id
+        this.roleForm.presidentUserName = data[0].name
+      }
+    },
+    choiceZRRS() {
+      this.nodeList2 = []
+      if (this.roleForm.dockUserList.length > 0) {
+        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      }
+      this.modalshowflag2 = true
+    },
+    choiceZRR(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.modalshowflag = true
+    },
+    handleTabs(name) {
+      this.active = name
+    },
+    handleSave() {
+    },
+    handleSubmit() {
+      this.$refs['bzzqyjForm'].validate((valid) => {
+        if (valid) {
+          this.$refs['Form'].validate((valid) => {
+            if (valid) {
+              this.isSubmit = true
+              this.$http.get('lawss/activiti/startProcess', {
+                type: '3'
+              }, {}, res => {
+                if (res.ok) {
+                  var json = Object.assign(this.form, this.roleForm)
+                  json.commentText = this.commentText
+                  json.filesId = this.roleForm.dockUserList
+                  json.filesName = this.roleForm.dockUserListName
+                  this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: res.data,
+                    userId: this.$store.getters.userInfo.userId
+                  }, {}, res => {
+                    if (res.success) {
+                      this.$message.success('流程发起成功')
+                      this.$router.push('/processCenter')
+                    }
+                  })
+                } else {
+                  this.$message.warning('流程启动失败')
+                  this.isSubmit = false
+                }
+              })
+            } else {
+              return this.$message.warning('请完善人员信息')
+            }
+          })
+        } else {
+          return this.$message.warning('请完善基础信息')
+        }
+      })
+    }
+  }
+}
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
-    @import '~@/assets/styles/mixins';
-    .bzzqyjStep1-1 {
-        .myForm {
-            /deep/.el-form-item__content {
-                line-height: 10px;
-            }
-        }
-        /deep/.el-drawer__container {
-            .prc-content-border {
-                border: none;
-                padding: 0 20px 0;
-            }
-        }
-        position: relative;
-        height: 100%;
-        .headerTabs {
-            height: 52px;
-            display: flex;
-            align-items: center;
-            position: absolute;
-            top: 0;
-            right: 10px;
-            .headerTabsItem {
-                border: 1px solid #c1c1c1;
-                padding: 0 5px;
-                height: 30px;
-                line-height: 30px;
-                cursor: pointer;
-            }
-            .active {
-                border: 1px solid #E6A23C;
-                color: #fff;
-                background: #E6A23C;
-            }
-        }
-        .content {
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            height: calc(~'100% - 107px');
-            overflow: auto;
-        }
-        .standardForComments {
-            height: 100%;
-            background: #fff;
-            .el-divider--horizontal {
-                display: block;
-                height: 1px;
-                width: 100%;
-                margin: 0;
-            }
-            flex-direction: column;
-            .action-bar {
-                margin-bottom: 5px;
-                padding: 0;
-            }
-            .content {
-                flex: auto;
-                overflow: hidden;
-                display: flex;
-                flex-direction: column;
-                .table-wrap {
-                    flex: auto;
-                    overflow: hidden;
-                    position: relative;
-                }
-            }
-            & > .pagination {
-                position: static;
-                /deep/.pagination-slot {
-                    padding: 0;
-                }
-            }
-        }
+@import '~@/assets/styles/style';
+@import '~@/assets/styles/mixins';
+
+.bzzqyjStep1-1 {
+  .myForm {
+    /deep/ .el-form-item__content {
+      line-height: 10px;
     }
+  }
+
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 107px');
+    overflow: auto;
+  }
+
+  .standardForComments {
+    height: 100%;
+    background: #fff;
+
+    .el-divider--horizontal {
+      display: block;
+      height: 1px;
+      width: 100%;
+      margin: 0;
+    }
+
+    flex-direction: column;
+
+    .action-bar {
+      margin-bottom: 5px;
+      padding: 0;
+    }
+
+    .content {
+      flex: auto;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrap {
+        flex: auto;
+        overflow: hidden;
+        position: relative;
+      }
+    }
+
+    & > .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index bf5ddd7f1..dd9019148 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -334,6 +334,7 @@ export default {
         standType: '',
         standId: '',
         fjList: [],
+        fjListName: '',
         fjListId: ''
       },
       formRules: {
@@ -438,7 +439,11 @@ export default {
       this.fzlistModel = true
     },
     handleSelection2 (data) {
-      this.addFjList = data
+      if(data.length > 5) {
+        this.$message.warning('最多选择5条附件')
+      } else {
+        this.addFjList = data
+      }
     },
     closeDrawer2 () {
       this.fzlistModel = false
@@ -447,11 +452,14 @@ export default {
     enterDrawer2 () {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      let idList
-      this.addFjList.forEach( item => {
-        idList += item.id + ','
+      let idList = []
+      let nameList = []
+      this.addFjList.forEach(item => {
+        idList.push(item.id)
+        nameList.push(item.fileName)
       })
-      this.form.fjListId = idList
+      this.form.fjListName = nameList.join(',')
+      this.form.fjListId = idList.join(',')
     },
     // 点击查看
     handlePreview (item) {
@@ -633,6 +641,8 @@ export default {
                 if (res.ok) {
                   var json = Object.assign(this.form, this.roleForm)
                   json.commentText = this.commentText
+                  json.filesId = this.addFjList
+                  json.filesName = this.form.fjListName
                   this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: res.data,
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 37267af2f..9f421b5d9 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -1,480 +1,537 @@
 <!--征求意见详情-->
 <template>
-    <div class="consultationDetails">
-        <div class="contentTitle">
-            <div class="back" title="返回" @click="back">
-                <i class="el-icon-back"></i>
-            </div>
-            <div class="title">征求意见详情<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
-        </div>
-        <transition name="el-zoom-in-top">
-            <div v-show="heightShow" class="transition-box">
-                <p class="transition-box-p">
-                    <label class="transition-box-label">标准号：</label>
-                    <span class="transition-box-span table-jump"
-                          @click="handlePreview(itemData)"
-                    >
+  <div class="consultationDetails">
+    <div class="contentTitle">
+      <div class="back" title="返回" @click="back">
+        <i class="el-icon-back"></i>
+      </div>
+      <div class="title">征求意见详情<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
+    </div>
+    <transition name="el-zoom-in-top">
+      <div v-show="heightShow" class="transition-box">
+        <p class="transition-box-p">
+          <label class="transition-box-label">标准号：</label>
+          <span class="transition-box-span table-jump"
+                @click="handlePreview(itemData)"
+          >
                       {{ this.$route.query.item.cid }}
                     </span>
-                </p>
-                <p class="transition-box-p">
-                    <label class="transition-box-label">标准名称：</label>
-                    <span class="transition-box-span table-jump"
-                          @click="handlePreview(itemData)"
-                    >
+        </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">标准名称：</label>
+          <span class="transition-box-span table-jump"
+                @click="handlePreview(itemData)"
+          >
                       {{ this.$route.query.item.cname || '-' }}
                     </span>
-                </p>
-                <p class="transition-box-p">
-                    <label class="transition-box-label">上传时间：</label>
-                    <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
-                </p>
-                <p class="transition-box-p">
-                    <label class="transition-box-label">征求意见周期：</label>
-                    <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
-                    <span class="transition-box-span" v-else>-</span>
-                </p>
-            </div>
-        </transition>
-        <div class="effect">
-            <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
-            <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
-        </div>
-        <div class="container">
-            <el-table
-                    :data="standinfoList"
-                    height="100%"
-                    border
-                    style="width: 100%"
-                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-                <el-table-column
-                        type="index"
-                        label="序号"
-                        align="center"
-                        width="50">
-                </el-table-column>
-                <el-table-column
-                        prop="partCode"
-                        label="章节编号"
-                        sortable
-                        align="center"
-                        width="180">
-                </el-table-column>
-                <el-table-column
-                        prop="content"
-                        align="center"
-                        label="修改意见内容(包括理由或依据)"
-                >
-                    <el-table-column
-                            prop="oldText"
-                            align="center"
-                            label="修改前"
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            prop="newText"
-                            align="center"
-                            label="修改后"
-                    >
-                    </el-table-column>
-                    <el-table-column
-                            prop="reason"
-                            align="center"
-                            label="修改理由"
-                    >
-                    </el-table-column>
-                </el-table-column>
-                <el-table-column
-                        prop="deptName"
-                        align="center"
-                        label="提出部门"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="userName"
-                        align="center"
-                        label="提出人"
-                >
-                </el-table-column>
-                <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
-                    <template slot-scope="scope">
-                        <div @click.stop style="display: inline-block">
-                            <el-dropdown trigger="click" @command="handleCommand">
-                                <i class="iconfont">&#xe61e;</i>
-                                <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                    <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        </div>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-        <pagination
-                style="position: static;width: 100%;"
-                :page="form.page"
-                :total="total"
-                @pageChange="handlePageChange"
-                @pageSizeChange="handlePageSizeChange"></pagination>
-        <el-drawer
-                :title=opiniontitle
-                :visible.sync="isDialog"
-                :wrapperClosable="false"
-                size="1050px"
-                destroy-on-close
-                :before-close="closeDrawer"
-        >
-            <div class="demo-drawer-content add-demo">
-                <div class="search-area">
-                    <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
-                        <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
-                            <el-input  v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
-                        </el-form-item>
-                        <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
-                            <el-input  v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
-                        </el-form-item>
-                        <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
-                            <el-input  v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
-                        </el-form-item>
-                        <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
-                            <el-input  v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
-                        </el-form-item>
-                    </el-form>
-                </div>
-                <div class="demo-drawer-footer">
-                    <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
-                    <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
-                </div>
-            </div>
-        </el-drawer>
-        <loading :loading="spinShow">数据加载中……</loading>
+        </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">附件：</label>
+          <span class="file-box" v-if="fileInfoList.length > 0">
+                     <span v-for="(file,item) in fileInfoList"
+                           target="_blank"
+                           class="transition-box-span table-jump"
+                           @click="handleQueryPdf(file)"
+                           :key="item">
+                       {{ file.name }}
+                     </span>
+                  </span>
+          <span class="transition-box-span" v-else>-</span>
+        </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">上传时间：</label>
+          <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
+        </p>
+        <p class="transition-box-p">
+          <label class="transition-box-label">征求意见周期：</label>
+          <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime }}</span>
+          <span class="transition-box-span" v-else>-</span>
+        </p>
+      </div>
+    </transition>
+    <div class="effect">
+      <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">
+        添加
+      </el-button>
+      <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
     </div>
+    <div class="container">
+      <el-table
+        :data="standinfoList"
+        height="100%"
+        border
+        style="width: 100%"
+        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+        <el-table-column
+          type="index"
+          label="序号"
+          align="center"
+          width="50">
+        </el-table-column>
+        <el-table-column
+          prop="partCode"
+          label="章节编号"
+          sortable
+          align="center"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="content"
+          align="center"
+          label="修改意见内容(包括理由或依据)"
+        >
+          <el-table-column
+            prop="oldText"
+            align="center"
+            label="修改前"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="newText"
+            align="center"
+            label="修改后"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="reason"
+            align="center"
+            label="修改理由"
+          >
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          prop="deptName"
+          align="center"
+          label="提出部门"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="userName"
+          align="center"
+          label="提出人"
+        >
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
+          <template slot-scope="scope">
+            <div @click.stop style="display: inline-block">
+              <el-dropdown trigger="click" @command="handleCommand">
+                <i class="iconfont">&#xe61e;</i>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">
+                    编辑
+                  </el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '删除']">
+                    删除
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination
+      style="position: static;width: 100%;"
+      :page="form.page"
+      :total="total"
+      @pageChange="handlePageChange"
+      @pageSizeChange="handlePageSizeChange"></pagination>
+    <el-drawer
+      :title=opiniontitle
+      :visible.sync="isDialog"
+      :wrapperClosable="false"
+      size="1050px"
+      destroy-on-close
+      :before-close="closeDrawer"
+    >
+      <div class="demo-drawer-content add-demo">
+        <div class="search-area">
+          <el-form style="width: 100%;" :model="opinionContent" ref="formAdd" :rules="opinionContentRules" class="label-input-form">
+            <el-form-item label="章节编号" label-width="" prop="partCode" class="add-form-item">
+              <el-input v-model="opinionContent.partCode" autocomplete="off" placeholder="请输入章节编号"></el-input>
+            </el-form-item>
+            <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
+              <el-input v-model="opinionContent.oldText" autocomplete="off" placeholder="请输入"></el-input>
+            </el-form-item>
+            <el-form-item label="修改后" prop="newText" label-width="" class="add-form-item">
+              <el-input v-model="opinionContent.newText" autocomplete="off" placeholder="请输入"></el-input>
+            </el-form-item>
+            <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
+              <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">
+            提交
+          </el-button>
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
+        </div>
+      </div>
+    </el-drawer>
+    <loading :loading="spinShow">数据加载中……</loading>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: 'consultationDetails',
-        data () {
-            return {
-                itemData: this.$route.query.item,
-                id: '', // 选中id
-                type: '', // 选中状态
-                spinShow: false,
-                total: 0, // 总数
-                opiniontitle: '新增意见', // 抽屉标题
-                isDialog: false, //新增抽屉状态
-                heightShow: true, // 高度
-                isSubmit: false,
-                opinionContent: { // 抽屉数据
-                    partCode: '',
-                    oldText: '',
-                    newText: '',
-                    reason: ''
-                },
-                opinionContentRules: {
-                    partCode: [
-                        { required: true, message: '请输入章节编号', trigger: 'blur' },
-                    ],
-                    oldText: [
-                        { required: true, message: '请输入修改前内容', trigger: 'blur' }
-                    ],
-                    newText: [
-                        { required: true, message: '请输入修改后内容', trigger: 'blur' }
-                    ],
-                    reason: [
-                        { required: true, message: '请输入修改理由', trigger: 'blur' }
-                    ],
-                },
-                standinfoList: [], // 详情列表
-                form: {
-                    ideaId: this.$route.query.item.id,
-                    cid: this.$route.query.item.cid,
-                    page: 1,
-                    size: this.$store.getters.userInfo.configContent,
-                    userId: this.$store.getters.userInfo.userId,
-                    endTime:  this.$route.query.item.endTime
-                }, // 详情数据
-                ideaKey: false
-            }
-        },
-        methods: {
-          // 点击查看
-          handlePreview (item) {
-            let routeUrl = this.$router.resolve({
-              name: 'OtherStandardDetails',
-              params: {
-                id: item.standId,
-                pageType: 'INLAND_STAND'
-              }
-            })
-            window.open(routeUrl.href, '_blank')
-          },
-            exportAll () {
-                window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
-            },
-            getIdeaKey () {
-                this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
-                    endTime: this.form.endTime
-                }, {}, res => {
-                    if (res.message === '1') {
-                        this.ideaKey = false
-                    } else {
-                        this.ideaKey = true
-                    }
-                })
-            },
-            // 获取详情信息列表
-            getList() {
-                this.spinShow = true
-                this.$http.get('slrs/sar-public-idea-all/getAllStand', this.form, {
-                    _this: this
-                }, res => {
-                    this.standinfoList = res.data.records
-                    this.total = res.data.total
-                    this.spinShow = false
-                }, e => {
-                })
-            },
-            //分页数据改变
-            handlePageChange(page) {
-                this.form.page = page
-                this.getList()
-            },
-            handlePageSizeChange(pageSize) {
-                this.$store.getters.userInfo.configContent = pageSize
-                this.form.size = pageSize
-                this.getList()
-            },
-            back (){
-                this.$router.push({
-                    name:'standardForComments'
-                })
-            },
-            // 更多
-            handleCommand (command) {
-                switch (command[1]) {
-                    case '编辑':
-                        this.selectStandardPro('edit', command[0])
-                        break
-                    case '删除':
-                        this.deleteStand(command[0].id)
-                        break
-                }
-            },
-            //编辑
-            selectStandardPro(type, row){
-                this.type = type
-                if (type === 'edit') {
-                    this.id = row.id
-                    this.opiniontitle = '编辑意见内容'
-                    this.opinionContent.partCode = row.partCode
-                    this.opinionContent.reason = row.reason
-                    this.opinionContent.oldText = row.oldText
-                    this.opinionContent.newText = row.newText
-                } else {
-                    this.id = ''
-                    this.opiniontitle = '新增意见'
-                    this.opinionContent.partCode = ''
-                    this.opinionContent.reason = ''
-                    this.opinionContent.oldText = ''
-                    this.opinionContent.newText = ''
-                }
-                this.isDialog = true
-            },
-            //删除
-            deleteStand(id){
-                this.$confirm('确认删除这些意见？', '提示', {
-                    confirmButtonText: '确定',
-                    confirmButtonClass: 'common-button-primary',
-                    cancelButtonText: '取消',
-                    type: 'warning',
-                    roundButton: false
-                }).then(() => {
-                    var form = {
-                        id: id,
-                        autUserId: this.$store.getters.userInfo.userId,
-                        userId: this.$store.getters.userInfo.userId
-                    }
-                    this.$http.get('slrs/sar-public-idea-all/deleteStand', form, {
-                        _this: this
-                    }, res => {
-                        this.$message.warning(res.message)
-                        this.form.page = 1
-                        this.getList()
-                    })
-                    //确认事件
-                }).catch(() => {
-                    this.$message.warning('取消删除')
-                    //取消事件
-                })
-            },
-            //点击抽屉按钮提交事件
-            saveUserInfo() {
-                this.$refs['formAdd'].validate((valid) => {
-                    if (valid) {
-                        var url = ''
-                        var form = {
-                            ideaId: this.$route.query.item.id,
-                            cid: this.$route.query.item.cid,
-                            content: this.opinionContent.content,
-                            oldText: this.opinionContent.oldText,
-                            newText: this.opinionContent.newText,
-                            reason: this.opinionContent.reason,
-                            partCode: this.opinionContent.partCode,
-                            userId: this.$store.getters.userInfo.userId || '',
-                            userName: this.$store.getters.userInfo.userName || '',
-                            deptName: this.$store.getters.userInfo.orgName || '',
-                            deptId: this.$store.getters.userInfo.orgId || ''
-                        }
-                        if (this.type === 'edit') {
-                            form.id = this.id
-                            form.autUserId = this.$store.getters.userInfo.userId
-                            url = 'slrs/sar-public-idea-all/updateStand'
-                        } else {
-                            url = 'slrs/sar-public-idea-all/insetStand'
-                        }
-                        this.$http.post(url, form, {
-                            _this: this
-                        }, res => {
-                            if (res.respCode === '200') {
-                                this.form.page = 1
-                                this.getList()
-                            }
-                        })
-                        this.isDialog = false
-                    }
-                })
-            },
-            //点击抽屉按钮取消事件
-            closeDrawer() {
-                this.isDialog = false
-            },
-        },
-        mounted () {
-            this.getList()
-            this.getIdeaKey()
-        }
+export default {
+  name: 'consultationDetails',
+  data() {
+    return {
+      fileInfoList: [],
+      itemData: this.$route.query.item,
+      id: '', // 选中id
+      type: '', // 选中状态
+      spinShow: false,
+      total: 0, // 总数
+      opiniontitle: '新增意见', // 抽屉标题
+      isDialog: false, //新增抽屉状态
+      heightShow: true, // 高度
+      isSubmit: false,
+      opinionContent: { // 抽屉数据
+        partCode: '',
+        oldText: '',
+        newText: '',
+        reason: ''
+      },
+      opinionContentRules: {
+        partCode: [
+          {required: true, message: '请输入章节编号', trigger: 'blur'},
+        ],
+        oldText: [
+          {required: true, message: '请输入修改前内容', trigger: 'blur'}
+        ],
+        newText: [
+          {required: true, message: '请输入修改后内容', trigger: 'blur'}
+        ],
+        reason: [
+          {required: true, message: '请输入修改理由', trigger: 'blur'}
+        ],
+      },
+      standinfoList: [], // 详情列表
+      form: {
+        ideaId: this.$route.query.item.id,
+        cid: this.$route.query.item.cid,
+        page: 1,
+        size: this.$store.getters.userInfo.configContent,
+        userId: this.$store.getters.userInfo.userId,
+        endTime: this.$route.query.item.endTime
+      }, // 详情数据
+      ideaKey: false
     }
+  },
+  methods: {
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    exportAll() {
+      window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
+    },
+    getIdeaKey() {
+      this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+        endTime: this.form.endTime
+      }, {}, res => {
+        if (res.message === '1') {
+          this.ideaKey = false
+        } else {
+          this.ideaKey = true
+        }
+      })
+    },
+    // 获取详情信息列表
+    getList() {
+      this.spinShow = true
+      this.$http.get('slrs/sar-public-idea-all/getAllStand', this.form, {
+        _this: this
+      }, res => {
+        this.standinfoList = res.data.records
+        this.total = res.data.total
+        this.spinShow = false
+      }, e => {
+      })
+    },
+    //分页数据改变
+    handlePageChange(page) {
+      this.form.page = page
+      this.getList()
+    },
+    handlePageSizeChange(pageSize) {
+      this.$store.getters.userInfo.configContent = pageSize
+      this.form.size = pageSize
+      this.getList()
+    },
+    back() {
+      this.$router.push({
+        name: 'standardForComments'
+      })
+    },
+    // 更多
+    handleCommand(command) {
+      switch (command[1]) {
+        case '编辑':
+          this.selectStandardPro('edit', command[0])
+          break
+        case '删除':
+          this.deleteStand(command[0].id)
+          break
+      }
+    },
+    //编辑
+    selectStandardPro(type, row) {
+      this.type = type
+      if (type === 'edit') {
+        this.id = row.id
+        this.opiniontitle = '编辑意见内容'
+        this.opinionContent.partCode = row.partCode
+        this.opinionContent.reason = row.reason
+        this.opinionContent.oldText = row.oldText
+        this.opinionContent.newText = row.newText
+      } else {
+        this.id = ''
+        this.opiniontitle = '新增意见'
+        this.opinionContent.partCode = ''
+        this.opinionContent.reason = ''
+        this.opinionContent.oldText = ''
+        this.opinionContent.newText = ''
+      }
+      this.isDialog = true
+    },
+    //删除
+    deleteStand(id) {
+      this.$confirm('确认删除这些意见？', '提示', {
+        confirmButtonText: '确定',
+        confirmButtonClass: 'common-button-primary',
+        cancelButtonText: '取消',
+        type: 'warning',
+        roundButton: false
+      }).then(() => {
+        var form = {
+          id: id,
+          autUserId: this.$store.getters.userInfo.userId,
+          userId: this.$store.getters.userInfo.userId
+        }
+        this.$http.get('slrs/sar-public-idea-all/deleteStand', form, {
+          _this: this
+        }, res => {
+          this.$message.warning(res.message)
+          this.form.page = 1
+          this.getList()
+        })
+        //确认事件
+      }).catch(() => {
+        this.$message.warning('取消删除')
+        //取消事件
+      })
+    },
+    //点击抽屉按钮提交事件
+    saveUserInfo() {
+      this.$refs['formAdd'].validate((valid) => {
+        if (valid) {
+          var url = ''
+          var form = {
+            ideaId: this.$route.query.item.id,
+            cid: this.$route.query.item.cid,
+            content: this.opinionContent.content,
+            oldText: this.opinionContent.oldText,
+            newText: this.opinionContent.newText,
+            reason: this.opinionContent.reason,
+            partCode: this.opinionContent.partCode,
+            userId: this.$store.getters.userInfo.userId || '',
+            userName: this.$store.getters.userInfo.userName || '',
+            deptName: this.$store.getters.userInfo.orgName || '',
+            deptId: this.$store.getters.userInfo.orgId || ''
+          }
+          if (this.type === 'edit') {
+            form.id = this.id
+            form.autUserId = this.$store.getters.userInfo.userId
+            url = 'slrs/sar-public-idea-all/updateStand'
+          } else {
+            url = 'slrs/sar-public-idea-all/insetStand'
+          }
+          this.$http.post(url, form, {
+            _this: this
+          }, res => {
+            if (res.respCode === '200') {
+              this.form.page = 1
+              this.getList()
+            }
+          })
+          this.isDialog = false
+        }
+      })
+    },
+    //点击抽屉按钮取消事件
+    closeDrawer() {
+      this.isDialog = false
+    },
+    getFileInfo() {
+      JSON.parse(this.$route.query.item.files).forEach(item=>{
+        this.fileInfoList.push({
+          attId: item.attId,
+          id: item.id,
+          name: item.fileName
+        })
+      })
+    },
+    handleQueryPdf(file){
+      window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id))
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getIdeaKey()
+    this.getFileInfo()
+  }
+}
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/mixins';
-    @import '~@/assets/styles/style';
-    .consultationDetails {
-        height: 100%;
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
+
+.consultationDetails {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .iconClass {
+    width: 18px;
+    height: 18px;
+  }
+
+  .contentTitle {
+    display: flex;
+    align-items: center;
+    padding: 0 10px;
+    height: 50px;
+    background: #ffffff;
+
+    .title {
+      flex: 1;
+      font-weight: bold;
+      font-size: 20px;
+      margin-left: 15px;
+
+      .el-icon-s-order {
+        font-size: 22px;
+        color: #4498F0;
+        cursor: pointer;
+      }
+    }
+  }
+
+  .transition-box {
+    padding: 0 10px;
+    background: #ffffff;
+    font-size: 14px;
+
+    .transition-box-p {
+      line-height: 35px;
+
+      .transition-box-label {
+        display: inline-block;
+        width: 100px;
+        vertical-align: top;
+      }
+
+      .transition-box-span {
+        display: inline-block;
+        width: calc(~'100% - 100px');
+      }
+
+      .file-box {
+        display: inline-block;
+        width: calc(~'100% - 100px');
+
+        .transition-box-span {
+          display: inline;
+          width: 100%;
+          cursor: pointer;
+          color: #4498f0;
+        }
+
+        p {
+          & > a {
+            cursor: pointer;
+          }
+
+          & > i {
+            display: inline-block;
+            margin-left: 3px;
+            width: 18px;
+            height: 16px;
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+            background-position: center center;
+            vertical-align: sub;
+            cursor: pointer;
+          }
+
+          .icon-download {
+            background-image: url("~assets/images/shangqi/img/download.png");
+          }
+
+          .icon-download2 {
+            background-image: url("~assets/images/shangqi/img/download2.png");
+          }
+        }
+
+      }
+    }
+  }
+
+  .effect {
+    margin: 10px 10px 0 0;
+  }
+
+  .container {
+    height: calc(~'100% - 52px - 55px - 50px');
+    flex: auto;
+    display: flex;
+    margin: 10px 0;
+    flex-direction: column;
+    padding: 0;
+
+    .el-tabs {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      flex: auto;
+
+      /deep/ .el-tabs__content {
+        //height: calc(~'100% - 55px');
+        overflow-y: auto;
+        flex: auto;
         display: flex;
         flex-direction: column;
-        .iconClass{
-            width: 18px;
-            height: 18px;
-        }
-        .contentTitle {
-            display: flex;
-            align-items: center;
-            padding: 0 10px;
-            height: 50px;
-            background: #ffffff;
-            .title{
-                flex: 1;
-                font-weight: bold;
-                font-size: 20px;
-                margin-left: 15px;
-                .el-icon-s-order{
-                    font-size: 22px;
-                    color: #4498F0;
-                    cursor: pointer;
-                }
-            }
-        }
-        .transition-box{
-            padding: 0 10px;
-            background: #ffffff;
-            font-size: 14px;
-            .transition-box-p{
-                line-height: 35px;
-                .transition-box-label{
-                    display: inline-block;
-                    width: 100px;
-                    vertical-align: top;
-                }
-                .transition-box-span{
-                    display: inline-block;
-                    width: calc(~'100% - 100px');
-                }
-                .file-box{
-                    display: inline-block;
-                    width: calc(~'100% - 100px');
-                    .transition-box-span{
-                        display: inline;
-                        width: 100%;
-                        cursor: pointer;
-                        color: #4498f0;
-                    }
-                    p{
-                        & > a{
-                            cursor: pointer;
-                        }
-                        & > i{
-                            display: inline-block;
-                            margin-left: 3px;
-                            width: 18px;
-                            height: 16px;
-                            background-repeat: no-repeat;
-                            background-size: 100% 100%;
-                            background-position: center center;
-                            vertical-align: sub;
-                            cursor: pointer;
-                        }
-                        .icon-download{
-                            background-image: url("~assets/images/shangqi/img/download.png");
-                        }
-                        .icon-download2{
-                            background-image: url("~assets/images/shangqi/img/download2.png");
-                        }
-                    }
 
-                }
-            }
-        }
-        .effect {
-            margin: 10px 10px 0 0;
-        }
-        .container {
-            height: calc(~'100% - 52px - 55px - 50px');
-            flex: auto;
-            display: flex;
-            margin:10px 0;
-            flex-direction: column;
-            padding: 0;
-            .el-tabs{
-                height: 100%;
-                display: flex;
-                flex-direction: column;
-                flex: auto;
-                /deep/.el-tabs__content{
-                    //height: calc(~'100% - 55px');
-                    overflow-y: auto;
-                    flex: auto;
-                    display: flex;
-                    flex-direction: column;
-                    .el-tab-pane{
-                        height: 100%;
-                        flex: auto;
-                        display: flex;
-                        flex-direction: column;
-                    }
-                }
-            }
-        }
-        .add-demo {
-            .search-area {
-                height: 100%;
-            }
-            ::v-deep .el-textarea__inner {
-                width: 1000px;
-            }
+        .el-tab-pane {
+          height: 100%;
+          flex: auto;
+          display: flex;
+          flex-direction: column;
         }
+      }
     }
+  }
+
+  .add-demo {
+    .search-area {
+      height: 100%;
+    }
+
+    ::v-deep .el-textarea__inner {
+      width: 1000px;
+    }
+  }
+}
 </style>

From 756406ae30ba15338bc49e19559a07d5b602235a Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 9 Sep 2021 18:59:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 632631e7c..35a773a73 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -836,7 +836,7 @@
           <label class="see-drawer-name" title="新车型实施日期">新车型实施日期</label>
           <span class="see-drawer-val"
                 :title="standShowItemEO.xcxssrq">{{
-              standShowItemEO.xcxssrq ? $moment(standShowItemEO.xcxssrq).format('YYYY-MM-DD') : ''
+              standShowItemEO.xcxssrq ? $moment(standShowItemEO.xccssrq).format('YYYY-MM-DD') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">