diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index 7da5bc082..5fdb2ea43 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -244,7 +244,8 @@
                 this.submitLoading = true
                 this.$http.postData('sarPosition/position/role', {
                     positionId: this.selectList[0].id,
-                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys())
+                    roleIds: this.$refs.tree.getCheckedKeys().concat(this.$refs.tree.getHalfCheckedKeys()),
+                    operator: this.$store.getters.userInfo.account,
                 }, {}, res=> {
                     if (res.ok) {
                         this.$message.success('配置成功')
diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
index 97dc76eba..3bdc668c4 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue
@@ -1,561 +1,561 @@
-<!-- 已收藏的政策 -->
-<template>
-  <div id="collection-laws">
-    <table-tools-bar>
-      <div slot="left">
-        <div class="search-area">
-          <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectLawsBtn">
-            <el-form-item label="政策标题搜索" class="search-item search-item-last">
-              <el-input v-model="search.collectionLaws"
-                        placeholder="请输入政策标题"
-                        clearable
-                        :maxlength="100"
-                        @keyup.enter.native="selectLawsBtn"></el-input>
-            </el-form-item>
-            <el-form-item class="search-item btn-box">
-              <el-button
-                :loading="searching"
-                v-btn-permission="'1044adc0569438df582585db349f2cde'"
-                type="primary"
-                class="common-button-primary"
-                @click="selectLawsBtn">
-                查询
-              </el-button>
-              <el-button
-                class="common-button-default"
-                v-btn-permission="'3b4223ab22aa24b8332c3d27f1e7fe32'"
-                @click="resetSelect">清空</el-button>
-<!--              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div slot="right"></div>
-    </table-tools-bar>
-    <div class="content">
-      <el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">{{$t('m.checkAll')}}</el-checkbox>
-      <div class="content-detail" v-if="total >0 && contentOpen">
-        <div v-for="(item,index1) in lawsList" :key="index1">
-          <div class="card domBtn">
-            <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
-            <el-row>
-              <div @click="detailsLaws(item)" >
-                <el-col :span="5" :offset="1">
-                  <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
-                  所属板块：{{ item.collectType === 'INLAND_LAWS' ? '国内政策' : '国外政策' }}
-                </el-col>
-                <el-col :span="6">
-                  <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
-                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
-                  </el-tooltip>
-                </el-col>
-                <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
-              </div>
-              <el-col :span="4">
-                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2"  @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button>
-<!--                <el-button size="mini"  style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
-              </el-col>
-            </el-row>
-          </div>
-          <div  :class="{ 'selected ': item.checked }" @click="handleCardClick(item,$event)">
-            <el-button size="mini" icon="el-icon-plus" @click="createNote(item,index1)" v-show="item.check" style="border: 1px dashed #dcdee2" v-btn-permission="'H92BTQYXR6'">添加笔记</el-button>
-            <div class="note" v-for="(note,index2) in item.noteList" :key="index2" v-show="item.check">
-              <div class="noteLeft">笔记{{index2 +1 }}: {{note.noteContentValue}}</div>
-              <div class="noteRight">
-                <el-button type="primary" size="mini" @click="viewData(note)">查看此条笔记</el-button>
-                <el-button type="warning" size="mini" @click="noteEdit(note,index1)"  v-btn-permission="'RVZK5WGGMXW7AMZRLBXX'">修改笔记</el-button>
-                <el-button type="danger" size="mini" @click="noteDel(note,index1)"  v-btn-permission="'QCSYVV82PS'">删除笔记</el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
-      <loading :loading="loading">数据获取中</loading>
-    </div>
-    <el-dialog :title="laswsTitle"
-               :close-on-click-modal = false
-               :visible.sync="lawsModal"
-               width="450px"
-               :class="{ 'hide-modal-footer': modalType === 3 }"
-               @on-visible-change="noteChange">
-      <div style="margin-left: 20px">
-        <el-form ref="lawsForm" :model="lawsForm" :rules="lawsFormRules">
-          <el-form-item prop="textarea">
-            <el-input type="textarea" v-model.trim="lawsForm.textarea" maxlength="20000" show-word-limit :autosize="{minRows: 5,maxRows: 7}" :disabled="modalType ===3" placeholder="书写笔记"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer">
-        <el-button size="mini" @click="closeModal">取消</el-button>
-        <el-button size="mini" type="primary" @click="saveClass"  :loading="isSubmit">确认</el-button>
-      </div>
-    </el-dialog>
-    <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'collection-laws',
-  data () {
-    return {
-      contentOpen: true,
-      searching: false,
-      saveNote: '',
-      // 加载
-      loading: false,
-      loadDate: false,
-      // 查找内容
-      search: {
-        collectionLaws: ''
-      },
-      // 收藏内容
-      lawsList: [],
-      lawsForm: {
-        textarea: '',
-        collectId: '',
-        id: ''
-      },
-      // 书写模态框
-      lawsModal: false,
-      // 模态框标题
-      laswsTitle: '',
-      // 是否读写
-      noteType: false,
-      // 查看状态
-      modalType: '',
-      total: 0,
-      page: 1,
-      rows: 10,
-      // 笔记规则
-      lawsFormRules: {
-        textarea: [
-          {required: true, message: '笔记不能为空', trigger: 'blur'},
-          {type: 'string', max: 20000, message: '最多输入20000字符'}
-        ]
-      },
-      checkAll: false, // 是否全选
-      indeterminate: false, // 是否半选
-      isSubmit: false,
-      selectedList: [],
-      selectedAllInfoList: []
-    }
-  },
-  methods: {
-    getDate (date) {
-      return date != null ? date.substring(0, date.indexOf(' ')) : ''
-    },
-    // 对话框关闭清除表单
-    noteChange (type) {
-      if (!type) {
-        this.$refs['lawsForm'].resetFields()
-      }
-    },
-    // 重置
-    resetSelect () {
-      this.search.collectionLaws = ''
-      this.pageChange(1)
-    },
-    // 笔记数字提示
-    descInput () {
-      if (this.lawsForm.textarea.length > 20000) {
-        this.error('最多输入20000字')
-      }
-    },
-    error (msg) {
-      this.$Message.error(msg)
-    },
-    // 跳转
-    detailsLaws (item) {
-      // document.cookie = 'collectionType=' + item.collectType
-      // this.$store.commit('setDetailMap', this.$route.path)
-      // this.$router.push({
-      //   name: 'CollectionRegulationsDetail',
-      //   params: {
-      //     id: item.collectResId,
-      //     pageType: item.collectType
-      //   }
-      // })
-      this.$http.get('lawss/sarMenu/judgeSarMenuByRole', {
-        sarId: item.collectResId,
-        sarType: item.collectType
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          if (this.$hasPermission('A2HDHMEA6W')) {
-            let routeUrl = this.$router.resolve({
-              name: 'OtherLawsDetails',
-              params: {
-                id: item.collectResId,
-                pageType: item.collectType
-              }
-            })
-            window.open(routeUrl.href, '_blank')
-          } else {
-            let routeUrl = this.$router.resolve({
-              name: 'OtherLawsDetails',
-              params: {
-                id: item.collectResId,
-                pageType: item.collectType
-              }
-            })
-            window.open(routeUrl.href, '_blank')
-            //this.$Message.warning('无权访问')
-          }
-        } else {
-          this.$Message.error(res.message)
-        }
-      }, e => {
-        this.$Message.error('无权访问')
-      })
-    },
-    // 分页
-    pageChange (page) {
-      this.page = page
-      this.saveNote = ''
-      this.selectLaws()
-    },
-    pageSizeChange (pageSize) {
-      this.rows = pageSize
-      this.selectLaws()
-    },
-    // 修改笔记
-    noteEdit (note, index) {
-      this.lawsModal = true
-      this.noteType = false
-      this.laswsTitle = '修改笔记'
-      this.modalType = 2
-      this.lawsForm.textarea = note.noteContentValue
-      this.lawsForm.id = note.id
-      this.saveNote = index
-    },
-    //  查看此条笔记
-    viewData (note) {
-      this.lawsModal = true
-      this.laswsTitle = '查看笔记'
-      this.lawsForm.textarea = note.noteContentValue
-      this.noteType = true
-      this.modalType = 3
-    },
-    // 删除笔记
-    noteDel (note, index) {
-      this.saveNote = index
-      this.$confirm('确认删除该条数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        this.$http.post('lawss/utNoteInfo/deleteNote', {
-          ids: note.id
-        },
-        {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.selectLaws()
-          } else {
-          }
-        }).catch(() => {
-        })
-      })
-    },
-    // 搜索
-    selectLawsBtn () {
-      this.page = 1
-      this.selectLaws()
-    },
-    // 加载已收藏的法规
-    selectLaws () {
-      this.$http.get('person/personCollect/page', {
-        pageNo: this.page,
-        pageSize: this.$store.getters.userInfo.configContent,
-        modeType: 'LAWS_STAND',
-        collectTitle: this.search.collectionLaws,
-        userId: this.$store.getters.userInfo.userId
-      }, {
-        _this: this,
-        loading: 'loading'
-      }, res => {
-        this.lawsList = []
-        this.lawsList = res.data.records
-        this.total = res.data.total
-        this.contentOpen = true
-      }, e => {})
-    },
-    //  取消收藏
-    cancelLaws  (id) {
-      this.$confirm('确定取消收藏此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        this.$http.put('person/personCollect/updateByUserId ', {
-          id: id
-        }, {
-          _this: this
-        }, res => {
-          this.contentOpen = false
-          this.pageChange(1)
-        }, e => {
-        })
-      }).catch(() => {
-      })
-    },
-    // 查看笔记
-    writeLawsNotes (item, index) {
-      item.check = !item.check
-      if (item.check === true) {
-        item.seeBtn = '关闭笔记'
-      } else {
-        item.seeBtn = '查看笔记'
-      }
-      for (let i = 0; i < this.lawsList.length; i++) {
-        if (i !== index) {
-          this.lawsList[i].check = false
-          this.lawsList[i].seeBtn = '查看笔记'
-        }
-      }
-    },
-    // 添加笔记
-    createNote (item, index) {
-      this.lawsModal = true
-      this.noteType = false
-      this.modalType = 1
-      this.laswsTitle = '添加笔记'
-      this.lawsForm.textarea = ''
-      this.lawsForm = item
-      this.saveNote = index
-    },
-    closeModal () {
-      this.lawsModal = false
-      this.$refs['lawsForm'].resetFields()
-    },
-    // 保存笔记 （新增、编辑）
-    saveClass () {
-      this.$refs['lawsForm'].validate((valid) => {
-        if (valid) {
-          this.lawsModal = false
-          if (this.modalType === 1) {
-            let noteForm = {}
-            noteForm.noteContentValue = this.lawsForm.textarea
-            noteForm.sourceType = 'COLAWS'
-            noteForm.noteName = this.lawsForm.collectTitle
-            noteForm.sarId = this.lawsForm.id
-            noteForm.forwardId = this.lawsForm.collectResId
-            this.$http.post('lawss/utNoteInfo/saveNote', noteForm, {
-              _this: this,
-              loading: 'isSubmit'
-            }, res => {
-              this.selectLaws()
-            }, e => {
-            })
-          } else if (this.modalType === 2) {
-            let noteForm = {
-              id: this.lawsForm.id,
-              noteContentValue: this.lawsForm.textarea
-            }
-            this.$http.post('lawss/utNoteInfo/updateNote', noteForm, {
-              _this: this
-            }, res => {
-              this.selectLaws()
-            }, e => {
-            })
-          }
-        } else {
-          this.$message.error('请正确输入')
-        }
-      })
-    },
-    cancleCollectBatch () {
-      // if (this.selectedList.length === 0) {
-      //   this.$Message.error('请先选择数据进行取消收藏')
-      // } else {
-      //   this.$Modal.confirm({
-      //     title: '请选择',
-      //     content: '确定取消收藏选中数据？',
-      //     onOk: () => {
-      //       this.$http.post('/person/personCollect/cancelCollectByBatch', {
-      //         ids: this.selectedList
-      //       }, {
-      //         _this: this
-      //       }, res => {
-      //         this.selectStandard()
-      //       }, e => {
-      //       })
-      //     },
-      //     onCancel: () => {
-      //     }
-      //   })
-      // }
-      if (this.selectedList.length === 0) {
-        this.$confirm('请先选择数据进行取消收藏', '提示', {
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          confirmButtonClass: 'common-button-primary',
-          roundButton: true
-        })
-      } else {
-        (
-          this.$confirm('确定取消这些数据?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            confirmButtonClass: 'common-button-primary',
-            roundButton: true
-          }).then(() => {
-            this.$http.post('/person/personCollect/cancelCollectByBatch', {
-              ids: this.selectedList
-            }, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.pageChange(1)
-              }
-            })
-          }).catch(() => {
-          })
-        )
-      }
-    },
-    handleCardClick (item, event) {
-      item.checked = !item.checked
-    },
-    // 全选
-    handleSelectAll (checked) {
-      if (checked) {
-        this.selectedList = []
-        for (let i = 0; i < this.lawsList.length; i++) {
-          this.$set(this.lawsList[i], 'checked', true)
-          this.selectedList.push(this.lawsList[i].id)
-          this.selectedAllInfoList.push(this.lawsList[i])
-        }
-      } else {
-        for (let i = 0; i < this.lawsList.length; i++) {
-          this.$set(this.lawsList[i], 'checked', false)
-          this.selectedList = []
-          this.selectedAllInfoList = []
-        }
-      }
-    }
-  },
-  watch: {
-    lawsList: {
-      deep: true,
-      handler (newVal, oldVal) {
-        this.selectedList = []
-        for (let i = 0; i < newVal.length; i++) {
-          if (newVal[i].checked) {
-            this.selectedList.push(newVal[i].id)
-            this.selectedAllInfoList.push(newVal[i])
-          }
-        }
-        if (this.selectedList.length === newVal.length && newVal.length !== 0) {
-          this.checkAll = true
-          this.indeterminate = false
-        } else if (this.selectedList.length === 0) {
-          this.checkAll = false
-        } else {
-          this.checkAll = false
-          this.indeterminate = false
-        }
-      }
-    },
-    // 已选择的列表
-    selectedList (newVal, oldVal) {
-      if (oldVal.length === this.lawsList.length && newVal.length !== 0) {
-        this.checkAll = false
-        this.indeterminate = true
-      } else if (newVal.length === 0) {
-        this.checkAll = false
-        this.indeterminate = false
-      }
-    }
-  },
-  mounted () {
-    this.selectLaws()
-  }
-}
-</script>
-<style lang="less" >
-//@import '~styles/style';
-//@import '~styles/mixins';
-//
-#collection-laws{
-  height: 100%;
-  .content{
-    height: calc(~'100% - 150px');
-    .content-detail{
-      width: 100%;
-      height: 100%;
-      overflow-y: auto;
-      overflow-x: hidden;
-      /*padding: 5px;*/
-      background-color: #FFF;
-      .card{
-        width: 100%;
-        height: 1rem;
-        line-height: 1rem;
-        border: 1px solid #EEE;
-        margin-bottom: 4px;
-        transition: all .2s ease-in-out;
-        cursor: pointer;
-        background: #FFF;
-        padding-left: 14px;
-        overflow: hidden;
-        //.un-select();
-        .left-contents{
-          width: 100%;
-          //.ellipsis()
-        }
-        .ivu-row{
-          height: 100%;
-          .ivu-col{
-            height: 100%;
-            line-height: 50px;
-          }
-        }
-        &:hover{
-          box-shadow: 0px 1px 13px 0px #DDD;
-        }
-      }
-      .note{
-        font-size:15px;
-        line-height: 1rem;
-        height: 1rem;
-        clear: both;
-        margin: 0 1rem;
-        .noteLeft{
-          float: left;
-          width: 70%;
-          height: auto;
-        }
-        .noteRight{
-          float: right;
-          width: 30%;
-          height: auto;
-        }
-      }
-    }
-  }
-}
-.lawsDisplay{
-  display: none;
-}
-.hide-modal-footer {
-  .ivu-modal-footer {
-    display: none;
-  }
-}
-.domBtn {
-  border:1px gray solid;
-  background-color:#FFE6B0
-}
-</style>
+<!-- 已收藏的政策 -->
+<template>
+  <div id="collection-laws">
+    <table-tools-bar>
+      <div slot="left">
+        <div class="search-area">
+          <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectLawsBtn">
+            <el-form-item label="政策标题搜索" class="search-item search-item-last">
+              <el-input v-model="search.collectionLaws"
+                        placeholder="请输入政策标题"
+                        clearable
+                        :maxlength="100"
+                        @keyup.enter.native="selectLawsBtn"></el-input>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                :loading="searching"
+                v-btn-permission="'6b287f97264d39c234a6abd45ba1e508'"
+                type="primary"
+                class="common-button-primary"
+                @click="selectLawsBtn">
+                查询
+              </el-button>
+              <el-button
+                class="common-button-default"
+                v-btn-permission="'4c0d359d32e9639ba16eefd649496259'"
+                @click="resetSelect">清空</el-button>
+<!--              <el-button class="common-button-default" round @click="cancleCollectBatch" v-btn-permission="'YEG2HVV27R'"><i class="iconfont">&#xe602;</i>取消收藏</el-button>-->
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div slot="right"></div>
+    </table-tools-bar>
+    <div class="content">
+      <el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">{{$t('m.checkAll')}}</el-checkbox>
+      <div class="content-detail" v-if="total >0 && contentOpen">
+        <div v-for="(item,index1) in lawsList" :key="index1">
+          <div class="card domBtn">
+            <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
+            <el-row>
+              <div @click="detailsLaws(item)" >
+                <el-col :span="5" :offset="1">
+                  <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
+                  所属板块：{{ item.collectType === 'INLAND_LAWS' ? '国内政策' : '国外政策' }}
+                </el-col>
+                <el-col :span="6">
+                  <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
+                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
+                  </el-tooltip>
+                </el-col>
+                <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
+              </div>
+              <el-col :span="4">
+                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2"  @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button>
+<!--                <el-button size="mini"  style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
+              </el-col>
+            </el-row>
+          </div>
+          <div  :class="{ 'selected ': item.checked }" @click="handleCardClick(item,$event)">
+            <el-button size="mini" icon="el-icon-plus" @click="createNote(item,index1)" v-show="item.check" style="border: 1px dashed #dcdee2" v-btn-permission="'H92BTQYXR6'">添加笔记</el-button>
+            <div class="note" v-for="(note,index2) in item.noteList" :key="index2" v-show="item.check">
+              <div class="noteLeft">笔记{{index2 +1 }}: {{note.noteContentValue}}</div>
+              <div class="noteRight">
+                <el-button type="primary" size="mini" @click="viewData(note)">查看此条笔记</el-button>
+                <el-button type="warning" size="mini" @click="noteEdit(note,index1)"  v-btn-permission="'RVZK5WGGMXW7AMZRLBXX'">修改笔记</el-button>
+                <el-button type="danger" size="mini" @click="noteDel(note,index1)"  v-btn-permission="'QCSYVV82PS'">删除笔记</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
+      <loading :loading="loading">数据获取中</loading>
+    </div>
+    <el-dialog :title="laswsTitle"
+               :close-on-click-modal = false
+               :visible.sync="lawsModal"
+               width="450px"
+               :class="{ 'hide-modal-footer': modalType === 3 }"
+               @on-visible-change="noteChange">
+      <div style="margin-left: 20px">
+        <el-form ref="lawsForm" :model="lawsForm" :rules="lawsFormRules">
+          <el-form-item prop="textarea">
+            <el-input type="textarea" v-model.trim="lawsForm.textarea" maxlength="20000" show-word-limit :autosize="{minRows: 5,maxRows: 7}" :disabled="modalType ===3" placeholder="书写笔记"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer">
+        <el-button size="mini" @click="closeModal">取消</el-button>
+        <el-button size="mini" type="primary" @click="saveClass"  :loading="isSubmit">确认</el-button>
+      </div>
+    </el-dialog>
+    <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'collection-laws',
+  data () {
+    return {
+      contentOpen: true,
+      searching: false,
+      saveNote: '',
+      // 加载
+      loading: false,
+      loadDate: false,
+      // 查找内容
+      search: {
+        collectionLaws: ''
+      },
+      // 收藏内容
+      lawsList: [],
+      lawsForm: {
+        textarea: '',
+        collectId: '',
+        id: ''
+      },
+      // 书写模态框
+      lawsModal: false,
+      // 模态框标题
+      laswsTitle: '',
+      // 是否读写
+      noteType: false,
+      // 查看状态
+      modalType: '',
+      total: 0,
+      page: 1,
+      rows: 10,
+      // 笔记规则
+      lawsFormRules: {
+        textarea: [
+          {required: true, message: '笔记不能为空', trigger: 'blur'},
+          {type: 'string', max: 20000, message: '最多输入20000字符'}
+        ]
+      },
+      checkAll: false, // 是否全选
+      indeterminate: false, // 是否半选
+      isSubmit: false,
+      selectedList: [],
+      selectedAllInfoList: []
+    }
+  },
+  methods: {
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    // 对话框关闭清除表单
+    noteChange (type) {
+      if (!type) {
+        this.$refs['lawsForm'].resetFields()
+      }
+    },
+    // 重置
+    resetSelect () {
+      this.search.collectionLaws = ''
+      this.pageChange(1)
+    },
+    // 笔记数字提示
+    descInput () {
+      if (this.lawsForm.textarea.length > 20000) {
+        this.error('最多输入20000字')
+      }
+    },
+    error (msg) {
+      this.$Message.error(msg)
+    },
+    // 跳转
+    detailsLaws (item) {
+      // document.cookie = 'collectionType=' + item.collectType
+      // this.$store.commit('setDetailMap', this.$route.path)
+      // this.$router.push({
+      //   name: 'CollectionRegulationsDetail',
+      //   params: {
+      //     id: item.collectResId,
+      //     pageType: item.collectType
+      //   }
+      // })
+      this.$http.get('lawss/sarMenu/judgeSarMenuByRole', {
+        sarId: item.collectResId,
+        sarType: item.collectType
+      }, {
+        _this: this
+      }, res => {
+        if (res.ok) {
+          if (this.$hasPermission('A2HDHMEA6W')) {
+            let routeUrl = this.$router.resolve({
+              name: 'OtherLawsDetails',
+              params: {
+                id: item.collectResId,
+                pageType: item.collectType
+              }
+            })
+            window.open(routeUrl.href, '_blank')
+          } else {
+            let routeUrl = this.$router.resolve({
+              name: 'OtherLawsDetails',
+              params: {
+                id: item.collectResId,
+                pageType: item.collectType
+              }
+            })
+            window.open(routeUrl.href, '_blank')
+            //this.$Message.warning('无权访问')
+          }
+        } else {
+          this.$Message.error(res.message)
+        }
+      }, e => {
+        this.$Message.error('无权访问')
+      })
+    },
+    // 分页
+    pageChange (page) {
+      this.page = page
+      this.saveNote = ''
+      this.selectLaws()
+    },
+    pageSizeChange (pageSize) {
+      this.rows = pageSize
+      this.selectLaws()
+    },
+    // 修改笔记
+    noteEdit (note, index) {
+      this.lawsModal = true
+      this.noteType = false
+      this.laswsTitle = '修改笔记'
+      this.modalType = 2
+      this.lawsForm.textarea = note.noteContentValue
+      this.lawsForm.id = note.id
+      this.saveNote = index
+    },
+    //  查看此条笔记
+    viewData (note) {
+      this.lawsModal = true
+      this.laswsTitle = '查看笔记'
+      this.lawsForm.textarea = note.noteContentValue
+      this.noteType = true
+      this.modalType = 3
+    },
+    // 删除笔记
+    noteDel (note, index) {
+      this.saveNote = index
+      this.$confirm('确认删除该条数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        this.$http.post('lawss/utNoteInfo/deleteNote', {
+          ids: note.id
+        },
+        {
+          _this: this
+        }, res => {
+          if (res.ok) {
+            this.selectLaws()
+          } else {
+          }
+        }).catch(() => {
+        })
+      })
+    },
+    // 搜索
+    selectLawsBtn () {
+      this.page = 1
+      this.selectLaws()
+    },
+    // 加载已收藏的法规
+    selectLaws () {
+      this.$http.get('person/personCollect/page', {
+        pageNo: this.page,
+        pageSize: this.$store.getters.userInfo.configContent,
+        modeType: 'LAWS_STAND',
+        collectTitle: this.search.collectionLaws,
+        userId: this.$store.getters.userInfo.userId
+      }, {
+        _this: this,
+        loading: 'loading'
+      }, res => {
+        this.lawsList = []
+        this.lawsList = res.data.records
+        this.total = res.data.total
+        this.contentOpen = true
+      }, e => {})
+    },
+    //  取消收藏
+    cancelLaws  (id) {
+      this.$confirm('确定取消收藏此数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        this.$http.put('person/personCollect/updateByUserId ', {
+          id: id
+        }, {
+          _this: this
+        }, res => {
+          this.contentOpen = false
+          this.pageChange(1)
+        }, e => {
+        })
+      }).catch(() => {
+      })
+    },
+    // 查看笔记
+    writeLawsNotes (item, index) {
+      item.check = !item.check
+      if (item.check === true) {
+        item.seeBtn = '关闭笔记'
+      } else {
+        item.seeBtn = '查看笔记'
+      }
+      for (let i = 0; i < this.lawsList.length; i++) {
+        if (i !== index) {
+          this.lawsList[i].check = false
+          this.lawsList[i].seeBtn = '查看笔记'
+        }
+      }
+    },
+    // 添加笔记
+    createNote (item, index) {
+      this.lawsModal = true
+      this.noteType = false
+      this.modalType = 1
+      this.laswsTitle = '添加笔记'
+      this.lawsForm.textarea = ''
+      this.lawsForm = item
+      this.saveNote = index
+    },
+    closeModal () {
+      this.lawsModal = false
+      this.$refs['lawsForm'].resetFields()
+    },
+    // 保存笔记 （新增、编辑）
+    saveClass () {
+      this.$refs['lawsForm'].validate((valid) => {
+        if (valid) {
+          this.lawsModal = false
+          if (this.modalType === 1) {
+            let noteForm = {}
+            noteForm.noteContentValue = this.lawsForm.textarea
+            noteForm.sourceType = 'COLAWS'
+            noteForm.noteName = this.lawsForm.collectTitle
+            noteForm.sarId = this.lawsForm.id
+            noteForm.forwardId = this.lawsForm.collectResId
+            this.$http.post('lawss/utNoteInfo/saveNote', noteForm, {
+              _this: this,
+              loading: 'isSubmit'
+            }, res => {
+              this.selectLaws()
+            }, e => {
+            })
+          } else if (this.modalType === 2) {
+            let noteForm = {
+              id: this.lawsForm.id,
+              noteContentValue: this.lawsForm.textarea
+            }
+            this.$http.post('lawss/utNoteInfo/updateNote', noteForm, {
+              _this: this
+            }, res => {
+              this.selectLaws()
+            }, e => {
+            })
+          }
+        } else {
+          this.$message.error('请正确输入')
+        }
+      })
+    },
+    cancleCollectBatch () {
+      // if (this.selectedList.length === 0) {
+      //   this.$Message.error('请先选择数据进行取消收藏')
+      // } else {
+      //   this.$Modal.confirm({
+      //     title: '请选择',
+      //     content: '确定取消收藏选中数据？',
+      //     onOk: () => {
+      //       this.$http.post('/person/personCollect/cancelCollectByBatch', {
+      //         ids: this.selectedList
+      //       }, {
+      //         _this: this
+      //       }, res => {
+      //         this.selectStandard()
+      //       }, e => {
+      //       })
+      //     },
+      //     onCancel: () => {
+      //     }
+      //   })
+      // }
+      if (this.selectedList.length === 0) {
+        this.$confirm('请先选择数据进行取消收藏', '提示', {
+          showCancelButton: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        })
+      } else {
+        (
+          this.$confirm('确定取消这些数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('/person/personCollect/cancelCollectByBatch', {
+              ids: this.selectedList
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.pageChange(1)
+              }
+            })
+          }).catch(() => {
+          })
+        )
+      }
+    },
+    handleCardClick (item, event) {
+      item.checked = !item.checked
+    },
+    // 全选
+    handleSelectAll (checked) {
+      if (checked) {
+        this.selectedList = []
+        for (let i = 0; i < this.lawsList.length; i++) {
+          this.$set(this.lawsList[i], 'checked', true)
+          this.selectedList.push(this.lawsList[i].id)
+          this.selectedAllInfoList.push(this.lawsList[i])
+        }
+      } else {
+        for (let i = 0; i < this.lawsList.length; i++) {
+          this.$set(this.lawsList[i], 'checked', false)
+          this.selectedList = []
+          this.selectedAllInfoList = []
+        }
+      }
+    }
+  },
+  watch: {
+    lawsList: {
+      deep: true,
+      handler (newVal, oldVal) {
+        this.selectedList = []
+        for (let i = 0; i < newVal.length; i++) {
+          if (newVal[i].checked) {
+            this.selectedList.push(newVal[i].id)
+            this.selectedAllInfoList.push(newVal[i])
+          }
+        }
+        if (this.selectedList.length === newVal.length && newVal.length !== 0) {
+          this.checkAll = true
+          this.indeterminate = false
+        } else if (this.selectedList.length === 0) {
+          this.checkAll = false
+        } else {
+          this.checkAll = false
+          this.indeterminate = false
+        }
+      }
+    },
+    // 已选择的列表
+    selectedList (newVal, oldVal) {
+      if (oldVal.length === this.lawsList.length && newVal.length !== 0) {
+        this.checkAll = false
+        this.indeterminate = true
+      } else if (newVal.length === 0) {
+        this.checkAll = false
+        this.indeterminate = false
+      }
+    }
+  },
+  mounted () {
+    this.selectLaws()
+  }
+}
+</script>
+<style lang="less" >
+//@import '~styles/style';
+//@import '~styles/mixins';
+//
+#collection-laws{
+  height: 100%;
+  .content{
+    height: calc(~'100% - 150px');
+    .content-detail{
+      width: 100%;
+      height: 100%;
+      overflow-y: auto;
+      overflow-x: hidden;
+      /*padding: 5px;*/
+      background-color: #FFF;
+      .card{
+        width: 100%;
+        height: 1rem;
+        line-height: 1rem;
+        border: 1px solid #EEE;
+        margin-bottom: 4px;
+        transition: all .2s ease-in-out;
+        cursor: pointer;
+        background: #FFF;
+        padding-left: 14px;
+        overflow: hidden;
+        //.un-select();
+        .left-contents{
+          width: 100%;
+          //.ellipsis()
+        }
+        .ivu-row{
+          height: 100%;
+          .ivu-col{
+            height: 100%;
+            line-height: 50px;
+          }
+        }
+        &:hover{
+          box-shadow: 0px 1px 13px 0px #DDD;
+        }
+      }
+      .note{
+        font-size:15px;
+        line-height: 1rem;
+        height: 1rem;
+        clear: both;
+        margin: 0 1rem;
+        .noteLeft{
+          float: left;
+          width: 70%;
+          height: auto;
+        }
+        .noteRight{
+          float: right;
+          width: 30%;
+          height: auto;
+        }
+      }
+    }
+  }
+}
+.lawsDisplay{
+  display: none;
+}
+.hide-modal-footer {
+  .ivu-modal-footer {
+    display: none;
+  }
+}
+.domBtn {
+  border:1px gray solid;
+  background-color:#FFE6B0
+}
+</style>
diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index 87b265d7b..eff67e633 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -1,338 +1,338 @@
-<!-- 已收藏的标准法规 -->
-<template>
-  <div id="CollectionStandard">
-    <table-tools-bar>
-      <div slot="left">
-        <div class="search-area">
-          <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectStandardBtn">
-            <el-form-item label="标准法规标题" class="search-item search-item-last">
-              <el-input v-model="search.name"
-                        placeholder="请输入标准法规信息"
-                        clearable
-                        :maxlength="100"
-                        @keyup.enter.native="selectStandardBtn"></el-input>
-            </el-form-item>
-            <el-form-item class="search-item btn-box">
-              <el-button
-                :loading="searching"
-                type="primary"
-                class="common-button-primary"
-                size="mini"
-                v-btn-permission="'a0926c279e15ef0a3a2bc782f93d15fa'"
-                @click="selectStandardBtn">
-                查询
-              </el-button>
-              <el-button
-                class="common-button-default"
-                size="mini"
-                v-btn-permission="'63d0dbbae0bee0f0888295d6cc6ef9c3'"
-                @click="resetSelect">清空</el-button>
-<!--              <el-button-->
-<!--                      class="common-button-default"-->
-<!--                      size="mini"-->
-<!--                      @click="cancleCollectBatch">-->
-<!--&lt;!&ndash;                <i class="iconfont">&#xe602;</i>&ndash;&gt;-->
-<!--                取消收藏-->
-<!--              </el-button>-->
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div slot="right"></div>
-    </table-tools-bar>
-    <div class="content">
-      <el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">全选</el-checkbox>
-      <div class="content-detail" v-if="total >0 && contentOpen">
-        <div v-for="(item, index1) in standardList" :key="index1">
-          <div class="card domBtn">
-            <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
-            <el-row>
-              <div>
-                <el-col :span="5" :offset="1" >
-                  <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
-                  所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
-                </el-col>
-                <el-col :span="6">
-                  <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
-                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
-                  </el-tooltip>
-                  <div v-else>
-                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
-                  </div>
-                </el-col>
-                <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
-              </div>
-              <el-col :span="4">
-                <el-button size="mini" v-btn-permission="'fc2b045e1fe8a5e14feab48d3138df53'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-      </div>
-      <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
-      <loading :loading="loading">数据获取中</loading>
-    </div>
-    <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'collectionStandard',
-  data () {
-    return {
-      contentOpen: true,
-      searching: false,
-      saveNote: '',
-      // 加载
-      loading: false,
-      loadDate: false,
-      // 查询
-      search: {
-        name: ''
-      },
-      // 分页
-      total: 0,
-      page: 1,
-      rows: 10,
-      // 数据内容
-      standardList: [],
-      checkAll: false, // 是否全选
-      indeterminate: false, // 是否半选
-      selectedList: [],
-      selectedAllInfoList: []
-    }
-  },
-  methods: {
-    getDetail(item) {
-      let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
-        params: {
-          id: item.collectResId,
-          pageType: 'INLAND_STAND'
-        }
-      })
-      window.open(routeUrl.href, '_blank')
-    },
-    // 重置
-    resetSelect () {
-      this.search.name = ''
-      this.pageChange(1)
-    },
-    // 分页
-    pageChange (page) {
-      this.page = page
-      this.selectStandard()
-    },
-    pageSizeChange (pageSize) {
-      this.rows = pageSize
-      this.selectStandard()
-    },
-    // 搜索
-    selectStandardBtn () {
-      this.page = 1
-      this.selectStandard()
-    },
-    // 查询、加载数据
-    selectStandard () {
-      this.$http.get('person/personCollect/page', {
-        pageNo: this.page,
-        pageSize: this.$store.getters.userInfo.configContent,
-        userId: this.$store.getters.userInfo.userId,
-        collectTitle: this.search.name
-      }, {
-        _this: this,
-        loading: 'loading'
-      }, res => {
-        this.standardList = []
-        this.standardList = res.data.records
-        this.total = res.data.total
-        this.contentOpen = true
-      }, e => {})
-    },
-    //  取消收藏
-    cancelStandard (item) {
-      this.$confirm('确定取消收藏此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'common-button-primary',
-        roundButton: true
-      }).then(() => {
-        // var json = {
-        //   id: item.collectId
-        // }
-        // json.userId = this.$store.getters.userInfo.userId
-        this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.$message.success('已取消收藏')
-            this.contentOpen = false
-            this.pageChange(1)
-            this.selectStandard()
-          }
-        }, e => {
-        })
-      }).catch(() => {
-      })
-    },
-    getDate (date) {
-      return date != null ? date.substring(0, date.indexOf(' ')) : ''
-    },
-    cancleCollectBatch () {
-      if (this.selectedList.length === 0) {
-        this.$confirm('请先选择数据进行取消收藏', '提示', {
-          showCancelButton: false,
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          confirmButtonClass: 'common-button-primary',
-          roundButton: true
-        })
-      } else {
-        (
-          this.$confirm('确定取消这些数据?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-            confirmButtonClass: 'common-button-primary',
-            roundButton: true
-          }).then(() => {
-            this.$http.post('/person/personCollect/cancelCollectByBatch', {
-              ids: this.selectedList
-            }, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.pageChange(1)
-              }
-            })
-          }).catch(() => {
-          })
-        )
-      }
-    },
-    handleCardClick (item, event) {
-      item.checked = !item.checked
-    },
-    // 全选
-    handleSelectAll (checked) {
-      if (checked) {
-        this.selectedList = []
-        for (let i = 0; i < this.standardList.length; i++) {
-          this.$set(this.standardList[i], 'checked', true)
-          this.selectedList.push(this.standardList[i].id)
-          this.selectedAllInfoList.push(this.standardList[i])
-        }
-      } else {
-        for (let i = 0; i < this.standardList.length; i++) {
-          this.$set(this.standardList[i], 'checked', false)
-          this.selectedList = []
-          this.selectedAllInfoList = []
-        }
-      }
-    }
-  },
-  watch: {
-    standardList: {
-      deep: true,
-      handler (newVal, oldVal) {
-        this.selectedList = []
-        for (let i = 0; i < newVal.length; i++) {
-          if (newVal[i].checked) {
-            this.selectedList.push(newVal[i].id)
-            this.selectedAllInfoList.push(newVal[i])
-          }
-        }
-        if (this.selectedList.length === newVal.length && newVal.length !== 0) {
-          this.checkAll = true
-          this.indeterminate = false
-        } else if (this.selectedList.length === 0) {
-          this.checkAll = false
-        } else {
-          this.checkAll = false
-          this.indeterminate = false
-        }
-      }
-    },
-    // 已选择的列表
-    selectedList (newVal, oldVal) {
-      if (oldVal.length === this.standardList.length && newVal.length !== 0) {
-        this.checkAll = false
-        this.indeterminate = true
-      } else if (newVal.length === 0) {
-        this.checkAll = false
-        this.indeterminate = false
-      }
-    }
-  },
-  mounted () {
-    this.selectStandard()
-  }
-}
-</script>
-
-<style lang="less">
-//@import '~styles/style';
-//@import '~styles/mixins';
-#CollectionStandard{
-  height: 100%;
-  .content{
-    height: calc(~'100% - 150px');
-    .content-detail{
-      width: 100%;
-      height:100%;
-      overflow-y: auto;
-      overflow-x: hidden;
-      /*padding: 0.1rem;*/
-      background-color: white;
-      .card{
-        width: 100%;
-        height: 1rem;
-        line-height:1rem;
-        border: 1px solid #EEE;
-        margin-bottom: 4px;
-        transition: all .2s ease-in-out;
-        cursor: pointer;
-        /*padding: 14px;*/
-        background: #FFF;
-        padding-left: 14px;
-        overflow: hidden;
-        //.un-select();
-        .left-contents{
-          width: 100%;
-          //.ellipsis()
-        }
-        .ivu-row{
-          height: 100%;
-          .ivu-col{
-            height: 100%;
-            line-height: 50px;
-          }
-        }
-        &:hover{
-          box-shadow: 0px 1px 13px 0px #DDD;
-        }
-      }
-      .note{
-        font-size:15px;
-        line-height: 1rem;
-        height: 1rem;
-        clear: both;
-        margin: 0 1rem;
-        .noteLeft{
-          float: left;
-          width: 70%;
-          height: auto;
-        }
-        .noteRight{
-          float: right;
-          width: 30%;
-          height: auto;
-        }
-      }
-    }
-  }
-}
-</style>
+<!-- 已收藏的标准法规 -->
+<template>
+  <div id="CollectionStandard">
+    <table-tools-bar>
+      <div slot="left">
+        <div class="search-area">
+          <el-form :inline="true" class="label-input-form" @keyup.enter.native="selectStandardBtn">
+            <el-form-item label="标准法规标题" class="search-item search-item-last">
+              <el-input v-model="search.name"
+                        placeholder="请输入标准法规信息"
+                        clearable
+                        :maxlength="100"
+                        @keyup.enter.native="selectStandardBtn"></el-input>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                :loading="searching"
+                type="primary"
+                class="common-button-primary"
+                size="mini"
+                v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
+                @click="selectStandardBtn">
+                查询
+              </el-button>
+              <el-button
+                class="common-button-default"
+                size="mini"
+                v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
+                @click="resetSelect">清空</el-button>
+<!--              <el-button-->
+<!--                      class="common-button-default"-->
+<!--                      size="mini"-->
+<!--                      @click="cancleCollectBatch">-->
+<!--&lt;!&ndash;                <i class="iconfont">&#xe602;</i>&ndash;&gt;-->
+<!--                取消收藏-->
+<!--              </el-button>-->
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div slot="right"></div>
+    </table-tools-bar>
+    <div class="content">
+      <el-checkbox :value="checkAll" size="large" @change="handleSelectAll" :indeterminate="indeterminate" style="padding: 6px;padding-left: 15px " v-if="total > 0">全选</el-checkbox>
+      <div class="content-detail" v-if="total >0 && contentOpen">
+        <div v-for="(item, index1) in standardList" :key="index1">
+          <div class="card domBtn">
+            <el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
+            <el-row>
+              <div>
+                <el-col :span="5" :offset="1" >
+                  <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
+                  所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
+                </el-col>
+                <el-col :span="6">
+                  <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
+                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
+                  </el-tooltip>
+                  <div v-else>
+                    <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
+                  </div>
+                </el-col>
+                <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
+              </div>
+              <el-col :span="4">
+                <el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"  @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+      </div>
+      <has-no-data pClass="content-detail" v-if="total === 0"></has-no-data>
+      <loading :loading="loading">数据获取中</loading>
+    </div>
+    <pagination :total="total" :page="page" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'collectionStandard',
+  data () {
+    return {
+      contentOpen: true,
+      searching: false,
+      saveNote: '',
+      // 加载
+      loading: false,
+      loadDate: false,
+      // 查询
+      search: {
+        name: ''
+      },
+      // 分页
+      total: 0,
+      page: 1,
+      rows: 10,
+      // 数据内容
+      standardList: [],
+      checkAll: false, // 是否全选
+      indeterminate: false, // 是否半选
+      selectedList: [],
+      selectedAllInfoList: []
+    }
+  },
+  methods: {
+    getDetail(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.collectResId,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    // 重置
+    resetSelect () {
+      this.search.name = ''
+      this.pageChange(1)
+    },
+    // 分页
+    pageChange (page) {
+      this.page = page
+      this.selectStandard()
+    },
+    pageSizeChange (pageSize) {
+      this.rows = pageSize
+      this.selectStandard()
+    },
+    // 搜索
+    selectStandardBtn () {
+      this.page = 1
+      this.selectStandard()
+    },
+    // 查询、加载数据
+    selectStandard () {
+      this.$http.get('person/personCollect/page', {
+        pageNo: this.page,
+        pageSize: this.$store.getters.userInfo.configContent,
+        userId: this.$store.getters.userInfo.userId,
+        collectTitle: this.search.name
+      }, {
+        _this: this,
+        loading: 'loading'
+      }, res => {
+        this.standardList = []
+        this.standardList = res.data.records
+        this.total = res.data.total
+        this.contentOpen = true
+      }, e => {})
+    },
+    //  取消收藏
+    cancelStandard (item) {
+      this.$confirm('确定取消收藏此数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+        confirmButtonClass: 'common-button-primary',
+        roundButton: true
+      }).then(() => {
+        // var json = {
+        //   id: item.collectId
+        // }
+        // json.userId = this.$store.getters.userInfo.userId
+        this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
+          _this: this
+        }, res => {
+          if (res.ok) {
+            this.$message.success('已取消收藏')
+            this.contentOpen = false
+            this.pageChange(1)
+            this.selectStandard()
+          }
+        }, e => {
+        })
+      }).catch(() => {
+      })
+    },
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    cancleCollectBatch () {
+      if (this.selectedList.length === 0) {
+        this.$confirm('请先选择数据进行取消收藏', '提示', {
+          showCancelButton: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          confirmButtonClass: 'common-button-primary',
+          roundButton: true
+        })
+      } else {
+        (
+          this.$confirm('确定取消这些数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: true
+          }).then(() => {
+            this.$http.post('/person/personCollect/cancelCollectByBatch', {
+              ids: this.selectedList
+            }, {
+              _this: this
+            }, res => {
+              if (res.ok) {
+                this.pageChange(1)
+              }
+            })
+          }).catch(() => {
+          })
+        )
+      }
+    },
+    handleCardClick (item, event) {
+      item.checked = !item.checked
+    },
+    // 全选
+    handleSelectAll (checked) {
+      if (checked) {
+        this.selectedList = []
+        for (let i = 0; i < this.standardList.length; i++) {
+          this.$set(this.standardList[i], 'checked', true)
+          this.selectedList.push(this.standardList[i].id)
+          this.selectedAllInfoList.push(this.standardList[i])
+        }
+      } else {
+        for (let i = 0; i < this.standardList.length; i++) {
+          this.$set(this.standardList[i], 'checked', false)
+          this.selectedList = []
+          this.selectedAllInfoList = []
+        }
+      }
+    }
+  },
+  watch: {
+    standardList: {
+      deep: true,
+      handler (newVal, oldVal) {
+        this.selectedList = []
+        for (let i = 0; i < newVal.length; i++) {
+          if (newVal[i].checked) {
+            this.selectedList.push(newVal[i].id)
+            this.selectedAllInfoList.push(newVal[i])
+          }
+        }
+        if (this.selectedList.length === newVal.length && newVal.length !== 0) {
+          this.checkAll = true
+          this.indeterminate = false
+        } else if (this.selectedList.length === 0) {
+          this.checkAll = false
+        } else {
+          this.checkAll = false
+          this.indeterminate = false
+        }
+      }
+    },
+    // 已选择的列表
+    selectedList (newVal, oldVal) {
+      if (oldVal.length === this.standardList.length && newVal.length !== 0) {
+        this.checkAll = false
+        this.indeterminate = true
+      } else if (newVal.length === 0) {
+        this.checkAll = false
+        this.indeterminate = false
+      }
+    }
+  },
+  mounted () {
+    this.selectStandard()
+  }
+}
+</script>
+
+<style lang="less">
+//@import '~styles/style';
+//@import '~styles/mixins';
+#CollectionStandard{
+  height: 100%;
+  .content{
+    height: calc(~'100% - 150px');
+    .content-detail{
+      width: 100%;
+      height:100%;
+      overflow-y: auto;
+      overflow-x: hidden;
+      /*padding: 0.1rem;*/
+      background-color: white;
+      .card{
+        width: 100%;
+        height: 1rem;
+        line-height:1rem;
+        border: 1px solid #EEE;
+        margin-bottom: 4px;
+        transition: all .2s ease-in-out;
+        cursor: pointer;
+        /*padding: 14px;*/
+        background: #FFF;
+        padding-left: 14px;
+        overflow: hidden;
+        //.un-select();
+        .left-contents{
+          width: 100%;
+          //.ellipsis()
+        }
+        .ivu-row{
+          height: 100%;
+          .ivu-col{
+            height: 100%;
+            line-height: 50px;
+          }
+        }
+        &:hover{
+          box-shadow: 0px 1px 13px 0px #DDD;
+        }
+      }
+      .note{
+        font-size:15px;
+        line-height: 1rem;
+        height: 1rem;
+        clear: both;
+        margin: 0 1rem;
+        .noteLeft{
+          float: left;
+          width: 70%;
+          height: auto;
+        }
+        .noteRight{
+          float: right;
+          width: 30%;
+          height: auto;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/personal/pages/my-collection/index.vue b/src/pages/personal/pages/my-collection/index.vue
index 191b8146c..765eae404 100644
--- a/src/pages/personal/pages/my-collection/index.vue
+++ b/src/pages/personal/pages/my-collection/index.vue
@@ -1,100 +1,117 @@
-<template>
-  <div class="my-collection v-class">
-    <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
-    <panel-content class="panel-content-box">
-      <components :is="active"></components>
-    </panel-content>
-  </div>
-</template>
-
-<script>
-import CollectionDynamics from './components/CollectionDynamics'
-import CollectionLaws from './components/CollectionLaws'
-import CollectionStandard from './components/CollectionStandard'
-import CollectionBreak from './components/CollectionBreak'
-export default {
-  name: 'MyCollection',
-  data () {
-    return {
-      active: 'CollectionStandard',
-      tabsList: [
-        {
-          title: '已收藏的标准法规',
-          name: 'CollectionStandard'
-        },
-        // {
-        //   title: '已收藏的动态&资料 ',
-        //   name: 'CollectionDynamics'
-        // },
-        {
-          title: '已收藏的政策',
-          name: 'CollectionLaws'
-        },
-        // {
-        //   title: '已收藏的标准拆分',
-        //   name: 'CollectionBreak'
-        // }
-      ]
-    }
-  },
-  methods: {
-    showComponent (name) {
-      this.active = name
-    }
-    // getCookie (name) {
-    //   // 获取指定名称的cookie值
-    //   // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组；
-    //   let arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'))
-    //   if (arr != null) {
-    //     return unescape(arr[2])
-    //   }
-    //   return null
-    // }
-  },
-  components: {
-    CollectionDynamics,
-    CollectionLaws,
-    CollectionStandard,
-    CollectionBreak
-  },
-  mounted () {
-    if (this.$route.query.type === '1') {
-      this.active = 'CollectionBreak'
-    }
-    //   let collecttype = this.getCookie('collectionType')
-    //   if (collecttype == null || collecttype === '') {
-    //     this.active = 'CollectionLaws'
-    //   } else if (collecttype === 'INLAND_LAWS' || collecttype === 'FOREIGN_LAWS') {
-    //     this.active = 'CollectionLaws'
-    //   } else if (collecttype === 'INLAND_STAND' || collecttype === 'FOREIGN_STAND' || collecttype === 'BUSINESS_STAND') {
-    //     this.active = 'CollectionStandard'
-    //   } else {
-    //     this.active = 'CollectionDynamics'
-    //   }
-    //   document.cookie = 'collectionType=' + ''
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.my-collection {
-  height: calc(~'100% - 50px');
-  .panel-content-box{
-    height: 100%;
-  }
-  /deep/.el-input__inner {
-    /*@media screen and (min-width: 1920px) {*/
-    /*  height: 40px !important;*/
-    /*  line-height: 40px !important;*/
-    /*}*/
-  }
-  /deep/#labelInput {
-    label {
-      /*@media screen and (min-width: 1920px) {*/
-      /*  height: 40px !important;*/
-      /*  line-height: 40px !important;*/
-      /*}*/
-    }
-  }
-}
-</style>
+<template>
+  <div class="my-collection v-class">
+    <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
+    <transition enter-active-class="" leave-active-class="">
+      <components :is="active"></components>
+    </transition>
+  </div>
+</template>
+
+<script>
+import CollectionDynamics from './components/CollectionDynamics'
+import CollectionLaws from './components/CollectionLaws'
+import CollectionStandard from './components/CollectionStandard'
+import CollectionBreak from './components/CollectionBreak'
+export default {
+  name: 'MyCollection',
+  data () {
+    return {
+      active: 'CollectionStandard',
+    }
+  },
+  computed: {
+    tabsList() {
+      const list = [
+        {
+          title: '已收藏的标准法规',
+          name: 'CollectionStandard',
+          permission:'f3686f4736acca57b1c0a97a990f96fc'
+        },
+        // {
+        //   title: '已收藏的动态&资料 ',
+        //   name: 'CollectionDynamics'
+        // },
+        {
+          title: '已收藏的政策',
+          name: 'CollectionLaws',
+          permission:'200212748ffc5fd3d93179789446535a'
+        },
+        // {
+        //   title: '已收藏的标准拆分',
+        //   name: 'CollectionBreak'
+        // }
+      ]
+
+      return list.filter(item => {
+        if (item.permission) {
+          return this.$hasPermission(item.permission)
+        } else {
+          return false
+        }
+      })
+    }
+  },
+  methods: {
+    showComponent(name) {
+      if (this.active !== name) {
+        this.active = name
+        const location = this.$router.replace({ query: { tabsName: name } })
+      }
+    }
+    // getCookie (name) {
+    //   // 获取指定名称的cookie值
+    //   // (^| )name=([^;]*)(;|$),match[0]为与整个正则表达式匹配的字符串，match[i]为正则表达式捕获数组相匹配的数组；
+    //   let arr = document.cookie.match(new RegExp('(^| )' + name + '=([^;]*)(;|$)'))
+    //   if (arr != null) {
+    //     return unescape(arr[2])
+    //   }
+    //   return null
+    // }
+  },
+  components: {
+    CollectionDynamics,
+    CollectionLaws,
+    CollectionStandard,
+    CollectionBreak
+  },
+  mounted () {
+    if (this.$route.query.type === '1') {
+      this.active = 'CollectionBreak'
+    }
+    //   let collecttype = this.getCookie('collectionType')
+    //   if (collecttype == null || collecttype === '') {
+    //     this.active = 'CollectionLaws'
+    //   } else if (collecttype === 'INLAND_LAWS' || collecttype === 'FOREIGN_LAWS') {
+    //     this.active = 'CollectionLaws'
+    //   } else if (collecttype === 'INLAND_STAND' || collecttype === 'FOREIGN_STAND' || collecttype === 'BUSINESS_STAND') {
+    //     this.active = 'CollectionStandard'
+    //   } else {
+    //     this.active = 'CollectionDynamics'
+    //   }
+    //   document.cookie = 'collectionType=' + ''
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.my-collection {
+  height: calc(~'100% - 50px');
+  .panel-content-box{
+    height: 100%;
+  }
+  /deep/.el-input__inner {
+    /*@media screen and (min-width: 1920px) {*/
+    /*  height: 40px !important;*/
+    /*  line-height: 40px !important;*/
+    /*}*/
+  }
+  /deep/#labelInput {
+    label {
+      /*@media screen and (min-width: 1920px) {*/
+      /*  height: 40px !important;*/
+      /*  line-height: 40px !important;*/
+      /*}*/
+    }
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index e0aa5d2ce..8c2db2005 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -62,7 +62,7 @@
                 </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;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"
@@ -82,12 +82,12 @@
                     style="display: none;"
                     clearable
                   ></el-input>
-                  <el-button type="primary" @click="choiceZRR">选择责任人</el-button>
+                  <el-button type="primary" @click="choiceZRR" style="padding-left: 10px">选择责任人</el-button>
                   <div @click="choiceZRR">
                     <div v-if="form.responUserListName" style="color: #666;">
                       {{ form.responUserListName }}
                     </div>
-                    <div v-else style="color: #ccc;">
+                    <div v-else style="color: #ccc;padding-left: 10px;" >
                       请选择责任人
                     </div>
                   </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index af7bc109e..de8c04d7d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -62,7 +62,7 @@
                                 </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;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                                             <span @click="fileLook(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
index 18d3b1ce6..8c7959e55 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
@@ -1,579 +1,579 @@
-<template>
-  <div class="qbfz-step4">
-    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
-    <process-title>
-      <template slot="title">基础信息</template>
-    </process-title>
-    <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
-        <el-form
-          ref="qbfsForm"
-          :model="qbfsForm"
-          :rules="formRules"
-          class="label-input-form prc-content-border"
-          label-width="150px"
-        >
-          <div v-if="foldFormFlag">
-            <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standCode"
-                    placeholder="请输入企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standName"
-                    placeholder="请输入中文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.entCategory"
-                    placeholder="请输入企标类别"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replaceNumber"
-                    placeholder="请输入代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    type="textarea"
-                    v-model="qbfsForm.abolishCause"
-                    placeholder="请输入废止理由"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.enName"
-                    placeholder="请输入英文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replacedNumber"
-                    placeholder="请输入被代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.releaseDate"
-                    placeholder="请输入发布日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.implementDate"
-                    placeholder="请输入实施日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
-                  <el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
-                    <el-option
-                      v-for="item in associationOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
-                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
-        </el-button>
-        <process-title>
-          <template slot="title">会签信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          height="52%"
-          style="width: 100%;"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="opinion"
-            align="center"
-            label="会签意见">
-          </el-table-column>
-          <el-table-column
-            prop="people"
-            align="center"
-            label="会签人">
-          </el-table-column>
-        </el-table>
-      </div>
-      <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>
-    <div class="content" v-show="active === '3'">
-      <div class="flow-list" style="height: 100%">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :no-data-text="listNoDataText"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.commentText }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <loading :loading="loading">流程列表加载中</loading>
-      </div>
-    </div>
-    <ProcessFooter
-      show-transfer
-      show-submit
-      :transfer-loading="isTransfer"
-      :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :approval="true"
-      @transfer="handleTransfer"
-      @submit="handleSubmit"
-    >
-    </ProcessFooter>
-    <!-- 福田全公司选人解决方案 -->
-    <Role-tree
-      check-box
-      :is-title="drawerTitle"
-      :is-visible.sync="drawerModal"
-      @checkedRole="checkedRole"
-      :nodeList="nodeList"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
-
-export default {
-  name: "qbfzStep4",
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  data() {
-    return {
-      active: "1",
-      isTransfer: false,
-      isSubmit: false,
-      saveLoading: false,
-      drawerModal: false,
-      drawerTitle: "",
-      nodeList: [],
-      fileList: [],
-      commentText: "",
-      dataList: [],
-      detailData: [],
-      loading: false,
-      foldFormFlag: true,
-      qbfsForm: {
-        entNumber: "",
-        cnName: "",
-        enName: "",
-        entCategory: "",
-        replaceNumber: "",
-        replacedNumber: "",
-        releaseDate: "",
-        implementDate: "",
-        reviewDate: "",
-        nextStatus: ""
-      },
-      formRules: {
-        nextStatus: [
-          { required: true, message: "请选择下一步状态", trigger: "change" }
-        ]
-      },
-      associationOptions: [
-      // {
-      //   value: "修订",
-      //   label: "修订"
-      // },
-      {
-        value: "废止",
-        label: "废止"
-      }, {
-        value: "现行有效",
-        label: "现行有效"
-      }]
-    };
-  },
-  mounted() {
-    this.processTable();
-    this.getData();
-  },
-  methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
-      });
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      console.log(item);
-      this.$nextTick(() => {
-        this.qbfsForm = JSON.parse(JSON.stringify(item));
-        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
-        res = res.split(",");
-        this.dataList = [];
-        res.forEach(item => {
-          this.dataList.push({
-            opinion: item.split("-")[1],
-            people: item.split("-")[0]
-          });
-        });
-      });
-    },
-    //流程提交
-    handleSubmit() {
-      this.$refs['qbfsForm'].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true;
-          this.qbfsForm.commentText = this.commentText;
-          this.qbfsForm.dataList = this.dataList;
-          let json = JSON.stringify(this.qbfsForm);
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: this.$route.query.taskIds,
-            userId: this.$store.getters.userInfo.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          }, e => {
-          });
-        }else{
-          this.$message.warning('请完善基础信息')
-        }
-      })
-    },
-
-    handleTabs(name) {
-      this.active = name;
-    },
-    foldForm() {
-      this.foldFormFlag = !this.foldFormFlag;
-    },
-    //转办事件
-    handleTransfer() {
-      this.drawerModal = true;
-      this.drawerTitle = "转办处理人";
-      this.selectPeople = row;
-    },
-    //确认转办
-    checkedRole(data) {
-      this.assigneeNewLoading = true;
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        pId: this.$route.query.prcId // 流程实例
-      }).then(res => {
-        this.isTransfer = false;
-        if (res.success) {
-          this.drawerModal = false;
-          this.$message.success("调整成功");
-          this.$router.push("/processCenter");
-          this.processNum();
-        } else {
-          this.$message.warning(res.message);
-        }
-      });
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
-        responseType: "blob",
-        method: "get",
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        // let blob = new Blob([res.data], {type: 'image/jpg'})
-        // let url = window.URL.createObjectURL(res.data)
-        this.processStep = window.URL.createObjectURL(res.data);
-      });
-    },
-    /**
-     * @Description: 点击下载
-     */
-    downloadFile(attId) {
-      if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
-      } else {
-        this.$message.error("请选择要下载的文件");
-      }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    }
-  },
-  computed: {
-    listNoDataText() {
-      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.qbfz-step4 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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");
-    }
-  }
-
-  .choiceBtn {
-    .el-button--primary {
-      width: 150px;
-    }
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-
-      .accessStandardsAndRegulations {
-        height: 100%;
-      }
-    }
-  }
-
-  .add-form-el-select {
-    /deep/ .el-select {
-      width: 210px;
-    }
-  }
-
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
+<template>
+  <div class="qbfz-step4">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standCode"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    type="textarea"
+                    v-model="qbfsForm.abolishCause"
+                    placeholder="请输入废止理由"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                  <el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
+                    <el-option
+                      v-for="item in associationOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+        </el-button>
+        <process-title>
+          <template slot="title">会签信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="opinion"
+            align="center"
+            label="会签意见">
+          </el-table-column>
+          <el-table-column
+            prop="people"
+            align="center"
+            label="会签人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: "",
+      nodeList: [],
+      fileList: [],
+      commentText: "",
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm: {
+        entNumber: "",
+        cnName: "",
+        enName: "",
+        entCategory: "",
+        replaceNumber: "",
+        replacedNumber: "",
+        releaseDate: "",
+        implementDate: "",
+        reviewDate: "",
+        nextStatus: ""
+      },
+      formRules: {
+        nextStatus: [
+          { required: true, message: "请选择下一步状态", trigger: "change" }
+        ]
+      },
+      associationOptions: [
+      // {
+      //   value: "修订",
+      //   label: "修订"
+      // },
+      {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "现行有效",
+        label: "现行有效"
+      }]
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item));
+        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
+        res = res.split(",");
+        this.dataList = [];
+        res.forEach(item => {
+          this.dataList.push({
+            opinion: item.split("-")[1],
+            people: item.split("-")[0]
+          });
+        });
+      });
+    },
+    //流程提交
+    handleSubmit() {
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true;
+          this.qbfsForm.commentText = this.commentText;
+          this.qbfsForm.dataList = this.dataList;
+          let json = JSON.stringify(this.qbfsForm);
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: this.$route.query.taskIds,
+            userId: this.$store.getters.userInfo.userId,
+            json: json
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }else{
+          this.$message.warning('请完善基础信息')
+        }
+      })
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer() {
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
+    },
+    //确认转办
+    checkedRole(data) {
+      this.assigneeNewLoading = true;
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false;
+        if (res.success) {
+          this.drawerModal = false;
+          this.$message.success("调整成功");
+          this.$router.push("/processCenter");
+          this.processNum();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
+    // 请求转换流程图
+    processNum(row) {
+      axios.request({
+        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+        responseType: "blob",
+        method: "get",
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step4 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  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");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  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% - 133px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index df8739020..b1e0abbbc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -1,606 +1,606 @@
-<template>
-  <div class="qbfz-step5">
-    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
-    <process-title>
-      <template slot="title">基础信息</template>
-    </process-title>
-    <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
-        <el-form
-          ref="qbfsForm"
-          :model="qbfsForm"
-          :rules="formRules"
-          class="label-input-form prc-content-border"
-          label-width="150px"
-        >
-          <div v-if="foldFormFlag">
-            <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standCode"
-                    placeholder="请输入企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standName"
-                    placeholder="请输入中文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.entCategory"
-                    placeholder="请输入企标类别"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replaceNumber"
-                    placeholder="请输入代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    type="textarea"
-                    v-model="qbfsForm.abolishCause"
-                    placeholder="请输入废止理由"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.enName"
-                    placeholder="请输入英文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replacedNumber"
-                    placeholder="请输入被代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.releaseDate"
-                    placeholder="请输入发布日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.implementDate"
-                    placeholder="请输入实施日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
-                  <el-select v-model="qbfsForm.nextStatus"  disabled  placeholder="请选择下一步状态">
-                    <el-option
-                      v-for="item in associationOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
-                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
-        </el-button>
-        <process-title>
-          <template slot="title">会签信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          height="52%"
-          style="width: 100%;"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="opinion"
-            align="center"
-            label="会签意见">
-          </el-table-column>
-          <el-table-column
-            prop="people"
-            align="center"
-            label="会签人">
-          </el-table-column>
-        </el-table>
-      </div>
-      <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>
-    <div class="content" v-show="active === '3'">
-      <div class="flow-list" style="height: 100%">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :no-data-text="listNoDataText"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.commentText }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <loading :loading="loading">流程列表加载中</loading>
-      </div>
-    </div>
-    <ProcessFooter
-      show-transfer
-      show-submit
-      show-back
-      :transfer-loading="isTransfer"
-      :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
-      @transfer="handleTransfer"
-      @submit="handleSubmit"
-    >
-    </ProcessFooter>
-    <!-- 福田全公司选人解决方案 -->
-    <Role-tree
-      check-box
-      :is-title="drawerTitle"
-      :is-visible.sync="drawerModal"
-      @checkedRole="checkedRole"
-      :nodeList="nodeList"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
-
-export default {
-  name: "qbfzStep5",
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  data() {
-    return {
-      active: "1",
-      isTransfer: false,
-      isSubmit: false,
-      saveLoading: false,
-      drawerModal: false,
-      drawerTitle: "",
-      nodeList: [],
-      fileList: [],
-      commentText: "",
-      dataList: [],
-      detailData: [],
-      loading: false,
-      foldFormFlag: true,
-      qbfsForm: {
-        entNumber: "",
-        cnName: "",
-        enName: "",
-        entCategory: "",
-        replaceNumber: "",
-        replacedNumber: "",
-        releaseDate: "",
-        implementDate: "",
-        reviewDate: "",
-        nextStatus: ""
-      },
-      formRules: {
-        nextStatus: [
-          { required: true, message: "请选择下一步状态", trigger: "change" }
-        ]
-      },
-      associationOptions: [{
-        value: "修订",
-        label: "修订"
-      }, {
-        value: "废止",
-        label: "废止"
-      }, {
-        value: "有效",
-        label: "有效"
-      }]
-    };
-  },
-  mounted() {
-    this.processTable();
-    this.getData();
-  },
-  methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
-      });
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      console.log(item);
-      this.$nextTick(() => {
-        this.qbfsForm = JSON.parse(JSON.stringify(item));
-        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
-        res = res.split(",");
-        this.dataList = [];
-        res.forEach(item => {
-          this.dataList.push({
-            opinion: item.split("-")[1],
-            people: item.split("-")[0]
-          });
-        });
-      });
-    },
-    //流程驳回
-    beforeBack(){
-      if(!this.commentText){
-        this.$message.warning('请填写审批意见')
-      }else{
-        this.isSubmit = true;
-        this.qbfsForm.commentText = this.commentText;
-        this.qbfsForm.bzFlag = '1'
-        this.qbfsForm.dataList = this.dataList;
-        let json = JSON.stringify(this.qbfsForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.$route.query.taskIds,
-          userId: this.$store.getters.userInfo.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-          this.isSubmit = false;
-        }, e => {
-        });
-      }
-    },
-    //流程提交
-    handleSubmit() {
-      this.$refs['qbfsForm'].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true;
-          this.qbfsForm.commentText = this.commentText;
-          this.qbfsForm.bzFlag = '0'
-          this.qbfsForm.dataList = this.dataList;
-          let json = JSON.stringify(this.qbfsForm);
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: this.$route.query.taskIds,
-            userId: this.$store.getters.userInfo.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          }, e => {
-          });
-        }else{
-          this.$message.warning('请完善基础信息')
-        }
-      })
-    },
-
-    handleTabs(name) {
-      this.active = name;
-    },
-    foldForm() {
-      this.foldFormFlag = !this.foldFormFlag;
-    },
-    //转办事件
-    handleTransfer() {
-      this.drawerModal = true;
-      this.drawerTitle = "转办处理人";
-      this.selectPeople = row;
-    },
-    //确认转办
-    checkedRole(data) {
-      this.assigneeNewLoading = true;
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        pId: this.$route.query.prcId // 流程实例
-      }).then(res => {
-        this.isTransfer = false;
-        if (res.success) {
-          this.drawerModal = false;
-          this.$message.success("调整成功");
-          this.$router.push("/processCenter");
-          this.processNum();
-        } else {
-          this.$message.warning(res.message);
-        }
-      });
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
-        responseType: "blob",
-        method: "get",
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        // let blob = new Blob([res.data], {type: 'image/jpg'})
-        // let url = window.URL.createObjectURL(res.data)
-        this.processStep = window.URL.createObjectURL(res.data);
-      });
-    },
-    /**
-     * @Description: 点击下载
-     */
-    downloadFile(attId) {
-      if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
-      } else {
-        this.$message.error("请选择要下载的文件");
-      }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    }
-  },
-  computed: {
-    listNoDataText() {
-      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.qbfz-step5 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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");
-    }
-  }
-
-  .choiceBtn {
-    .el-button--primary {
-      width: 150px;
-    }
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-
-      .accessStandardsAndRegulations {
-        height: 100%;
-      }
-    }
-  }
-
-  .add-form-el-select {
-    /deep/ .el-select {
-      width: 210px;
-    }
-  }
-
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
+<template>
+  <div class="qbfz-step5">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standCode"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    type="textarea"
+                    v-model="qbfsForm.abolishCause"
+                    placeholder="请输入废止理由"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                  <el-select v-model="qbfsForm.nextStatus"  disabled  placeholder="请选择下一步状态">
+                    <el-option
+                      v-for="item in associationOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+        </el-button>
+        <process-title>
+          <template slot="title">会签信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="opinion"
+            align="center"
+            label="会签意见">
+          </el-table-column>
+          <el-table-column
+            prop="people"
+            align="center"
+            label="会签人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      show-back
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep5",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: "",
+      nodeList: [],
+      fileList: [],
+      commentText: "",
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm: {
+        entNumber: "",
+        cnName: "",
+        enName: "",
+        entCategory: "",
+        replaceNumber: "",
+        replacedNumber: "",
+        releaseDate: "",
+        implementDate: "",
+        reviewDate: "",
+        nextStatus: ""
+      },
+      formRules: {
+        nextStatus: [
+          { required: true, message: "请选择下一步状态", trigger: "change" }
+        ]
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item));
+        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
+        res = res.split(",");
+        this.dataList = [];
+        res.forEach(item => {
+          this.dataList.push({
+            opinion: item.split("-")[1],
+            people: item.split("-")[0]
+          });
+        });
+      });
+    },
+    //流程驳回
+    beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true;
+        this.qbfsForm.commentText = this.commentText;
+        this.qbfsForm.bzFlag = '1'
+        this.qbfsForm.dataList = this.dataList;
+        let json = JSON.stringify(this.qbfsForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.$route.query.taskIds,
+          userId: this.$store.getters.userInfo.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
+    },
+    //流程提交
+    handleSubmit() {
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true;
+          this.qbfsForm.commentText = this.commentText;
+          this.qbfsForm.bzFlag = '0'
+          this.qbfsForm.dataList = this.dataList;
+          let json = JSON.stringify(this.qbfsForm);
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: this.$route.query.taskIds,
+            userId: this.$store.getters.userInfo.userId,
+            json: json
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }else{
+          this.$message.warning('请完善基础信息')
+        }
+      })
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer() {
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
+    },
+    //确认转办
+    checkedRole(data) {
+      this.assigneeNewLoading = true;
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false;
+        if (res.success) {
+          this.drawerModal = false;
+          this.$message.success("调整成功");
+          this.$router.push("/processCenter");
+          this.processNum();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
+    // 请求转换流程图
+    processNum(row) {
+      axios.request({
+        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+        responseType: "blob",
+        method: "get",
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step5 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  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");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  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% - 133px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
index fd8a46009..a3584a8dc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
@@ -1,606 +1,606 @@
-<template>
-  <div class="qbfz-step6">
-    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
-    </div>
-    <process-title>
-      <template slot="title">基础信息</template>
-    </process-title>
-    <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
-        <el-form
-          ref="qbfsForm"
-          :model="qbfsForm"
-          :rules="formRules"
-          class="label-input-form prc-content-border"
-          label-width="150px"
-        >
-          <div v-if="foldFormFlag">
-            <el-row :gutter="24">
-              <el-col :span="12">
-                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standCode"
-                    placeholder="请输入企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.standName"
-                    placeholder="请输入中文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.entCategory"
-                    placeholder="请输入企标类别"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replaceNumber"
-                    placeholder="请输入代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    type="textarea"
-                    v-model="qbfsForm.abolishCause"
-                    placeholder="请输入废止理由"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.enName"
-                    placeholder="请输入英文名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.replacedNumber"
-                    placeholder="请输入被代替企标编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.releaseDate"
-                    placeholder="请输入发布日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
-                  <el-input
-                    readonly
-                    v-model="qbfsForm.implementDate"
-                    placeholder="请输入实施日期"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
-                  <el-select v-model="qbfsForm.nextStatus"  disabled  placeholder="请选择下一步状态">
-                    <el-option
-                      v-for="item in associationOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
-        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
-                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
-        </el-button>
-        <process-title>
-          <template slot="title">会签信息</template>
-        </process-title>
-        <el-table
-          :data="dataList"
-          border
-          height="52%"
-          style="width: 100%;"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="opinion"
-            align="center"
-            label="会签意见">
-          </el-table-column>
-          <el-table-column
-            prop="people"
-            align="center"
-            label="会签人">
-          </el-table-column>
-        </el-table>
-      </div>
-      <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>
-    <div class="content" v-show="active === '3'">
-      <div class="flow-list" style="height: 100%">
-        <el-table
-          height="100%"
-          ref="selection"
-          :data="detailData"
-          tooltip-effect="dark"
-          style="width: 100%"
-          border
-          row-key="id"
-          :no-data-text="listNoDataText"
-          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="任务步骤"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="assignee"
-            label="任务受理人"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            sortable="custom"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="endTime"
-            label="完成时间"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="comment"
-            label="流程信息"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.commentText }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="completeFlag"
-            label="状态"
-            align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <loading :loading="loading">流程列表加载中</loading>
-      </div>
-    </div>
-    <ProcessFooter
-      show-transfer
-      show-submit
-      show-back
-      :transfer-loading="isTransfer"
-      :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
-      @transfer="handleTransfer"
-      @submit="handleSubmit"
-    >
-    </ProcessFooter>
-    <!-- 福田全公司选人解决方案 -->
-    <Role-tree
-      check-box
-      :is-title="drawerTitle"
-      :is-visible.sync="drawerModal"
-      @checkedRole="checkedRole"
-      :nodeList="nodeList"
-    ></Role-tree>
-  </div>
-</template>
-
-<script>
-import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
-
-export default {
-  name: "qbfzStep6",
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle
-  },
-  data() {
-    return {
-      active: "1",
-      isTransfer: false,
-      isSubmit: false,
-      saveLoading: false,
-      drawerModal: false,
-      drawerTitle: "",
-      nodeList: [],
-      fileList: [],
-      commentText: "",
-      dataList: [],
-      detailData: [],
-      loading: false,
-      foldFormFlag: true,
-      qbfsForm: {
-        entNumber: "",
-        cnName: "",
-        enName: "",
-        entCategory: "",
-        replaceNumber: "",
-        replacedNumber: "",
-        releaseDate: "",
-        implementDate: "",
-        reviewDate: "",
-        nextStatus: ""
-      },
-      formRules: {
-        nextStatus: [
-          { required: true, message: "请选择下一步状态", trigger: "change" }
-        ]
-      },
-      associationOptions: [{
-        value: "修订",
-        label: "修订"
-      }, {
-        value: "废止",
-        label: "废止"
-      }, {
-        value: "有效",
-        label: "有效"
-      }]
-    };
-  },
-  mounted() {
-    this.processTable();
-    this.getData();
-  },
-  methods: {
-    processTable() {
-      this.$http.get("lawss/activiti/get_list_by_instance", {
-        prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : "",
-        shunxu: this.shunxu
-      }, {
-        loading: "loading",
-        _this: this
-      }, res => {
-        this.detailData = res;
-      }, e => {
-      });
-    },
-    getData() {
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
-      });
-    },
-    /**
-     * @description: 动态表单读取
-     */
-    getFormFieldList(item) {
-      console.log(item);
-      this.$nextTick(() => {
-        this.qbfsForm = JSON.parse(JSON.stringify(item));
-        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
-        res = res.split(",");
-        this.dataList = [];
-        res.forEach(item => {
-          this.dataList.push({
-            opinion: item.split("-")[1],
-            people: item.split("-")[0]
-          });
-        });
-      });
-    },
-    //流程驳回
-    beforeBack(){
-      if(!this.commentText){
-        this.$message.warning('请填写审批意见')
-      }else{
-        this.isSubmit = true;
-        this.qbfsForm.commentText = this.commentText;
-        this.qbfsForm.sdFlag = '1'
-        this.qbfsForm.dataList = this.dataList;
-        let json = JSON.stringify(this.qbfsForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.$route.query.taskIds,
-          userId: this.$store.getters.userInfo.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-          this.isSubmit = false;
-        }, e => {
-        });
-      }
-    },
-    //流程提交
-    handleSubmit() {
-      this.$refs['qbfsForm'].validate((valid) => {
-        if (valid) {
-          this.isSubmit = true;
-          this.qbfsForm.commentText = this.commentText;
-          this.qbfsForm.sdFlag = '0'
-          this.qbfsForm.dataList = this.dataList;
-          let json = JSON.stringify(this.qbfsForm);
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: this.$route.query.taskIds,
-            userId: this.$store.getters.userInfo.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-            this.isSubmit = false;
-          }, e => {
-          });
-        }else{
-          this.$message.warning('请完善基础信息')
-        }
-      })
-    },
-
-    handleTabs(name) {
-      this.active = name;
-    },
-    foldForm() {
-      this.foldFormFlag = !this.foldFormFlag;
-    },
-    //转办事件
-    handleTransfer() {
-      this.drawerModal = true;
-      this.drawerTitle = "转办处理人";
-      this.selectPeople = row;
-    },
-    //确认转办
-    checkedRole(data) {
-      this.assigneeNewLoading = true;
-      changeAssigneeNew({
-        taskId: this.$route.query.taskIds, // 任务id
-        assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
-        pId: this.$route.query.prcId // 流程实例
-      }).then(res => {
-        this.isTransfer = false;
-        if (res.success) {
-          this.drawerModal = false;
-          this.$message.success("调整成功");
-          this.$router.push("/processCenter");
-          this.processNum();
-        } else {
-          this.$message.warning(res.message);
-        }
-      });
-    },
-    // 请求转换流程图
-    processNum(row) {
-      axios.request({
-        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
-        responseType: "blob",
-        method: "get",
-        params: {
-          prcNum: this.$route.query.prcNum
-        }
-      }).then(res => {
-        // let blob = new Blob([res.data], {type: 'image/jpg'})
-        // let url = window.URL.createObjectURL(res.data)
-        this.processStep = window.URL.createObjectURL(res.data);
-      });
-    },
-    /**
-     * @Description: 点击下载
-     */
-    downloadFile(attId) {
-      if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
-      } else {
-        this.$message.error("请选择要下载的文件");
-      }
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
-      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
-        this.$message.error("水印下载仅支持PDF,pdf格式文件");
-      } else {
-        if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
-        } else {
-          this.$message.error("请选择要下载的文件");
-        }
-      }
-    }
-  },
-  computed: {
-    listNoDataText() {
-      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-    }
-  }
-};
-</script>
-
-<style lang="less" scoped>
-@import '~@/assets/styles/style';
-
-.qbfz-step6 {
-  /deep/ .el-drawer__container {
-    .prc-content-border {
-      border: none;
-      padding: 0 20px 0;
-    }
-  }
-
-  .fileClass {
-    cursor: pointer;
-  }
-
-  .fileClass:hover {
-    color: #0c91e5;
-  }
-
-  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");
-    }
-  }
-
-  .choiceBtn {
-    .el-button--primary {
-      width: 150px;
-    }
-  }
-
-  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% - 103px');
-    overflow: auto;
-
-    .tableTitle {
-      margin-bottom: 10px;
-      height: 30px;
-      line-height: 30px;
-      position: relative;
-      font-size: 13px;
-      font-weight: bold;
-
-      .tableButton {
-        position: absolute;
-        right: 0;
-        top: 0;
-      }
-
-      .accessStandardsAndRegulations {
-        height: 100%;
-      }
-    }
-  }
-
-  .add-form-el-select {
-    /deep/ .el-select {
-      width: 210px;
-    }
-  }
-
-  .demo-drawer-content {
-    margin-top: 10px;
-  }
-}
-</style>
+<template>
+  <div class="qbfz-step6">
+    <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 === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standCode"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    type="textarea"
+                    v-model="qbfsForm.abolishCause"
+                    placeholder="请输入废止理由"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                  <el-select v-model="qbfsForm.nextStatus"  disabled  placeholder="请选择下一步状态">
+                    <el-option
+                      v-for="item in associationOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+        </el-button>
+        <process-title>
+          <template slot="title">会签信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="opinion"
+            align="center"
+            label="会签意见">
+          </el-table-column>
+          <el-table-column
+            prop="people"
+            align="center"
+            label="会签人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-submit
+      show-back
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep6",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: "",
+      nodeList: [],
+      fileList: [],
+      commentText: "",
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm: {
+        entNumber: "",
+        cnName: "",
+        enName: "",
+        entCategory: "",
+        replaceNumber: "",
+        replacedNumber: "",
+        releaseDate: "",
+        implementDate: "",
+        reviewDate: "",
+        nextStatus: ""
+      },
+      formRules: {
+        nextStatus: [
+          { required: true, message: "请选择下一步状态", trigger: "change" }
+        ]
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+  methods: {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item));
+        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
+        res = res.split(",");
+        this.dataList = [];
+        res.forEach(item => {
+          this.dataList.push({
+            opinion: item.split("-")[1],
+            people: item.split("-")[0]
+          });
+        });
+      });
+    },
+    //流程驳回
+    beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true;
+        this.qbfsForm.commentText = this.commentText;
+        this.qbfsForm.sdFlag = '1'
+        this.qbfsForm.dataList = this.dataList;
+        let json = JSON.stringify(this.qbfsForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.$route.query.taskIds,
+          userId: this.$store.getters.userInfo.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
+    },
+    //流程提交
+    handleSubmit() {
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true;
+          this.qbfsForm.commentText = this.commentText;
+          this.qbfsForm.sdFlag = '0'
+          this.qbfsForm.dataList = this.dataList;
+          let json = JSON.stringify(this.qbfsForm);
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: this.$route.query.taskIds,
+            userId: this.$store.getters.userInfo.userId,
+            json: json
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }else{
+          this.$message.warning('请完善基础信息')
+        }
+      })
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer() {
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
+    },
+    //确认转办
+    checkedRole(data) {
+      this.assigneeNewLoading = true;
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false;
+        if (res.success) {
+          this.drawerModal = false;
+          this.$message.success("调整成功");
+          this.$router.push("/processCenter");
+          this.processNum();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
+    // 请求转换流程图
+    processNum(row) {
+      axios.request({
+        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
+        responseType: "blob",
+        method: "get",
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step6 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  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");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  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% - 133px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/processList/index.vue b/src/pages/processCenter/pages/processList/index.vue
index 3bceb3b92..56d9f6fd0 100644
--- a/src/pages/processCenter/pages/processList/index.vue
+++ b/src/pages/processCenter/pages/processList/index.vue
@@ -65,7 +65,7 @@ export default {
         if (item.permission) {
           return this.$hasPermission(item.permission)
         } else {
-          return true
+          return false
         }
       })
     }
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index e1cdf15e4..fe5e79f2a 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -114,6 +114,7 @@
                 label="章节名称">
         </el-table-column>
         <el-table-column
+                prop="content"
                 align="center"
                 label="修改意见内容(包括理由或依据)"
         >