diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 3d6e695ee..dc34bc316 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -24,28 +24,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <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
+                          disabled
+                          v-model="form.cid"
+                          placeholder="请输入标准编号"
+                          clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                    disabled
-                    v-model="form.endTime"
-                    type="date"
-                    placeholder="请选择结束日期">
+                          disabled
+                          v-model="form.endTime"
+                          type="date"
+                          placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
@@ -54,7 +46,34 @@
                           style="display: none;"
                   ></el-input>
                   <div>
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="fileClass"
+                         style="margin-right: 15px;padding-left: 10px"
+                         v-for="(item, index) in form.fjList"
+                         :key="index">
+                      <span @click="fileLook(item)">{{ item.fileName }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                </el-form-item>
+                <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                      <span @click="fileLook(item)">{{ item.name }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
                   </div>
                 </el-form-item>
               </el-col>
@@ -67,12 +86,14 @@
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(data, '汇总单.xls')"
-                     size="mini">导出汇总单</el-button>
+                     @click="upload(oldData, '汇总单.xls')"
+                     size="mini">生成汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
-                     @click="upload(oldData, '征求意见搞.xls')"
-                     size="mini">导出征求意见搞</el-button>
+                     @click="upload(data, '上报意见.xls')"
+                     size="mini">生成上报意见
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -109,6 +130,9 @@
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
+              </template>
             </el-table-column>
             <el-table-column
               prop="newText"
@@ -211,6 +235,15 @@
         </el-table-column>
       </el-table>
     </div>
+    <el-dialog
+            title="查看修改前内容"
+            :visible.sync="itermsConditionsFlag"
+            size="800px">
+      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -224,6 +257,8 @@ export default {
   name: "bzzqyjStep1-9",
   data() {
     return {
+      itermsConditionsFlag: false,
+      itermsConditionsTitle: '',
       histortData: [],
       oldData: [],
       data: [],
@@ -246,9 +281,14 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: '', // 编号
-        endTime: '', // 结束日期
-        cname: '', // 名称
+        cid: "", // 编号
+        endTime: "", // 结束日期
+        cname: "", // 名称
+        fjList: [],
+        fjListId: '',
+        textType: '',
+        modelList: [],
+        modelNameList: '',
       },
       formRules: {
         responUserList: [
@@ -264,6 +304,25 @@ export default {
     ProcessTitle
   },
   methods: {
+    itermsConditionsClose () {
+      this.itermsConditionsFlag = false
+    },
+    itermsConditionsOpen (row) {
+      this.itermsConditionsFlag = true
+      this.itermsConditionsTitle = row
+    },
+    fileLook(file) { // 预览
+      const attId = file.attId
+      this.$preview(attId)
+    },
+    filesUpload (file) { // 下载
+      const attId = file.attId
+      if (attId) {
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      } else {
+        this.$message.warning('文件不存在,下载失败')
+      }
+    },
     updataFj (item) {
       let id
       let type = item.fileName.split('.')
@@ -281,29 +340,39 @@ export default {
         this.histortData = res
       }, e => {})
     },
-    upload (row, title) {
-      var params = {
-        columnName: {
-          chapterNumber : '章条编号',
-          chapterName : '章节名称',
-          commentText: '修改意见内容（包括理由或依据）',
-          department: '提出部门',
-          responUserName: '提出人',
-          stateText: '处理意见'
-        },
-        dataList: []
-      }
-      params.dataList = JSON.parse(JSON.stringify(row))
-      params.dataList.forEach(item => {
-        if (item.state === '1') {
-          item.stateText = '上报'
-        } else if (item.state === '2') {
-          item.stateText = '处理后上报'
-        } else {
-          item.stateText = '不上报'
+    upload(row, title) {
+      if (row.length > 0) {
+        var params = {
+          columnName: {
+            chapterNumber: "章条编号",
+            chapterName: "章节名称",
+            commentText: "修改意见内容（包括理由或依据）",
+            oldText: "修改前",
+            newText: "修改后",
+            reason: "修改理由",
+            department: "提出部门",
+            responUserName: "提出人",
+          },
+          dataList: []
+        };
+        if (title === '上报意见.xls') {
+          params.columnName.stateText = "处理意见"
         }
-      })
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+        params.dataList = JSON.parse(JSON.stringify(row));
+        params.dataList.forEach(item => {
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText (row) {
       if (row === '1') {
@@ -343,23 +412,55 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
-          this.form.endTime = data.endTime
-          this.form.cname = data.cname
-          this.form.fjList = data.fjList
-          this.form.fjListId = data.fjListId
+          this.form.fjList = data.fjList || data.form.fjList
+          if (data.fjListId === '') {
+            this.form.fjListId = ''
+          } else {
+            this.form.fjListId =  data.form.fjListId || data.fjListId
+          }
+          this.commentText9 = data.commentText9 || ''
+          this.form.cid = data.cid || data.form.cid;
+          this.form.endTime = data.endTime || data.form.endTime;
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
           })
           this.json = data
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
+          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
-          this.oldData = data.oldinfo
         }).catch(e => {
-        })
-      })
+        });
+      });
+      // return new Promise((resolve, reject) => {
+      //   inboundLiaisonDetail({
+      //     taskIds: this.taskIds,
+      //     pId: this.pId
+      //   }).then(res => {
+      //     let data = JSON.parse(res.mesg)
+      //     console.log(data);
+      //     this.form.cid = data.cid
+      //     this.form.endTime = data.endTime
+      //     this.form.cname = data.cname
+      //     this.form.fjList = data.fjList
+      //     this.form.fjListId = data.fjListId
+      //     var arr = []
+      //     data.summaryList.forEach( item => {
+      //       if (item.state != '3') {
+      //         arr.push(item)
+      //       }
+      //     })
+      //     this.json = data
+      //     this.data = arr
+      //     this.oldData = data.oldinfo
+      //   }).catch(e => {
+      //   })
+      // })
     },
   },
   mounted () {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 657981764..f894c6b21 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -1092,6 +1092,7 @@
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
                 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
                 this.BZList = res.data.ENERGYTYPES
+                console.log(res.data);
             }, e => {
             })
         },