Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -16,9 +16,9 @@
       <el-menu
           unique-opened
           :default-active="defaultActive"
-          background-color="#f00"
+          background-color="#0068B7"
           text-color="#fff"
-          active-text-color="#ff0"
+          active-text-color="#000"
           router
           :collapse="isCollapse"
       >
@@ -91,12 +91,12 @@ export default {
           title: '首页',
           path: '/home2',
           isChildren: true, // 判断没有子菜单
-          'icon-class': 'home'
+          'icon-class': 'el-icon-s-home'
         },
         {
           title: '标准法规库',
           path: '/regulatoryRepository',
-          'icon-class': 'fagui',
+          'icon-class': 'el-icon-s-management',
           menuId: '2ewfwfa',
           children: [
             // {
@@ -180,10 +180,10 @@ export default {
               path: '/nonConfomity',
               menuId: '0119abd677e0204e061eb0f0b8cafda0'
             },
-            // {
-            //   title: '工作组',
-            //   path: '/workingGroup',
-            // },
+            {
+              title: '工作组',
+              path: '/workingGroup',
+            },
             // {
             //   title: '备案产品标准库',
             //   path: '/enterpriseStandardFiling',
@@ -204,7 +204,7 @@ export default {
         {
           title: '我的工作',
           path: '/processCenter',
-          'icon-class': 'liucheng',
+          'icon-class': 'el-icon-s-platform',
           menuId: '3fadf',
           children: [
             {
@@ -222,7 +222,7 @@ export default {
         {
           title: '本地工具',
           path: '/localTool',
-          'icon-class': 'tools',
+          'icon-class': 'el-icon-s-tools',
           menuId: 'afsd12',
           children: [
             // {
@@ -266,7 +266,7 @@ export default {
         {
           title: '标准预警',
           path: '/standardWarning',
-          'icon-class': 'warning',
+          'icon-class': 'el-icon-warning',
           menuId: 'asfdew33',
           isChildren: true // 判断没有子菜单
         },
@@ -287,7 +287,7 @@ export default {
         {
           title: '配置管理',
           path: '/config',
-          'icon-class': 'conf',
+          'icon-class': 'el-icon-s-operation',
           menuId: 'adff323',
           children: [
             {
@@ -379,7 +379,7 @@ export default {
         {
           title: '个人中心',
           path: '/personal',
-          'icon-class': 'ucenter',
+          'icon-class': 'el-icon-s-check',
           menuId: '32143ffasdf',
           children: [
             // {
@@ -496,6 +496,18 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
+/deep/.el-menu--popup > div {
+  border-radius: 5px;
+}
+.el-menu--collapse {
+  .is-active {
+    background-color: #fff !important;
+    .shangqi-icon {
+      color: #0068B7 !important;
+    }
+    color: #0068B7 !important;
+  }
+}
 .nav-menu {
   width: 58px;
   height: 100%;
@@ -565,10 +577,31 @@ export default {
   top:-15px;
   left:10px
 }
+/*.el-menu--collapse {*/
+/*  .shangqi-icon {*/
+/*    color: #4091FF !important;*/
+/*  }*/
+/*  .is-active /deep/.shangqi-icon {*/
+/*    color: #4091FF !important;*/
+/*  }*/
+/*  /deep/.el-submenu__title i {*/
+/*    color: #fff;*/
+/*  }*/
+/*  /deep/.el-submenu__title i {*/
+/*    color: #fff;*/
+/*  }*/
+/*}*/
+.is-active /deep/.shangqi-icon {
+  color: #4091FF;
+}
+/deep/.el-submenu__title i {
+  color: #fff;
+}
 .nav-menu /deep/.el-submenu__title i {
-  color: #000;
+  color: #fff;
 }
 .nav-menu{
+  background-color: #4091FF;
   scrollbar-width: none;
   -ms-overflow-style: none; /* IE 10+ */
 }

src/pages/home/components/EnterCard.vue

@@ -64,6 +64,7 @@
       height: 70px;
       background: #fff;
       border: 2px dashed #E4E4E4;
+      border-radius: 5px;
       div {
         width: 100%;
         height: 100%;

src/pages/home2/components/empennage/index.vue

@@ -1,96 +1,104 @@
 <!-- 尾部链接 -->
 <template>
-  <div class="link">
-    <div class="title">友情链接</div>
-    <ul>
-      <li class="myLi1" v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
-        <a v-if="link.name.length>10" v-html="link.name.substring(0,10)+'...'" :title="link.name"></a>
-        <a v-else v-html="link.name" :title="link.name"></a>
-      </li>
-      <li class="myLi2">
-        <span @click="$router.push('linkManage')">更多链接 ⋙</span>
-      </li>
-    </ul>
-  </div>
+    <div class="link" id="link">
+        <div>
+            <span class="title borderRight">友情链接</span>
+            <span class="myLi1 borderRight" v-for="(link, index) in linkList" :key="index" @click="openLinkUrl(link.url)" :title="link.name" >
+                {{ link.name }}
+            </span>
+            <span class="myLi1" @click="$router.push('linkManage')">更多链接 ⋙</span>
+        </div>
+    </div>
 </template>
 
 <script>
-export default {
-  name: 'Empennage',
-  components: {},
-  mixins: [],
-  data() {
-    return {
-      linkList: [],
-    }
-  },
-  computed: {},
-  watch: {},
-  mounted() {
-    this.getLink();
-  },
-  methods: {
-    // 跳转链接
-    openLinkUrl (linkUri) {
-      let getHttp = linkUri.substring(0, 7)
-      let getHttps = linkUri.substring(0, 8)
-      if (getHttp === 'http://' || getHttps === 'https://') {
-        window.open(linkUri)
-      } else {
-        window.open('https://' + linkUri)
-      }
-    },
-    // 获取链接数据
-    getLink () {
-      this.$http.get('sarUrl/tsUrl', {
-      }, {
-        _this: this,
-        loading: 'Loading'
-      }, res=> {
-        this.linkList = res.data
-      })
-    }
-  },
+    export default {
+        name: 'Empennage',
+        components: {},
+        mixins: [],
+        data() {
+            return {
+                linkList: [],
+                width: ''
+            }
+        },
+        computed: {},
+        watch: {
+            width(val) {
+                console.log(val);
+            }
+        },
+        mounted() {
+            this.getLink();
+            this.width = document.getElementById("link").offsetWidth
+            let self = this
+            this.screenWidth = document.body.clientWidth
+            window.onresize = () => {
+                return (() => {
+                    console.log(document.body.clientWidth);
+                })
+            }
+        },
+        methods: {
+            // 跳转链接
+            openLinkUrl (linkUri) {
+                let getHttp = linkUri.substring(0, 7)
+                let getHttps = linkUri.substring(0, 8)
+                if (getHttp === 'http://' || getHttps === 'https://') {
+                    window.open(linkUri)
+                } else {
+                    window.open('https://' + linkUri)
+                }
+            },
+            // 获取链接数据
+            getLink () {
+                var width = document.getElementById("link").offsetWidth
+                this.$http.get('sarUrl/tsUrl', {
+                }, {
+                    _this: this,
+                    loading: 'Loading'
+                }, res=> {
+                    let b = 0
+                    let c = 0
+                    for (let a = 0; a < res.data.length; a++) {
+                        b += res.data[a].name.length * 14 + 100
+                        if (b > width) {
+                            c = a - 1
+                        } else {
+                            c = a
+                        }
+                    }
+                    let list
+                    list = res.data.slice(0, c)
+                    this.linkList = list
+                })
+            }
+        },
 
-}
+    }
 </script>
 
 <style lang="less" scoped>
-.link {
-  display: flex;
-  border-radius: 3px;
-  height: 100%;
-  .title {
-    font-weight: bold;
-    padding-left: 10px;
-    width: 80px;
-  }
-  ul {
-    width: calc(~'100% - 80px');
-    display: flex;
-    height: 100%;
-    text-align: center;
-    user-select: none;
-    .myLi1 {
-      border-right: 2px solid #f4f4f4;
-      flex: 1;
-      a {
-        color: #333333;
-      }
+    .link {
+        display: flex;
+        border-radius: 3px;
+        height: 100%;
+        align-items: center;
+        justify-content: space-around;
+        .borderRight {
+            padding-right: 30px;
+            margin-right: 30px;
+            border-right: 2px dotted #aaa;
+        }
+        .title {
+            font-weight: bold;
+            padding-left: 10px;
+            width: 80px;
+        }
+        .myLi1 {
+            cursor: pointer;
+            color: #0068B7;
+        }
     }
-    .myLi1:hover {
-      background: #5ea9f6;
-      a {
-        color: #fff;
-        text-decoration: none;
-      }
-    }
-    .myLi2 {
-      padding: 0 10px;
-      cursor: pointer;
-      color: #5ea9f6 !important;
-    }
-  }
-}
 </style>
 

src/pages/home2/components/todoList/index.vue

@@ -638,6 +638,633 @@ export default {
             })
           }
           break
+        case '14':
+          //参与外部标准制修订信息提报
+          if (row.taskInfo === '下发责任工程师') {
+            this.$router.push({
+              name: 'cywbbzzxdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '填写备案信息'){
+            this.$router.push({
+              name: 'cywbbzzxdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '责任部门对接人审核'){
+            this.$router.push({
+              name: 'cywbbzzxdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规工程师审核'){
+            this.$router.push({
+              name: 'cywbbzzxdStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规部部长批准'){
+            this.$router.push({
+              name: 'cywbbzzxdStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '15':
+          //加入标准化协会信息备案流程
+          if (row.taskInfo === '填写入会信息') {
+            this.$router.push({
+              name: 'jrbzhxhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规工程师审核'){
+            this.$router.push({
+              name: 'jrbzhxhStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长批准'){
+            this.$router.push({
+              name: 'jrbzhxhStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '16':
+          //外部署名推荐审批流程
+          if (row.taskInfo === '会签') {
+            this.$router.push({
+              name: 'wbsmStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长审核'){
+            this.$router.push({
+              name: 'wbsmStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '技术管理中心主任审定'){
+            this.$router.push({
+              name: 'wbsmStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '工程研究总院院长批准'){
+            this.$router.push({
+              name: 'wbsmStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '修改信息'){
+            this.$router.push({
+              name: 'wbsmStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+          // 外部标准化协会入会流程
+        case '20':
+          if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzrhStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '入会代表填写入会信息表') {
+            this.$router.push({
+              name: 'bzrhStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '入会人员所在部门负责人审核') {
+            this.$router.push({
+              name: 'bzrhStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总修订') {
+            this.$router.push({
+              name: 'bzrhStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '标准法规部主管领导审核') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '费用管理部门会签') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){
+            this.$router.push({
+              name: 'bzrhStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '18':
+          if (row.taskInfo === '法规认证部副部长批准') {
+            this.$router.push({
+              name: 'zcchStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '公司副总批准') {
+            this.$router.push({
+              name: 'zcchStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '修订参会信息') {
+            this.$router.push({
+              name: 'zcchStep1-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+          // 政策参会流程
+        case '19':
+          if (row.taskInfo === '申请人填写表单') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '审核员批准') {
+            this.$router.push({
+              name: 'zchhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '申请人修订申请信息') {
+            this.$router.push({
+              name: 'zchhStep1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+
+        case '21':
+          if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') {
+            this.$router.push({
+              name: 'bzchStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '参会代表填写参会信息表') {
+            this.$router.push({
+              name: 'bzchStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '参会人员所在部门中心主任审核') {
+            this.$router.push({
+              name: 'bzchStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师修订') {
+            this.$router.push({
+              name: 'bzchStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术管理中心主任审批') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '费用管理部门会签') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师修订完毕') {
+            this.$router.push({
+              name: 'bzchStep6',
+              query:{
+                taskInfo: row.taskInfo,
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+
+          break
+        case '22':
+          this.$router.push({
+            name: 'bzhhStep2',
+            query:{
+              taskIds: row.taskIds,
+              prcId: row.prcId,
+              prcNum: row.prcNum,
+              prcName: row.prcName,
+              prcType: row.prcType
+            }
+          })
+          break
+        case 'laws2':
+          if (row.taskInfo === '责任对接人进行任务下发') {
+            this.$router.push({
+              name: 'zczqyjStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '责任人(责任工程师)填写意见'){
+            this.$router.push({
+              name: 'zczqyjStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任对接人审核'){
+            this.$router.push({
+              name: 'zczqyjStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规工程师单条审核'){
+            this.$router.push({
+              name: 'zczqyjStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规工程师修订'){
+            this.$router.push({
+              name: 'zczqyjStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部长审核'){
+            this.$router.push({
+              name: 'zczqyjStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部副总监审核'){
+            this.$router.push({
+              name: 'zczqyjStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部总监批准'){
+            this.$router.push({
+              name: 'zczqyjStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case 'laws3':
+          if (row.taskInfo === '法规认证部长批准') {
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '法规认证部副总监批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任部门领导任务下发'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任人反馈情况'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep5-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '责任部门领导批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规管理员审核'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep7-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部长审定'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep8',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '法规认证部副总监批准'){
+            this.$router.push({
+              name: 'zdrzbzORzchgxxmscStep9',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
 
       }
     },

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -16,36 +16,36 @@
         <div class="content_form">
           <el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="标委会:">
                   {{ hh_pageData.associaName || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="分标委:">
                   {{ hh_pageData.associaNameOne || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="工作组:">
                   {{ hh_pageData.associaNameTwo || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会人:">
                   {{ hh_pageData.partPeople || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会时间:">
                   {{ hh_pageData.meetingStartTime || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="会议名称:">
                   {{ hh_pageData.meetingName || '-' }}
                 </el-form-item>
@@ -79,28 +79,12 @@
                 </el-table-column>
                 <el-table-column prop="material" label="资料" align="center">
                   <template slot-scope="scope">
-                    <el-upload
-                      :disabled="acceptShow"
-                      multiple
-                      ref="uploadFile"
-                      :action="actionPath"
-                      name="file"
-                      :file-list="scope.row.fileTextList"
-                      accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
-                      :before-upload="handleBeforeUpload"
-                      :before-remove="handleBeforeRemove"
-                      :on-success="handleOnsuccess"
-                    >
-                      <el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
-                    </el-upload>
+                    <el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
             <el-form-item>
-              <div style="text-align: right">
-                <el-button type="primary" size="small" @click="otherAdd">添加(测试用)</el-button>
-              </div>
               <el-table
                 :data="hh_pageData.themeTable"
                 border
@@ -110,27 +94,10 @@
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '20px'}">
                 <el-table-column type="index" label="序号" align="center" width="50"/>
-                <el-table-column label="议题" align="center" prop="meetingTheme">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row.meetingTheme"></el-input>
-                  </template>
-                </el-table-column>
+                <el-table-column label="议题" align="center" prop="meetingTheme"/>
                 <el-table-column label="资料" align="center" prop="meetingFile" width="200">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="actionPath"
-                      :disabled="acceptShow"
-                      multiple
-                      ref="uploadThemeFile"
-                      name="themeFile"
-                      :file-list="scope.row.themeFileList"
-                      accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
-                      :before-upload="beforeUploadTheme"
-                      :before-remove="beforeRemoveTheme"
-                      :on-success="onsuccessTheme"
-                    >
-                      <el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
-                    </el-upload>
+                    <el-button type="primary" size="mini" @click="uploadThemeTable(scope.row)">点击上传</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -138,18 +105,17 @@
             <el-form-item label="其他资料:" prop="otherFile">
               <el-upload
                 :action="actionPath"
-                :disabled="acceptShow"
                 multiple
                 style="width: 30%"
                 ref="uploadOtherFile"
-                name="otherFile"
-                :file-list="otherFileList"
+                name="file"
+                :file-list="upOtherData"
                 accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                 :before-upload="beforeUploadOther"
                 :before-remove="beforeRemoveOther"
                 :on-success="onsuccessOther"
               >
-                <el-button type="primary" size="small" @click="otherBtn">点击上传</el-button>
+                <el-button type="primary" size="small">点击上传</el-button>
               </el-upload>
             </el-form-item>
           </el-form>
@@ -164,13 +130,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="参会人填写信息" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>参会人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="参会人"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -207,6 +173,48 @@
       :nodeList="nodeListOne"
       @checkedRole="drawerCheckOne"
     />
+    <!--  标准号table上传弹框  -->
+    <el-dialog
+      :visible.sync="upDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        :file-list="reData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="handleBeforeUpload"
+        :before-remove="handleBeforeRemove"
+        :on-success="handleOnsuccess"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em style="color: #0c91e5">点击上传</em></div>
+      </el-upload>
+    </el-dialog>
+    <!--  议题table上传弹框  -->
+    <el-dialog
+      :visible.sync="upThemeDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :disabled="acceptShow"
+        multiple
+        ref="uploadFile"
+        :action="actionPath"
+        name="file"
+        :file-list="themeData"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beforeUploadTheme"
+        :before-remove="beforeRemoveTheme"
+        :on-success="onsuccessTheme"
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em style="color: #0c91e5">点击上传</em></div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -214,7 +222,8 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, inboundLiaisonDetail} from '@/api/process.js'
+import { saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+
 export default {
   components: {
     ProcessHeader,
@@ -237,6 +246,7 @@ export default {
         partPeople: '',
         standardTable: [],
         themeTable: [],
+        otherFileList: [],
       },
       hh_rules: {},
       deleteDataList: [],
@@ -246,15 +256,13 @@ export default {
       nodeListOne: [],
 
       // 上传文件储存
-      fileTextList: [],
-      newDataList: [],
+      reData: [],
 
-      themeFileList: [],
-      newThemeFile: [],
+      themeData: [],
 
-      otherFileList: [],
-      newOtherFile: [],
+      upOtherData: [],
 
+      unqualidiedData: [],
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
@@ -263,6 +271,8 @@ export default {
       },
       roleFormRules: {},
 
+      upDialog: false,
+      upThemeDialog: false,
       isSubmit: false,
       saveLoading: false
     }
@@ -283,30 +293,36 @@ export default {
       }
       inboundLiaisonDetail(params).then(res => {
         const processForm = JSON.parse(res.mesg)
-        let commitStatus = res.commitStatus
-        if(commitStatus && commitStatus > 0){
-          this.acceptShow = true
-          this.submitShow = false
-        }else {
-          this.acceptShow = false
-          this.submitShow = true
-        }
-        this.todoId = res.id
         this.getFormFieldList(processForm)
       })
     },
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        let listJSON = JSON.parse(JSON.stringify(item)).hh_pageData
+        let formList = JSON.parse(JSON.stringify(item)).ch_pageData
+        if (formList === undefined) {
+          this.hh_pageData = JSON.parse(JSON.stringify(item)).hh_pageData
+          this.upOtherData = this.hh_pageData.otherFileList
+        } else {
+          this.hh_pageData.associaName = formList.associaName
+          this.hh_pageData.associaNameOne = formList.associaNameOne
+          this.hh_pageData.associaNameTwo = formList.associaNameTwo
+          this.hh_pageData.meetingStartTime = formList.meetingStartTime
+          this.hh_pageData.meetingName = formList.meetingName
+          this.hh_pageData.themeTable = formList.meetingTable
+          this.hh_pageData.themeTable.forEach(item=>{
+            this.$set(item,'meetingFile','')
+          })
+          this.hh_pageData.partPeople = this.$store.getters.userInfo.userName
+        }
       })
     },
 
     // 添加按钮
     table_add() {
       var list = {
-        standardId: this.standardId,
-        standardName: this.standardName,
-        material: this.material,
+        standardId: this.standardId = '',
+        standardName: this.standardName = '',
+        material: this.material = [],
       }
       this.hh_pageData.standardTable.push(list)
     },
@@ -341,39 +357,36 @@ export default {
       }
     },
 
-    otherAdd() {
-      var list = {
-        meetingTheme: this.meetingTheme,
-        meetingFile: this.meetingFile,
-      }
-      this.hh_pageData.themeTable.push(list)
-    },
     /** 标准号的表格上传 */
     // 标准号的表格上传按钮
     uploadTable(val) {
       this.fileListData = val
+      this.reData = this.fileListData.material
+      this.upDialog = true
     },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fileTextList !== null) {
-          this.newDataList = this.fileTextList
-          this.newDataList.push({
-            id: res.data.attId,
-            name: res.data.standName
+        if (this.reData !== undefined) {
+          this.newDataList = this.reData
+            this.newDataList.push({
+              id: res.data.attId,
+              name: res.data.standName
           })
         } else {
-          this.newDataList.push({
-            id: res.data.attId,
-            name: res.data.standName
-          })
+            this.newDataList.push({
+              id: res.data.attId,
+              name: res.data.standName
+            })
         }
-        this.fileListData.fileText = this.newDataList
+
+        this.fileListData.material = this.newDataList
         this.$message({
           showClose: true,
           message: res.message,
           type: 'success'
         })
+        this.newDataList = []
         this.fileMadel = false
       }
     },
@@ -404,12 +417,16 @@ export default {
     },
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
-      this.fileData = fileList
-      this.fileTextList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.fileTextList.splice(index,1)
+      this.reData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.reData.splice(index, 1)
         }
       })
+      this.fileListData.material = this.reData
+    },
+    handleClose() {
+      this.upDialog = false
+      this.upThemeDialog = false
     },
 
 
@@ -417,28 +434,32 @@ export default {
     // 议题列表资料上传按钮
     uploadThemeTable(val) {
       this.themeDataList = val
+      this.upThemeDialog = this.themeDataList.meetingFile
+      this.upThemeDialog = true
+
     },
     // 文件上传成功
     onsuccessTheme(res, file, fileList) {
       if (res.ok) {
-        if (this.themeFileList !== null) {
-          this.newThemeFile = this.themeFileList
+        if (this.themeData !== null) {
+          this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
             name: res.data.standName
           })
         } else {
-          this.newThemeFile.push({
+          this.newDataList.push({
             id: res.data.attId,
             name: res.data.standName
           })
         }
-        this.themeDataList.fileText = this.newThemeFile
+        this.themeDataList.meetingFile = this.newThemeFile
         this.$message({
           showClose: true,
           message: res.message,
           type: 'success'
         })
+        this.newThemeFile = []
         this.fileMadel = false
       }
     },
@@ -469,24 +490,20 @@ export default {
     },
     // 移除上传的文件
     beforeRemoveTheme(file, fileList) {
-      this.fileData = fileList
-      this.themeFileList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.themeFileList.splice(index,1)
+      this.themeData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.themeData.splice(index, 1)
         }
       })
+      this.themeDataList.meetingFile = this.themeData
     },
 
     /** 其他资料上传 */
-    // 其他资料上传按钮
-    otherBtn(val) {
-      this.otherDataList = val
-    },
     // 文件上传成功
     onsuccessOther(res, file, fileList) {
       if (res.ok) {
-        if (this.otherFileList !== null) {
-          this.newOtherFile = this.otherFileList
+        if (this.hh_pageData.otherFileList !== null) {
+          this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
             name: res.data.standName
@@ -497,7 +514,7 @@ export default {
             name: res.data.standName
           })
         }
-        this.otherDataList.fileText = this.newOtherFile
+        this.hh_pageData.otherFileList = this.newOtherFile
         this.$message({
           showClose: true,
           message: res.message,
@@ -533,12 +550,12 @@ export default {
     },
     // 移除上传的文件
     beforeRemoveOther(file, fileList) {
-      this.fileData = fileList
-      this.otherFileList.forEach((item, index) => {
-        if (item.name === file.name || item.id === file.id ) {
-          this.otherFileList.splice(index,1)
+      this.upOtherData.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.upOtherData.splice(index, 1)
         }
       })
+      this.hh_pageData.otherFileList = this.upOtherData
     },
 
     /** 法规工程师选择 */
@@ -567,7 +584,7 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '20')
+      _formData.append('prcType', '22')
       _formData.append('json', JSON.stringify({
         roleForm: this.roleForm,
         hh_pageData: this.hh_pageData
@@ -583,32 +600,24 @@ export default {
     /** 提交按钮*/
     handleSubmit() {
       let json = {
-        prcCreateUser: this.$store.getters.userInfo.userId,
-        prcCreateUserName: this.$store.getters.userInfo.userName,
         hh_pageData: this.hh_pageData,
-        director: this.roleForm.engineerUserId,
+        // director: this.roleForm.engineerUserId,
       }
       this.$refs['hh_pageData'].validate((valid) => {
         if (valid) {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              const paramsInfo = {
-                type: '22'
-              }
-              startProcess(paramsInfo).then(res => {
-                this.taskID = res.data
-                const params = new FormData();
-                params.set('json', JSON.stringify(json))
-                params.set('userId', this.$store.getters.userInfo.userId)
-                params.set('taskId', this.taskID)
-                completeTask(params).then(res => {
-                  if (res.success === true) {
-                    this.$message.success('提交成功')
-                    this.$router.push("/processCenter");
-                  }
-                  this.isSubmit = false
-                })
+              const params = new FormData();
+              params.set('json', JSON.stringify(json))
+              params.set('userId', this.$store.getters.userInfo.userId)
+              params.set('taskId', this.taskIds)
+              completeTask(params).then(res => {
+                if (res.success === true) {
+                  this.$message.success('提交成功')
+                  this.$router.push("/processCenter");
+                }
+                this.isSubmit = false
               })
             }
           })
@@ -684,16 +693,33 @@ export default {
     }
   }
 
+  /deep/ .el-dialog__body {
+    padding-top: 0;
+    text-align: center;
+
+    .el-upload-list__item:first-child {
+      margin-top: 20px;
+    }
+
+    .el-icon-upload:before {
+      font-size: 60px;
+      color: #7EC4CC;
+    }
+  }
+
   .content_form {
     /deep/ .el-table__body-wrapper {
       height: auto !important;
     }
+
     /deep/ .el-table th {
       padding: 0px;
     }
+
     /deep/ .el-input__inner {
       text-align: center;
     }
+
     .table_btn {
       text-align: right;;
     }

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bzhhStep1">
+  <div class="bzhhStep2">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化会后管理流程</template>
       <template slot="proNode">审批</template>
@@ -16,36 +16,36 @@
         <div class="content_form">
           <el-form ref="hh_pageData" :model="hh_pageData" :rules="hh_rules" label-width="120px">
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="标委会:">
                   {{ hh_pageData.associaName || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="分标委:">
                   {{ hh_pageData.associaNameOne || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="工作组:">
                   {{ hh_pageData.associaNameTwo || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会人:">
                   {{ hh_pageData.partPeople || '-' }}
                 </el-form-item>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="参会时间:">
                   {{ hh_pageData.meetingStartTime || '-' }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5">
+              <el-col :span="8">
                 <el-form-item label="会议名称:">
                   {{ hh_pageData.meetingName || '-' }}
                 </el-form-item>
@@ -66,12 +66,7 @@
                 <el-table-column prop="standardName" label="标准名称" align="center"/>
                 <el-table-column prop="material" label="资料" align="center">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="actionPath"
-                      name="file"
-                      :file-list="scope.row.fileTextList"
-                    >
-                    </el-upload>
+                    <el-button size="mini" type="primary" @click="materialBtn(scope.row)">查看</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -89,21 +84,16 @@
                 <el-table-column label="议题" align="center" prop="meetingTheme"></el-table-column>
                 <el-table-column label="资料" align="center" prop="meetingFile">
                   <template slot-scope="scope">
-                    <el-upload
-                      :action="''"
-                      name="themeFile"
-                      :file-list="scope.row.themeFileList"
-                      :on-preview="onPreviewTheme(scope.row)"
-                    />
+                   <el-button type="primary" size="mini" @click="meetingFileBtn(scope.row)">查看</el-button>
                   </template>
                 </el-table-column>
               </el-table>
             </el-form-item>
             <el-form-item label="其他资料:" prop="otherFile">
               <el-upload
-                :action="actionPath"
-                name="otherFile"
-                :file-list="otherFileList"
+                :action="''"
+                name="name"
+                :file-list="otherFile"
                 :on-preview="onPreviewOther"
               >
               </el-upload>
@@ -192,6 +182,39 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :isSubmitBack="isBack"
+      @back="handleSubmitNo"
+      @submit="handleSubmit"
+    />
+
+    <el-dialog
+      :visible.sync="materialDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="fileTextList"
+        :on-preview="handleOnPreview"
+      >
+      </el-upload>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="meetingFileDialog"
+      width="30%"
+      :before-close="handleClose">
+      <el-upload
+        :action="''"
+        name="file"
+        :file-list="themeFileList"
+        :on-preview="onPreviewTheme"
+      >
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -213,6 +236,7 @@ export default {
       actionPath: 'api/att/attFile/upload',
       acceptShow: false,
       active: '1',
+      loading: false,
       hh_pageData: {
         associaName: '',
         associaNameOne: '',
@@ -227,10 +251,17 @@ export default {
 
       fileTextList: [],
       themeFileList: [],
-      otherFileList: [],
+      otherFile: [],
 
+      materialDialog: false,
+      meetingFileDialog: false,
       hh_rules: {},
       detailData: [],
+
+      isBack: false,
+      isSubmit: false,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
     }
   },
   computed: {
@@ -275,11 +306,24 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.hh_pageData = JSON.parse(JSON.stringify(item)).hh_pageData
-        this.roleForm = JSON.parse(JSON.stringify(item)).roleList
-        // this.rh_pageData.comityFileNum = this.fileTextList
+        this.otherFile = this.hh_pageData.otherFileList
       })
     },
 
+    /** 标准号列表查看按钮 */
+    materialBtn(val) {
+      this.fileTextList = val.material
+      this.materialDialog = true
+    },
+    /** 议题列表查看按钮 */
+    meetingFileBtn(val) {
+      this.themeFileList = val.material
+      this.meetingFileDialog = true
+    },
+    handleClose() {
+      this.materialDialog = false
+      this.meetingFileDialog = false
+    },
     // 点击上传的文件进行下载
     handleOnPreview(file) {
       let attId = file.id
@@ -302,6 +346,55 @@ export default {
       }
     },
 
+    // 退回按钮
+    handleSubmitNo() {
+      let json = {
+        passFlag: '0',
+        commentText: this.commentText,
+        hh_pageData: this.hh_pageData,
+      }
+      this.$refs['hh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isBack = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('退回成功')
+              this.$router.push("/processCenter");
+            }
+            this.isBack = false
+          });
+        }
+      })
+    },
+    // 提交按钮
+    handleSubmit() {
+      let json = {
+        passFlag: '1',
+        commentText: this.commentText,
+        ch_pageData: this.ch_pageData,
+      }
+      this.$refs['hh_pageData'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true
+          const params = new FormData();
+          params.set('json', JSON.stringify(json))
+          params.set('userId', this.$store.getters.userInfo.userId)
+          params.set('taskId', this.taskIds)
+          completeTask(params).then(res => {
+            if (res.success === true) {
+              this.$message.success('提交成功')
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false
+          });
+        }
+      })
+    }
+
   }
 }
 </script>
@@ -380,6 +473,21 @@ export default {
     /deep/ .el-input__inner {
       text-align: center;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     .table_btn {
       text-align: right;;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -40,7 +40,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -53,7 +53,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -66,7 +66,7 @@
                       v-for="item in associaNameOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -77,6 +77,7 @@
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期时间"
                     align="right">
                   </el-date-picker>
@@ -103,7 +104,7 @@
                       v-for="item in feeKindOptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value"/>
+                      :value="item.label"/>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -112,14 +113,14 @@
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
                   <el-upload
-                    style="width: 30%"
+                    style="width: 70%"
                     class="upload_style"
                     :disabled="acceptShow"
                     multiple
                     ref="uploadFile"
                     :action="uploadPath"
                     name="file"
-                    :file-list="fileTextList"
+                    :file-list="ch_pageData.fileTextList"
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="handleBeforeUpload"
                     :before-remove="handleBeforeRemove"
@@ -129,7 +130,6 @@
                       :disabled="acceptShow"
                       type="primary"
                       class="common-button-primary"
-                      @click="uploadFile"
                       size="mini">
                       点击上传
                     </el-button>
@@ -345,6 +345,7 @@ export default {
         uploadFile: '',
         sort: '1',
         meetingTable: [],
+        fileTextList: [],
       },
       associaNameOptions: [
         {value: '0', label: '国内法规入库流程'},
@@ -361,7 +362,6 @@ export default {
       // 上传路径
       uploadPath: 'api/att/attFile/upload',
       // 上传所储存文件数组
-      fileTextList: [],
       newDataList: [],
 
       ch_rules: {},
@@ -398,9 +398,9 @@ export default {
     },
 
     //上传按钮
-    uploadFile(val) {
+   /* uploadFile(val) {
       this.fileListData = val
-    },
+    },*/
     // 文件上传限制条件
     handleBeforeUpload(file) {
       var filename = file.name
@@ -429,17 +429,17 @@ export default {
     // 移除上传的文件
     handleBeforeRemove(file, fileList) {
       this.fileData = fileList
-      this.fileTextList.forEach((item, index) => {
+      this.ch_pageData.fileTextList.forEach((item, index) => {
         if (item.name === file.name || item.id === file.id) {
-          this.fileTextList.splice(index, 1)
+          this.ch_pageData.fileTextList.splice(index, 1)
         }
       })
     },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fileTextList !== null) {
-          this.newDataList = this.fileTextList
+        if (this.ch_pageData.fileTextList !== null) {
+          this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
             name: res.data.standName
@@ -450,7 +450,7 @@ export default {
             name: res.data.standName
           })
         }
-        this.rh_pageData.infoSources = this.newDataList
+        this.ch_pageData.fileTextList = this.newDataList
         this.$message({
           showClose: true,
           message: res.message,

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,12 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i></i>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :disabled="acceptShow"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -208,6 +213,7 @@ export default {
     return {
       active: '1',
 
+      acceptShow: false,
       ch_pageData: {},
       ch_rules: {},
       nodeList: [],
@@ -397,6 +403,20 @@ export default {
     /deep/.el-textarea__inner {
       font-family: inherit;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i></i>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -476,6 +480,21 @@ export default {
       font-family: inherit;
     }
 
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/ .el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -413,6 +417,21 @@ export default {
     /deep/.el-textarea__inner {
       font-family: inherit;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -14,7 +14,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -59,7 +59,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -422,6 +426,21 @@ export default {
     /deep/.el-table th {
       padding: 0px;
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     .myPart_btn {
       text-align: right;
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -17,7 +17,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
         <div class="content_form">
-          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
+          <el-form ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="120px">
             <el-row :gutter="24">
               <el-col :span="8">
                 <el-form-item label="会议名称:">
@@ -62,7 +62,11 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="上传附件:" prop="uploadFile">
-                  <i/>
+                  <el-upload
+                    action=""
+                    name="file"
+                    :file-list="ch_pageData.fileTextList"
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -454,6 +458,21 @@ export default {
         text-align: center;
       }
     }
+    /deep/.el-upload {
+      display: unset;
+    }
+    /deep/.el-upload-list__item-status-label {
+      font-size: 0;
+    }
+    /deep/.el-upload-list__item {
+      .el-icon-close {
+        font-size: 0;
+      }
+
+      .el-icon-close-tip {
+        font-size: 0;
+      }
+    }
     /deep/.el-table th {
       padding: 0px;
     }

src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue

@@ -23,16 +23,23 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="政策号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
-                    <el-button size="small" type="primary" @click="">选择征求意见政策</el-button>
+                    <el-button size="small" type="primary" @click="handleSearchStandard">选择征求意见政策</el-button>
                   </div>
                   <el-input
-                      v-model="form.cid"
+                      v-model="form.lawsNumber"
                       placeholder="请输入政策编号"
                       clearable
                   />
                 </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="截止时间" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                       v-model="form.endTime"
@@ -88,7 +95,8 @@
               </el-card>
             </el-timeline-item>
 
-            <el-timeline-item timestamp="责任对接人任务分发及审核" placement="top" :color="roleForm.responseDockerId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="责任对接人任务分发及审核" placement="top"
+                              :color="roleForm.responseDockerId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="responseDockerName" style="margin-bottom: 0">
                   <h4>责任对接人</h4>
@@ -101,7 +109,8 @@
               </el-card>
             </el-timeline-item>
 
-            <el-timeline-item timestamp="法规认证工程师意见汇总并发起会签" placement="top" :color="roleForm.lawsProveEngineerId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="法规认证工程师意见汇总并发起会签" placement="top"
+                              :color="roleForm.lawsProveEngineerId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="lawsProveEngineerName" style="margin-bottom: 0">
                   <h4>法规认证工程师</h4>
@@ -114,7 +123,8 @@
               </el-card>
             </el-timeline-item>
 
-            <el-timeline-item timestamp="法规认证部部长审核" placement="top" :color="roleForm.lawsProveMinisterId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="法规认证部部长审核" placement="top"
+                              :color="roleForm.lawsProveMinisterId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="lawsProveMinisterName" style="margin-bottom: 0">
                   <h4>法规认证部部长</h4>
@@ -127,7 +137,8 @@
               </el-card>
             </el-timeline-item>
 
-            <el-timeline-item timestamp="法规认证部副总监审定" placement="top" :color="roleForm.lawsProveViceChiefId ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="法规认证部副总监审定" placement="top"
+                              :color="roleForm.lawsProveViceChiefId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="lawsProveViceChiefName" style="margin-bottom: 0">
                   <h4>法规认证部副总监</h4>
@@ -172,6 +183,144 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 选择标准的弹框 -->
+    <el-drawer
+        ref="standard"
+        title="查询结果"
+        size="1000px"
+        :visible.sync="standardDrawer"
+        direction="rtl"
+        :before-close="handleReviseDrawerClose">
+      <div class="standard-content">
+        <div class="content">
+          <div class="standard-table-search">
+            <el-form :model="standardSearchForm" inline class="label-input-form search-area">
+              <el-form-item label="政策编号" style="margin-right:10px" prop="lawsNumber" class="search-item">
+                <el-input
+                    v-model="standardSearchForm.lawsNumber"
+                    clearable placeholder="根据编号查找"
+                    :maxlength="100"
+                    @keyup.enter.native="handleSearchStandard"/>
+              </el-form-item>
+              <el-form-item label="政策名称" style="margin-right:10px" prop="lawsName" class="search-item">
+                <el-input
+                    v-model="standardSearchForm.lawsName"
+                    placeholder="请输入政策名称"
+                    clearable
+                    :maxlength="100"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                    icon="el-icon-search"
+                    type="primary"
+                    class="common-button-primary"
+                    @click="handleSearchStandard"
+                    round>
+                </el-button>
+                <el-button
+                    class="common-button-default"
+                    icon="el-icon-refresh-left"
+                    @click="handleResetSearch"
+                    round>
+                </el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="standard-table-wrap">
+            <el-table
+                ref="reviseDrawerTable"
+                :data="tableData.standardData"
+                tooltip-effect="dark"
+                style="width: 100%;"
+                :height="tableHeight.standardTableHeight"
+                border
+                class="drag-table"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                @selection-change="standSelectChange">
+              <el-table-column
+                  type="selection"
+                  width="55"
+                  align="center">
+              </el-table-column>
+              <el-table-column
+                  type="index"
+                  label="序号"
+                  width="80"
+                  align="center"
+              ></el-table-column>
+              <el-table-column
+                  label="政策编号"
+                  align="center"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" style="color: #409eff;cursor: pointer">{{ scope.row.lawsNumber }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="lawsName"
+                  label="政策名称"
+                  align="center">
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="issueTime"
+                  label="发布日期"
+                  align="center">
+                <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
+              </el-table-column>
+              <el-table-column
+                  prop="textStatus"
+                  label="政策状态"
+                  align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.standStatusShow }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="80">
+                <template slot-scope="scope">
+                  <el-button
+                      class="opera-btn"
+                      size="mini"
+                      type="primary"
+                      @click="handlePreview(scope.row)">查看
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+              :page="standardSearchForm.page"
+              :total="standardSearchForm.total"
+              @pageChange="handleStandardPageChange"
+              @pageSizeChange="handleStandardPageSizeChange"></pagination>
+          <loading :loading="loadSarStandard">数据获取中</loading>
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+<!--        <el-button-->
+<!--            round-->
+<!--            class="common-button-primary"-->
+<!--            icon="el-icon-check"-->
+<!--            type="primary"-->
+<!--            @click="handleProcessStandardNext(1)">新增-->
+<!--        </el-button>-->
+        <el-button
+            round
+            class="common-button-primary"
+            icon="el-icon-check"
+            type="primary"
+            @click="handleProcessStandardNext(2)">带入
+        </el-button>
+        <el-button
+            round
+            class="common-button-default"
+            icon="el-icon-close"
+            @click="handleProcessStandardNext(3)">取消
+        </el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -190,11 +339,34 @@ export default {
   },
   data() {
     return {
+      tableHeight: {
+        standardTableHeight: null
+      },
+      tableData: {
+        // 标准表格数据
+        standardData: [],
+        // 任务分解单数据
+        taskTableData: []
+      },
+      loadSarStandard: false,
+      lawsTextStateOptions: [],
+      standardDrawer: false,
+      standardSearchForm: {
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        standSort: '',
+        standName: '',
+        standEnName: '',
+        standNumber: ''
+      },
       isSubmit: false,
       active: "1", //默认显示基础信息页面
       // 基础信息form表单
       form: {
-        cid: '', // 政策编号
+        lawsNumber: '', // 政策编号
+        lawsName: "", // 政策名称
         endTime: '', // 责任部门领导审批 截止时间
         cycleTime: '',//政策征求意见周期
         cname: '', // 名称
@@ -205,9 +377,12 @@ export default {
         fjListId: ''
       },
       formRules: {
-        cid: [
+        lawsNumber: [
           {required: true, message: '请输入政策编号', trigger: 'change'},
         ],
+        lawsName: [
+          {required: true, message: '请输入政策名称', trigger: 'change'},
+        ],
         endTime: [
           {required: true, message: '请选择截止时间', trigger: 'change'},
         ],
@@ -230,18 +405,18 @@ export default {
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,//发起人
         startUser: this.$store.getters.userInfo.userId,
-        responseDockerId:"",//责任对接人
-        responseDockerName:"",
-        responseUserId:"",//责任人
-        responseUserName:"",
-        lawsProveEngineerId:"",//法规认证工程师
-        lawsProveEngineerName:"",
-        lawsProveMinisterId:"",//法规认证部部长
-        lawsProveMinisterName:"",
-        lawsProveViceChiefId:"",//法规认证部副总监
-        lawsProveViceChiefName:"",
-        lawsProveChiefId:"",//法规认证部总监
-        lawsProveChiefName:"",
+        responseDockerId: "",//责任对接人
+        responseDockerName: "",
+        responseUserId: "",//责任人
+        responseUserName: "",
+        lawsProveEngineerId: "",//法规认证工程师
+        lawsProveEngineerName: "",
+        lawsProveMinisterId: "",//法规认证部部长
+        lawsProveMinisterName: "",
+        lawsProveViceChiefId: "",//法规认证部副总监
+        lawsProveViceChiefName: "",
+        lawsProveChiefId: "",//法规认证部总监
+        lawsProveChiefName: "",
       },
       // 角色验证
       roleFormRules: {
@@ -269,6 +444,134 @@ export default {
     }
   },
   methods: {
+    handleProcessStandardNext(status) {
+      switch (status) {
+          // 新增
+        case 1:
+          this.selectedList = []
+          this.standardCheckedList = []
+          this.standardDrawer = false
+          this.verifySarStandard = true
+          this.clearFormData(this.form)
+          break
+          // 带入
+        case 2:
+          if (this.standardCheckedList.length === 1) {
+            this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+              _this: this
+            }, res => {
+              if (res && res.data) {
+                const bringData = res.data
+
+                const json = Object.assign(bringData, bringData.attrInfoMap);
+                this.form = JSON.parse(JSON.stringify(json))
+                this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
+                this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : []
+                this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : []
+                this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
+                this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
+                this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
+                this.form.prcNum = this.prcNum
+                this.form.prcName = this.prcName
+                this.form['id'] = bringData.id
+                this.standardDrawer = false
+                this.verifySarStandard = true
+                this.busVsFunc()
+                this.modelFunc()
+                this.$forceUpdate()
+              }
+              // 遍历对象初始化文件信息
+              for (const p in this.form) {
+                if (typeof (this.form[p]) != "function") {
+                  this.initializeFileList(p, this.form[p]);
+                }
+              }
+              console.log("res", res);
+            })
+
+          } else if (this.standardCheckedList.length > 1) {
+            this.$message.warning('最多可以带入一条政策信息')
+          } else {
+            this.$message.warning('请选择要带入的政策信息')
+          }
+          break
+          // 取消
+        case 3:
+          this.selectedList = []
+          this.standardCheckedList = []
+          this.standardDrawer = false
+          break
+      }
+    },
+    handleStandardPageChange(page) {
+      this.standardSearchForm.page = page
+      this.handleSearchStandard()
+    },
+    handleStandardPageSizeChange(pageSize) {
+      this.standardSearchForm.pageSize = pageSize
+      this.handleSearchStandard()
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherLawsStandDetails',
+        params: {
+          id: item.id,
+          pageType: 'LAWS_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    standSelectChange(data) {
+      this.selectedList = []
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id)
+      }
+      this.standardCheckedList = data
+    },
+    //清空搜索条件
+    handleResetSearch() {
+      this.standardSearchForm.lawsNumber = ''
+      this.standardSearchForm.lawsName = ''
+      this.standardSearchForm.standType = 'INLAND'
+      this.standardSearchForm.standNumber = ''
+      this.standardSearchForm.standSort = ''
+      this.standardSearchForm.standName = ''
+      this.standardSearchForm.standEnName = ''
+      setTimeout(() => {
+        this.handleSearchStandard()
+      }, 100)
+    },
+    /**
+     * 关闭修订 Drawer 的监听
+     * @param done
+     */
+    handleReviseDrawerClose(done) {
+      done()
+    },
+    getDomesticStandardTable() {
+      this.loadSarStandard = true
+      this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => {
+        this.loadSarStandard = false
+        if (res.ok) {
+          this.tableData.standardData = res.data.list
+          this.standardSearchForm.total = res.data.count
+        }
+      }, e => {
+        this.loadSarStandard = false
+      })
+    },
+    handleSearchStandard() {
+      this.standardDrawer = true
+      this.$nextTick(() => {
+        // 动态设置表格高度
+        this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+        window.onresize = () => {
+          this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+        }
+      })
+      this.getDomesticStandardTable()
+    },
     //基础信息/人员信息
     handleTabs(type) {
       this.active = type;
@@ -286,24 +589,19 @@ export default {
       if (this.type === "responseDockerId") {
         this.roleForm.responseDockerId = data[0].id;
         this.roleForm.responseDockerName = data[0].name;
-      }
-      else if(this.type === "responseUserId"){
+      } else if (this.type === "responseUserId") {
         this.roleForm.responseUserId = data[0].id;
         this.roleForm.responseUserName = data[0].name;
-      }
-      else if(this.type === "lawsProveEngineerId"){
+      } else if (this.type === "lawsProveEngineerId") {
         this.roleForm.lawsProveEngineerId = data[0].id;
         this.roleForm.lawsProveEngineerName = data[0].name;
-      }
-      else if(this.type === "lawsProveMinisterId"){
+      } else if (this.type === "lawsProveMinisterId") {
         this.roleForm.lawsProveMinisterId = data[0].id;
         this.roleForm.lawsProveMinisterName = data[0].name;
-      }
-      else if(this.type === "lawsProveViceChiefId"){
+      } else if (this.type === "lawsProveViceChiefId") {
         this.roleForm.lawsProveViceChiefId = data[0].id;
         this.roleForm.lawsProveViceChiefName = data[0].name;
-      }
-      else if(this.type === "lawsProveChiefId"){
+      } else if (this.type === "lawsProveChiefId") {
         this.roleForm.lawsProveChiefId = data[0].id;
         this.roleForm.lawsProveChiefName = data[0].name;
       }
@@ -340,9 +638,10 @@ export default {
               this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
                 type: 'laws2'
-              }, {}, res => {
+              }, {_this: this}, res => {
                 if (res.ok) {
                   var json = Object.assign(this.form, this.roleForm)
+                  console.log('644',json)
                   json.commentText = this.commentText
                   json.filesId = this.addFjList
                   json.filesName = this.form.fjListName
@@ -350,7 +649,7 @@ export default {
                     json: JSON.stringify(json),
                     taskId: res.data,
                     userId: this.$store.getters.userInfo.userId
-                  }, {}, res => {
+                  }, {_this: this}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
                       this.$router.push('/processCenter')
@@ -450,5 +749,31 @@ export default {
       }
     }
   }
+  .standard-content {
+    height: 100%;
+    padding: 10px 0 0;
+    .content {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 10px;
+      .standard-table-wrap {
+        flex: auto;
+        overflow-y: auto;
+      }
+      .pagination {
+        position: static;
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
+      }
+      .search-area {
+        display: flex;
+        justify-content: left;
+        background: #FFF;
+        padding: 10px 10px 0;
+      }
+    }
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/zczqyj/step2.vue

@@ -23,14 +23,22 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="政策编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
-                      v-model="form.cid"
+                      v-model="form.lawsNumber"
                       placeholder="请输入政策编号"
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.responUserList"
@@ -168,13 +176,14 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 政策编号
+        lawsNumber: "", // 政策编号
+        lawsName: "", // 政策名称
         endTime: "", // 责任部门领导审批 截止时间
         cname: "", // 名称
         fjList: [],
         fjListId: '',
         responUserList: "",
-        responUserListName: ""
+        responUserListName: "",
       },
       formRules: {
         responUserList: [
@@ -234,6 +243,20 @@ export default {
     checkedRole2(data) {
       var idList = "";
       var nameList = "";
+      var responUserAndInstitutionNameMap = "";
+      console.log('246',data)
+
+      //用来给后端传选择的责任人和对应的提出部门↓
+      data.forEach(item => {
+        responUserAndInstitutionNameMap += "{\"" + item.id + "\":\"" + item.institutionName + "\"}" + ",";
+      });
+      responUserAndInstitutionNameMap = "[" + responUserAndInstitutionNameMap;
+      responUserAndInstitutionNameMap = responUserAndInstitutionNameMap.substring(0, responUserAndInstitutionNameMap.length - 1)
+      responUserAndInstitutionNameMap = responUserAndInstitutionNameMap + "]";
+      this.form.responUserAndInstitutionNameMap = responUserAndInstitutionNameMap;
+      console.log('260',this.form.responUserAndInstitutionNameMap)
+      //用来给后端传选择的责任人和对应的提出部门↑
+
       data.forEach(item => {
         if (nameList.length > 0) {
           nameList += ",";
@@ -284,6 +307,8 @@ export default {
           json.responUserList = this.form.responUserList;
           json.responUserListName = this.form.responUserListName;
           json.introduce = false;
+          //给后端用来判断人的map
+          json.responUserAndInstitutionNameMap = this.form.responUserAndInstitutionNameMap;
           this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
             taskId: this.taskIds,
@@ -307,7 +332,9 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
+          console.log('335',data)
+          this.form.lawsNumber = data.lawsNumber
+          this.form.lawsName = data.lawsName
           this.form.endTime = data.endTime
           this.form.cname = data.cname
           this.form.fjList = data.fjList

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

@@ -23,14 +23,22 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="政策编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
-                      v-model="form.cid"
+                      v-model="form.lawsNumber"
                       placeholder="请输入政策编号"
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -57,6 +65,7 @@
             :data="data"
             tooltip-effect="dark"
             border
+            height="330px"
             style="width: 100%; flex: auto;"
             class="drag-table"
             :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -113,11 +122,11 @@
               </template>
             </el-table-column>
             <el-table-column
-                prop="updateReason"
+                prop="changeReason"
                 align="center"
                 label="修改理由">
               <template slot-scope="scope">
-                <el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
+                <el-input style="margin: 10px 0;" v-model="scope.row.changeReason"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
@@ -264,9 +273,11 @@ export default {
       acceptShow: false,
       saveLoading: false,
       form: {
-        cid: '', // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: '', // 结束日期
         cname: '', // 名称
+        department: '',//提出部门
         fjList: [],
         fjListId: '',
       },
@@ -364,11 +375,12 @@ export default {
         commentText: '',
         oldText: '',
         newText: '',
+        changeReason: '',
         reason: '',
+        department: '',
         id: id,
         responUserName: this.$store.getters.userInfo.userName,
         responUser: this.$store.getters.userInfo.userId,
-        department: this.$store.getters.userInfo.orgName
       }
       this.data.push(json)
     },
@@ -439,7 +451,10 @@ export default {
           json.commentText = this.commentText
           json.info = this.data
           json.form = this.form
-          json.department = this.$store.getters.userInfo.orgName
+          for (let i = 0; i < json.info.length; i++) {
+            json.info[i].department = this.form.department
+          }
+
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
             taskId: this.taskIds,
@@ -475,11 +490,16 @@ export default {
           }
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime
+          this.form.department = data.department
           this.todoId = res.id
           this.json = data
           this.data = data.info || data.data || data.form.data || []
+          for (let i = 0; i < this.data.length; i++) {
+            this.data[i].department = data.department
+          }
         }).catch(e => {
         })
       })

src/pages/processCenter/pages/creatProcess/zczqyj/step4.vue

@@ -23,14 +23,22 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="政策编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
-                    v-model="form.cid"
+                    v-model="form.lawsNumber"
                     placeholder="请输入政策编号"
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -82,7 +90,7 @@
               label="修改后">
             </el-table-column>
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
             </el-table-column>
@@ -92,9 +100,6 @@
               align="center"
               label="原因"
               width="200px">
-<!--            <template slot-scope="scope">-->
-<!--              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>-->
-<!--            </template>-->
           </el-table-column>
           <el-table-column
             prop="department"
@@ -237,7 +242,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: '', // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: '', // 结束日期
         cname: '', // 名称
         fjList: [],
@@ -355,7 +361,8 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime
           this.form.cname = data.cname || data.form.cname
           this.json = data
@@ -370,7 +377,8 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item));
-        this.form.cid = item.form.cid
+        this.form.lawsNumber = item.form.lawsNumber
+        this.form.lawsName = item.form.lawsName
       });
     },
   },

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

@@ -24,14 +24,22 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="政策编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
-                    v-model="form.cid"
+                    v-model="form.lawsNumber"
                     placeholder="请输入政策编号"
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
+                  ></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -39,18 +47,6 @@
         <ProcessTitle>
           <template slot="title">征求意见列表</template>
         </ProcessTitle>
-<!--        <div class="button-list">-->
-<!--          <el-button type="primary"-->
-<!--                     class="common-button-primary add-button"-->
-<!--                     @click="upload(data, '汇总单.xls')"-->
-<!--                     size="mini">生成汇总单-->
-<!--          </el-button>-->
-<!--          <el-button type="primary"-->
-<!--                     class="common-button-primary add-button"-->
-<!--                     @click="upload(oldData, '上报意见.xls')"-->
-<!--                     size="mini">生成上报意见-->
-<!--          </el-button>-->
-<!--        </div>-->
         <div class="button-list">
           <el-button type="primary"
                      class="common-button-primary add-button"
@@ -58,22 +54,16 @@
                      @click="addModal"
                      size="mini">新增
           </el-button>
-<!--          <el-button type="primary"-->
-<!--                     class="common-button-primary add-button"-->
-<!--                     :disabled="acceptShow"-->
-<!--                     @click="addDelete"-->
-<!--                     size="mini">删除-->
-<!--          </el-button>-->
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                     size="mini">生成汇总单
-          </el-button>
-          <el-button type="primary"
-                     class="common-button-primary add-button"
-                     @click="upload(oldData, '上报意见.xls')"
-                     size="mini">生成上报意见
+                     size="mini">导出Excel
           </el-button>
+<!--          <el-button type="primary"-->
+<!--                     class="common-button-primary add-button"-->
+<!--                     @click="upload(oldData, '上报意见.xls')"-->
+<!--                     size="mini">导出Word-->
+<!--          </el-button>-->
         </div>
         <el-table
           ref="multipleTable"
@@ -97,42 +87,77 @@
             sortable
             label="章条编号"
             width="101px">
+            <template slot-scope="scope">
+              <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.chapterNumber" v-if="changeFlag && scope.row.chapterNumber === ''"></el-input>
+              <el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterNumber" v-else-if="changeFlag && scope.row.addFlag"></el-input>
+              <el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterNumber" v-else-if="changeFlag && !scope.row.addFlag" readonly></el-input>
+              <el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber" v-else readonly></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="chapterName"
             align="center"
             width="200px"
             label="章节名称">
+            <template slot-scope="scope">
+              <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.chapterName" v-if="changeFlag && scope.row.chapterName === ''"></el-input>
+              <el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterName" v-else-if="changeFlag && scope.row.addFlag"></el-input>
+              <el-input style="margin: 10px 0;background-color: orange" v-model="scope.row.chapterName" v-else-if="changeFlag && !scope.row.addFlag" readonly></el-input>
+              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName" v-else readonly></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="commentText"
             align="center"
             label="修改意见内容（包括理由或依据）">
+
             <el-table-column
               prop="oldText"
               align="center"
               label="修改前">
+              <template slot-scope="scope">
+                <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.oldText" v-if="changeFlag && scope.row.oldText === ''"></el-input>
+                <el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.oldText" v-else-if="changeFlag"></el-input>
+                <el-input style="margin: 10px 0;" v-model="scope.row.oldText" v-else readonly></el-input>
+              </template>
             </el-table-column>
+
             <el-table-column
               prop="newText"
               align="center"
               label="修改后">
+              <template slot-scope="scope">
+                <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.newText" v-if="changeFlag && scope.row.newText === ''"></el-input>
+                <el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.newText" v-else-if="changeFlag"></el-input>
+                <el-input style="margin: 10px 0;" v-model="scope.row.newText" v-else readonly></el-input>
+              </template>
             </el-table-column>
+
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
+              <template slot-scope="scope">
+                <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.changeReason" v-if="changeFlag && scope.row.changeReason === ''"></el-input>
+                <el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.changeReason" v-else-if="changeFlag"></el-input>
+                <el-input style="margin: 10px 0;" v-model="scope.row.changeReason" v-else readonly></el-input>
+              </template>
             </el-table-column>
+
           </el-table-column>
+
           <el-table-column
               prop="reason"
               align="center"
               label="原因"
               width="200px">
             <template slot-scope="scope">
-              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
+              <el-input style="margin: 10px 0;background-color: red" v-model="scope.row.reason" v-if="changeFlag && scope.row.reason === ''"></el-input>
+              <el-input style="margin: 10px 0;background-color: #409eff" v-model="scope.row.reason" v-else-if="changeFlag"></el-input>
+              <el-input style="margin: 10px 0;" v-model="scope.row.reason" v-else readonly></el-input>
             </template>
           </el-table-column>
+
           <el-table-column
             prop="department"
             align="center"
@@ -146,14 +171,16 @@
           <el-table-column
             prop="operation"
             align="center"
+            width="150px"
             label="操作">
             <template slot-scope="scope">
               <el-button type="primary"
                          class="common-button-primary add-button"
-                         size="mini">修订</el-button>
+                         @click="changeOpinion"
+                         size="mini">{{changeFlag?'完成':'修订'}}</el-button>
               <el-button type="primary"
                          class="common-button-primary add-button"
-                         @click="addDelete"
+                         @click="addDelete(scope.$index, scope.row)"
                          size="mini">删除</el-button>
               <div>{{ stateText(scope.row.state) }}</div>
             </template>
@@ -267,6 +294,8 @@ export default {
   name: "zczqyjStep5",
   data() {
     return {
+      //修订的标志
+      changeFlag:false,
       acceptShow: false,
       drawerModal: false,
       histortData: [],
@@ -294,7 +323,9 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
+        department: '',//提出部门
         endTime: "", // 结束日期
         cname: "", // 名称
         fjList: [],
@@ -314,10 +345,33 @@ export default {
     ProcessTitle
   },
   methods: {
-    addDelete() {
-      this.data.splice(1, 1)
+    changeOpinion() {
+      this.changeFlag = !this.changeFlag
+    },
+    addDelete(index, row) {
+      console.log('362',index, row);
+      this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.data.splice(index, 1)
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+      console.log('379',this.data)
+
     },
     addModal() {
+      console.log('318',this.form.form.department)
+      this.changeFlag = true
       var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
       var json = {
         chapterNumber: '',
@@ -325,13 +379,16 @@ export default {
         commentText: '',
         oldText: '',
         newText: '',
+        changeReason: '',
         reason: '',
+        department: this.form.form.department,
         id: id,
         responUserName: this.$store.getters.userInfo.userName,
         responUser: this.$store.getters.userInfo.userId,
-        department: this.$store.getters.userInfo.orgName
+        addFlag:true,
+        // department: this.$store.getters.userInfo.orgName
       }
-      this.data.push(json)
+      this.data.unshift(json)
     },
       handleTransfer() {
           this.drawerModal = true
@@ -389,24 +446,15 @@ export default {
           commentText: "修改意见内容（包括理由或依据）",
           oldText: "修改前",
           newText: "修改后",
-          reason: "修改理由",
+          changeReason: "修改理由",
+          reason:"原因",
           department: "提出部门",
           responUserName: "提出人",
-          stateText: "处理意见"
         },
         dataList: []
       };
       params.dataList = JSON.parse(JSON.stringify(row));
-      params.dataList.forEach(item => {
-        if (item.state === "1") {
-          item.stateText = "上报";
-        } else if (item.state === "2") {
-          item.stateText = "处理后上报";
-        } else {
-          item.stateText = "不上报";
-        }
-      });
-      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+      this.$http.downloadFile("/api/policy/activiti/exportExcel", params, title, res => {
       });
     },
     handleTabs(name) {
@@ -416,12 +464,14 @@ export default {
     },
     handleSubmit() {
       if (this.data.length < 1) {
-        this.$message.warning("请输入征求意见搞");
+        this.$message.warning("请输入征求意见稿");
       } else {
         this.isSubmit = true;
         var json = this.json;
         json.actionFlag = 0;
         json.commentText = this.commentText;
+        json.info = this.data
+        json.form = this.form
         this.$http.post("lawss/activiti/completeTask", {
           json: JSON.stringify(json),
           taskId: this.taskIds,
@@ -462,10 +512,19 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
           let data = JSON.parse(res.mesg);
+          this.form.department = data.form.department
+          console.log(this.form.department,'517')
+          // 给后端的选人信息
+          this.form.responUserAndInstitutionNameMap = data.form.responUserAndInstitutionNameMap
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid;
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.info))
@@ -475,13 +534,26 @@ export default {
               arr.push(item)
             }
           })
+          // for (let i = 0; i < this.data.length; i++) {
+          //   this.data[i].department = data.department
+          // }
           this.json = data
           this.data = arr
           this.oldData = data.oldinfo
         }).catch(e => {
         });
       });
-    }
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.form = JSON.parse(JSON.stringify(item));
+        this.form.lawsNumber = item.form.lawsNumber
+        this.form.lawsName = item.form.lawsName
+      });
+    },
   },
   mounted() {
     this.getHistoryData();

src/pages/processCenter/pages/creatProcess/zczqyj/step6.vue

@@ -23,12 +23,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    disabled
-                    v-model="form.cid"
-                    placeholder="请输入标准编号"
-                    clearable
+                      disabled
+                      v-model="form.lawsNumber"
+                      placeholder="请输入政策编号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -82,7 +90,7 @@
               label="修改后">
             </el-table-column>
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
             </el-table-column>
@@ -92,9 +100,6 @@
               align="center"
               label="原因"
               width="200px">
-            <template slot-scope="scope">
-              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
-            </template>
           </el-table-column>
           <el-table-column
             prop="department"
@@ -106,14 +111,14 @@
             align="center"
             label="提出人">
           </el-table-column>
-          <el-table-column
-            prop="dealComment"
-            align="center"
-            label="处理意见">
-            <template slot-scope="scope">
-              <div>{{ stateText(scope.row.state) }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="dealComment"-->
+<!--            align="center"-->
+<!--            label="处理意见">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>{{ stateText(scope.row.state) }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: "", // 结束日期
         cname: "", // 名称
         fjList: [],
@@ -395,7 +401,8 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid;
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.info))

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

@@ -23,12 +23,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    disabled
-                    v-model="form.cid"
-                    placeholder="请输入标准编号"
-                    clearable
+                      disabled
+                      v-model="form.lawsNumber"
+                      placeholder="请输入政策编号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -82,7 +90,7 @@
               label="修改后">
             </el-table-column>
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
             </el-table-column>
@@ -92,9 +100,6 @@
               align="center"
               label="原因"
               width="200px">
-            <template slot-scope="scope">
-              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
-            </template>
           </el-table-column>
           <el-table-column
             prop="department"
@@ -106,14 +111,14 @@
             align="center"
             label="提出人">
           </el-table-column>
-          <el-table-column
-            prop="dealComment"
-            align="center"
-            label="处理意见">
-            <template slot-scope="scope">
-              <div>{{ stateText(scope.row.state) }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="dealComment"-->
+<!--            align="center"-->
+<!--            label="处理意见">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>{{ stateText(scope.row.state) }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: "", // 结束日期
         cname: "", // 名称
         fjList: [],
@@ -395,7 +401,8 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid;
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.info))

src/pages/processCenter/pages/creatProcess/zczqyj/step8.vue

@@ -23,12 +23,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    disabled
-                    v-model="form.cid"
-                    placeholder="请输入标准编号"
-                    clearable
+                      disabled
+                      v-model="form.lawsNumber"
+                      placeholder="请输入政策编号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -82,7 +90,7 @@
               label="修改后">
             </el-table-column>
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
             </el-table-column>
@@ -92,9 +100,6 @@
               align="center"
               label="原因"
               width="200px">
-            <template slot-scope="scope">
-              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
-            </template>
           </el-table-column>
           <el-table-column
             prop="department"
@@ -106,14 +111,14 @@
             align="center"
             label="提出人">
           </el-table-column>
-          <el-table-column
-            prop="dealComment"
-            align="center"
-            label="处理意见">
-            <template slot-scope="scope">
-              <div>{{ stateText(scope.row.state) }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="dealComment"-->
+<!--            align="center"-->
+<!--            label="处理意见">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>{{ stateText(scope.row.state) }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: "", // 结束日期
         cname: "", // 名称
         fjList: [],
@@ -395,7 +401,8 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid;
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.info))

src/pages/processCenter/pages/creatProcess/zczqyj/step9.vue

@@ -23,12 +23,20 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    disabled
-                    v-model="form.cid"
-                    placeholder="请输入标准编号"
-                    clearable
+                      disabled
+                      v-model="form.lawsNumber"
+                      placeholder="请输入政策编号"
+                      clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.lawsName"
+                      placeholder="请输入政策名称"
+                      clearable
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -82,7 +90,7 @@
               label="修改后">
             </el-table-column>
             <el-table-column
-              prop="updateReason"
+              prop="changeReason"
               align="center"
               label="修改理由">
             </el-table-column>
@@ -92,9 +100,6 @@
               align="center"
               label="原因"
               width="200px">
-            <template slot-scope="scope">
-              <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
-            </template>
           </el-table-column>
           <el-table-column
             prop="department"
@@ -106,14 +111,14 @@
             align="center"
             label="提出人">
           </el-table-column>
-          <el-table-column
-            prop="dealComment"
-            align="center"
-            label="处理意见">
-            <template slot-scope="scope">
-              <div>{{ stateText(scope.row.state) }}</div>
-            </template>
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="dealComment"-->
+<!--            align="center"-->
+<!--            label="处理意见">-->
+<!--            <template slot-scope="scope">-->
+<!--              <div>{{ stateText(scope.row.state) }}</div>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
       <el-collapse accordion>
@@ -246,7 +251,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       form: {
-        cid: "", // 编号
+        lawsNumber: '', // 政策编号
+        lawsName: '', // 政策名称
         endTime: "", // 结束日期
         cname: "", // 名称
         fjList: [],
@@ -395,7 +401,8 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.fjList = data.fjList || data.form.fjList
           this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cid = data.cid || data.form.cid;
+          this.form.lawsNumber = data.lawsNumber || data.form.lawsNumber
+          this.form.lawsName = data.lawsName || data.form.lawsName
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.cname = data.cname || data.form.cname;
           this.oldData = JSON.parse(JSON.stringify(data.info))

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -1510,16 +1510,29 @@ export default {
 
           break
         case '22':
-          this.$router.push({
+          if (row.taskInfo === '参会人上传会议资料，填写标准及议题') {
+            this.$router.push({
+              name: 'bzhhStep1',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else {
+            this.$router.push({
             name: 'bzhhStep2',
-            query:{
-              taskIds: row.taskIds,
-              prcId: row.prcId,
-              prcNum: row.prcNum,
-              prcName: row.prcName,
-              prcType: row.prcType
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
             }
           })
+        }
           break
       }
     },

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -518,6 +518,16 @@ export default {
             }
           })
           break
+        case '22':
+          this.$router.push({
+            name: 'bzhhStep1',
+            query: {
+              type: '22',
+              processName: '外部标准化会后管理流程',
+              bpnId: id
+            }
+          })
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),