commit

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -355,6 +355,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
+                        this.data = data.info
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -74,26 +74,10 @@
                             prop="chapterNumber"
                             label="章条编号"
                             width="170px">
-                        <template slot-scope="scope">
-                            <div v-if="scope.row.state == '2'">
-                                <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber" @change="changeInput(scope.$index)"></el-input>
-                            </div>
-                            <div v-else>
-                                {{ scope.row.chapterNumber }}
-                            </div>
-                        </template>
                     </el-table-column>
                     <el-table-column
                             prop="chapterName"
                             label="章节名称">
-                        <template slot-scope="scope">
-                            <div v-if="scope.row.state == '2'">
-                                <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
-                            </div>
-                            <div v-else>
-                                {{ scope.row.chapterName }}
-                            </div>
-                        </template>
                     </el-table-column>
                     <el-table-column
                             prop="commentText"
@@ -339,7 +323,10 @@
                         this.form.cname = data.cname
                         this.oldData = JSON.parse(JSON.stringify(data.summaryList))
                         data.summaryList.forEach( item => {
-                            item.state = '1'
+                            if (item.state) {
+                            } else {
+                                item.state = '1'
+                            }
                             item.type = false
                         })
                         this.json = data

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">标准法规部部长审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -73,6 +73,9 @@
               prop="endTime"
               label="征求意见周期"
               align="center">
+              <template slot-scope="scope">
+                {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
+              </template>
             </el-table-column>
             <el-table-column
               prop="startTime"

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -11,7 +11,7 @@
           <div v-show="heightShow" class="transition-box">
               <p class="transition-box-p">
                   <label class="transition-box-label">标准号：</label>
-                  <span class="transition-box-span">{{ this.$route.query.item.categorg }}</span>
+                  <span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
               </p>
               <p class="transition-box-p">
                   <label class="transition-box-label">标准名称：</label>
@@ -19,10 +19,11 @@
               </p>
               <p class="transition-box-p">
                   <label class="transition-box-label">上传时间：</label>
-                  <span class="transition-box-span">{{ this.$route.query.item.starttime || '-' }}</span>
+                  <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">-</span>
               </p> <p class="transition-box-p">
               <label class="transition-box-label">征求意见周期：</label>
-              <span class="transition-box-span">{{ this.$route.query.item.endtime || '-' }}</span>
+              <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
           </p>
           </div>
       </transition>
@@ -105,8 +106,8 @@
                     </el-form>
                 </div>
                 <div class="demo-drawer-footer">
-                    <el-button :loading="isSubmit" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
+                    <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
-                    <el-button class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
+                    <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
                 </div>
             </div>
         </el-drawer>