From cd4d9c4c8db6e85fa0e73db277c0f7d93ac97f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 17 Oct 2023 17:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=94=BF=E7=AD=96=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/roleTree/index.vue             | 296 +++++++-------
 .../pages/components/ProcessFooter.vue        |  20 +
 .../components/addModel.vue                   |  19 +-
 .../components/personnelInformation.vue       | 183 +++++----
 .../components/solicitationList.vue           |  76 +++-
 .../creatProcess/policyConsultation/index.vue | 373 ++++++++++++++----
 6 files changed, 670 insertions(+), 297 deletions(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 8382c090f..1a9e86cc1 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -1,12 +1,13 @@
 <template>
     <div class="roleTree">
         <el-drawer
-            :title="isTitle"
-            :visible.sync="visible"
-            :wrapperClosable="false"
-            @close="handleTreeDrawerCancel"
-            append-to-body
-            size="460px">
+                :title="isTitle"
+                v-if="visible"
+                :visible.sync="visible"
+                :wrapperClosable="false"
+                @close="handleTreeDrawerCancel"
+                append-to-body
+                size="460px">
             <el-form
                     ref="attributeEO"
                     class="label-input-form"
@@ -15,16 +16,16 @@
             >
                 <el-form-item class="form-item-disabled" style="margin: 10px;">
                     <el-input
-                      v-model="filterText"
-                      placeholder="请输入姓名"
-                      @keyup.enter.native="searchChange"
+                            v-model="filterText"
+                            placeholder="请输入姓名"
+                            @keyup.enter.native="searchChange"
                     ></el-input>
                 </el-form-item>
-              <el-form-item class="form-item-disabled" style="margin-top: 10px;">
-                <el-button size="medium " type="primary" @click="searchChange">
-                  查询
-                </el-button>
-              </el-form-item>
+                <el-form-item class="form-item-disabled" style="margin-top: 10px;">
+                    <el-button size="medium " type="primary" @click="searchChange">
+                        查询
+                    </el-button>
+                </el-form-item>
             </el-form>
             <div class="divTree">
                 <!-- 当前tree展示全部人员 -->
@@ -72,7 +73,7 @@
                         ref="tree"
                         :lazy="false"
                         :key="treeKey"
-                        >
+                >
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                       <span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
                       <span> {{ node.label }} </span>
@@ -90,13 +91,19 @@
                             closable>
                         {{tag.name}}
                     </el-tag>
-                    <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>
+                    <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini"
+                            @close="handleCloseAll()">全部删除
+                    </el-tag>
                 </div>
             </div>
             <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="subLoading" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                           :loading="subLoading" @click="saveUserInfo">确定
+                </el-button>
 
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" :loading="subLoading" @click="handleTreeDrawerCancel">取消</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" :loading="subLoading"
+                           @click="handleTreeDrawerCancel">取消
+                </el-button>
             </div>
             <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
         </el-drawer>
@@ -104,15 +111,16 @@
 </template>
 
 <script>
-    function debounce(func, wait = 500){
+    function debounce(func, wait = 500) {
         let timeout;
-        return function(event){
+        return function (event) {
             clearTimeout(timeout)
-            timeout = setTimeout(()=>{
+            timeout = setTimeout(() => {
                 func.call(this, event)
-            },wait)
+            }, wait)
         }
     }
+
     export default {
         name: "roleTree",
         props: {
@@ -134,13 +142,13 @@
                 }
             },
             type: {
-              type: Number,
-              default: 0
+                type: Number,
+                default: 0
             }
         },
-        data () {
+        data() {
             return {
-                treeKey:1,
+                treeKey: 1,
                 defaultKey: [],//默认展开的节点的 key 的数组
                 visible: false,
                 selectList: [],
@@ -161,13 +169,13 @@
             }
         },
         methods: {
-           nameJoinAccount(treeData1){
-             treeData1.forEach(item=>{
-               if(item.account) item.name = `${item.name}(${item.account})`
-               if(item.children) this.nameJoinAccount(item.children)
-             })
-           },
-          handleClose (tag) {
+            nameJoinAccount(treeData1) {
+                treeData1.forEach(item => {
+                    if (item.account) item.name = `${item.name}(${item.account})`
+                    if (item.children) this.nameJoinAccount(item.children)
+                })
+            },
+            handleClose(tag) {
                 let arr = []
                 for (let a = 0; a < this.delList.length; a++) {
                     if (tag.id === this.delList[a].id) {
@@ -189,7 +197,7 @@
                     }
                 }
             },
-            handleCloseAll () {
+            handleCloseAll() {
                 this.$msgbox({
                     title: '提示',
                     message: '是否删除当前选中人员',
@@ -209,41 +217,41 @@
                     }
                 )
             },
-          searchChange(){
-              // 查询
-            if (this.filterText.length) {
-              this.open1 = false // 显示第二个tree
-              this.treeLoading = true
-              this.defaultKey = []
-              this.$http.get('SarInstitution/institution/getNextTwo', {
-                userName: this.filterText
-              }, {}, res => {
-                this.treeData1 = res
-                this.treeData1.forEach(item => {
-                  this.defaultKey.push(item.id)
-                })
-                this.nameJoinAccount(this.treeData1)
-                this.treeLoading = false
-              })
-              // this.treeKey++
+            searchChange() {
+                // 查询
+                if (this.filterText.length) {
+                    this.open1 = false // 显示第二个tree
+                    this.treeLoading = true
+                    this.defaultKey = []
+                    this.$http.get('SarInstitution/institution/getNextTwo', {
+                        userName: this.filterText
+                    }, {}, res => {
+                        this.treeData1 = res
+                        this.treeData1.forEach(item => {
+                            this.defaultKey.push(item.id)
+                        })
+                        this.nameJoinAccount(this.treeData1)
+                        this.treeLoading = false
+                    })
+                    // this.treeKey++
 
 
-              // this.$http.get('SarInstitution/institution/institutionAndUser', {
-              //   userName: this.filterText
-              // }, {}, res => {
-              //   this.treeData1 = res.data
-              //   this.treeData1.forEach(item => {
-              //     this.defaultKey.push(item.id)
-              //   })
-              //   console.log(1);
-              //   this.getChildren()
-              //   this.treeLoading = false
-              // })
-            } else {
-              this.open1 = true
-            }
-          },
-            changeInput:debounce(function (val) {
+                    // this.$http.get('SarInstitution/institution/institutionAndUser', {
+                    //   userName: this.filterText
+                    // }, {}, res => {
+                    //   this.treeData1 = res.data
+                    //   this.treeData1.forEach(item => {
+                    //     this.defaultKey.push(item.id)
+                    //   })
+                    //   console.log(1);
+                    //   this.getChildren()
+                    //   this.treeLoading = false
+                    // })
+                } else {
+                    this.open1 = true
+                }
+            },
+            changeInput: debounce(function (val) {
                 if (val.length) {
                     this.open1 = false
                     this.treeLoading = true
@@ -257,28 +265,7 @@
                     this.open1 = true
                 }
             }),
-            checkChange2 (row, type, c) {
-                if (this.checkBox) {
-                } else {
-                    if (type) {
-                        this.nodeList2.push(row.id)
-                        this.delList.push(row)
-                    } else {
-                        for (let a = 0; a < this.nodeList2.length; a ++) {
-                            if (row.id === this.nodeList2[a]) {
-                                this.nodeList2.splice(a, 1)
-                            }
-                        }
-                        for (let b = 0; b < this.delList.length; b++) {
-                            if (row.id === this.delList[b].id) {
-                                this.delList.splice(b, 1)
-                            }
-                        }
-                    }
-                }
-            },
-            checkChange (row, type, c) {
-               //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点)
+            checkChange2(row, type, c) {
                 if (this.checkBox) {
                 } else {
                     if (type) {
@@ -298,14 +285,35 @@
                     }
                 }
             },
-            handleTreeDrawerCancel () {
+            checkChange(row, type, c) {
+                //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点)
+                if (this.checkBox) {
+                } else {
+                    if (type) {
+                        this.nodeList2.push(row.id)
+                        this.delList.push(row)
+                    } else {
+                        for (let a = 0; a < this.nodeList2.length; a++) {
+                            if (row.id === this.nodeList2[a]) {
+                                this.nodeList2.splice(a, 1)
+                            }
+                        }
+                        for (let b = 0; b < this.delList.length; b++) {
+                            if (row.id === this.delList[b].id) {
+                                this.delList.splice(b, 1)
+                            }
+                        }
+                    }
+                }
+            },
+            handleTreeDrawerCancel() {
                 this.filterText = ''
                 this.open1 = true
                 this.visible = false
             },
-            saveUserInfo () {
-                if(this.roleList.length === 0){
-                    this.roleList.push({id:"",name:""});
+            saveUserInfo() {
+                if (this.roleList.length === 0) {
+                    this.roleList.push({id: "", name: ""});
                 }
                 if (this.checkBox) {
                     this.$emit('checkedRole', this.roleList)
@@ -342,9 +350,9 @@
                 }
                 this.open1 = true
             },
-            drawerCheck (data) {
-              //当复选框被点击的时候触发
-              //共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
+            drawerCheck(data) {
+                //当复选框被点击的时候触发
+                //共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
                 if (this.checkBox) { // 单选
                     // 单选判断
                     let getlist = this.$refs.tree.getCheckedNodes()
@@ -361,31 +369,31 @@
                         this.delList = [data]
                     }
                 } else { // 多选
-                  if (this.roleList.length === 0) {
-                    this.roleList.push(data)
-                  } else {
-                    let delFlag = true
-                    this.roleList.forEach((item, index) => {
-                      if (item.id === data.id) {
-                        this.roleList.splice(index, 1)
-                        delFlag = false
-                      }
-                    })
-                    if (delFlag) {
-                      this.roleList.push(data)
+                    if (this.roleList.length === 0) {
+                        this.roleList.push(data)
+                    } else {
+                        let delFlag = true
+                        this.roleList.forEach((item, index) => {
+                            if (item.id === data.id) {
+                                this.roleList.splice(index, 1)
+                                delFlag = false
+                            }
+                        })
+                        if (delFlag) {
+                            this.roleList.push(data)
+                        }
                     }
-                  }
-                  //  this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
+                    //  this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
                 }
             },
             loadNode(node, resolve) {
-              //加载子树数据的方法，仅当 lazy 属性为true 时生效
+                //加载子树数据的方法，仅当 lazy 属性为true 时生效
                 if (node.level === 0) {
                     return resolve(this.treeData);
                 }
                 this.getChildren(node, resolve)
             },
-            getChildren (node, resolve) {
+            getChildren(node, resolve) {
                 this.$http.get('SarInstitution/institution/getNext', {
                     institutionId: node.key,
                     userName: this.filterText
@@ -393,18 +401,19 @@
                     resolve(res)
                 })
             },
-            getTree () {
+            getTree() {
                 this.treeLoading = true
-                this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> {
+                this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res => {
                     this.treeData = res
                     this.treeLoading = false
                 })
             }
         },
         watch: {
-            isVisible (val) {
+            isVisible(val) {
                 this.visible = val
                 if (val) {
+                    this.roleList = []
                     this.nodeList2 = this.nodeList
                     if (this.nodeList2.length && this.nodeList2[0].length) {
                         let ids = ''
@@ -434,7 +443,7 @@
                 this.$emit('update:isVisible', val)
             }
         },
-        mounted () {
+        mounted() {
             this.getTree()
         }
     }
@@ -445,12 +454,15 @@
         overflow: auto;
         height: calc(~'100% - 300px');
     }
+
     .divDel {
         border-top: 1px solid #000;
         height: 300px;
+
         .divDel_title {
             margin: 10px;
         }
+
         .divDel_box {
             height: 266px;
             padding: 0px 0 10px;
@@ -458,50 +470,59 @@
             flex-wrap: wrap;
             overflow: auto;
             margin: 10px;
-           align-content: flex-start;
+            align-content: flex-start;
+
             span {
                 margin: 0px 5px 5px 0;
             }
         }
     }
+
     /deep/ .icon-tree {
-  margin: 0 5px 0 10px;
-  position: relative;
-  background: url('~@/assets/images/shangqi/img/tree-add.png');
-  background-size: 100% 100%;
-}
-    /deep/.el-tree-node__content {
+        margin: 0 5px 0 10px;
+        position: relative;
+        background: url('~@/assets/images/shangqi/img/tree-add.png');
+        background-size: 100% 100%;
+    }
+
+    /deep/ .el-tree-node__content {
         padding-left: 0px !important;
     }
-    /deep/ .is-leaf{
-        background-image:none;
-        background-size:100% 100%;
+
+    /deep/ .is-leaf {
+        background-image: none;
+        background-size: 100% 100%;
     }
-    /deep/ .is-leaf-none{
+
+    /deep/ .is-leaf-none {
         position: relative;
         display: inline-block;
         width: 15px;
         height: 15px;
-        background:url('~@/assets/images/shangqi/img/personnel.png');
-        background-size:100% 100%;
+        background: url('~@/assets/images/shangqi/img/personnel.png');
+        background-size: 100% 100%;
     }
-    /deep/ .is-show{
+
+    /deep/ .is-show {
         position: relative;
         display: inline-block;
         width: 15px;
         height: 15px;
-        background:url('~@/assets/images/shangqi/img/mechanism.png');
-        background-size:100% 100%;
+        background: url('~@/assets/images/shangqi/img/mechanism.png');
+        background-size: 100% 100%;
     }
-    /deep/.tree-line{
+
+    /deep/ .tree-line {
         .el-tree-node {
             position: relative;
             padding-left: 0px; // 缩进量
             line-height: 30px;
         }
+
         .el-tree-node__children {
             padding-left: 16px; // 缩进量
         }
+
         // 竖线
         .el-tree-node::before {
             content: "";
@@ -513,10 +534,12 @@
             border-width: 1px;
             border-left: 1px dashed #858990e0;
         }
+
         // 当前层最后一个节点的竖线高度固定
         .el-tree-node:last-child::before {
             height: 38px; // 可以自己调节到合适数值
         }
+
         // 横线
         .el-tree-node::after {
             content: "";
@@ -528,18 +551,21 @@
             border-width: 1px;
             border-top: 1px dashed #858990e0;
         }
+
         // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
         & > .el-tree-node::after {
             border-top: none;
         }
+
         & > .el-tree-node::before {
             border-left: none;
         }
+
         // 展开关闭的icon
-        .el-tree-node__expand-icon{
+        .el-tree-node__expand-icon {
             font-size: 16px;
             // 叶子节点（无子节点）
-            &.is-leaf{
+            &.is-leaf {
                 color: transparent;
                 // display: none; // 也可以去掉
             }
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 3af8662b4..9c6cc2df1 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -115,6 +115,15 @@
               :loading="submitLoading"
               v-if="showOver2"
       >驳回</el-button>
+      <el-button
+              type="danger"
+              size="small"
+              class="common-button-danger"
+              icon="el-icon-close"
+              @click="rejectClick"
+              :loading="rejectLoading"
+              v-if="showReject"
+      >驳回</el-button>
       <el-button
         type="primary"
         size="mini"
@@ -351,6 +360,14 @@ export default {
       type: Boolean,
       default: false
     },
+    rejectLoading:{
+      type: Boolean,
+      default: false
+    },
+    showReject:{
+      type: Boolean,
+      default: false
+    },
     backBTNTexts: {
       type: String
     },
@@ -372,6 +389,9 @@ export default {
     }
   },
   methods: {
+    rejectClick(){
+      this.$emit('reject')
+    },
     handleOver() {
       this.$emit('over')
     },
diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue
index 9e28edd30..e3a87c159 100644
--- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue
@@ -73,12 +73,16 @@
                             </el-button>
                         </div>
                     </el-form-item>
-                    <el-form-item label="处理意见" prop="handlingSuggestion" label-width="150px" class="add-form-item">
+                    <el-form-item label="处理意见"
+                                  v-if="isHandlingSuggestion"
+                                  prop="handlingSuggestion" label-width="150px" class="add-form-item">
                         <el-input v-model.trim="sarStandardsInfoEO.handlingSuggestion"
                                   placeholder="请输入处理意见"
                                   clearable></el-input>
                     </el-form-item>
-                    <el-form-item label="原因" prop="reason" label-width="150px" class="add-form-item">
+                    <el-form-item label="原因" prop="reason"
+                                  v-if="isHandlingSuggestion"
+                                  label-width="150px" class="add-form-item">
                         <el-input v-model.trim="sarStandardsInfoEO.reason"
                                   placeholder="请输入原因"
                                   clearable></el-input>
@@ -177,8 +181,19 @@
                 fileName: '',
                 accept: '',
                 fileMax_M: 0,
+                taskKey: this.$route.query.taskKey,
             }
         },
+
+        computed: {
+            isHandlingSuggestion() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey12') {
+                    return true
+                }
+                return false
+            },
+        },
+
         methods: {
             handlePreview(file) {
                 let attId = ""
diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue
index a2c79e7d3..39e9c614b 100644
--- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue
@@ -23,151 +23,149 @@
                 <el-timeline-item timestamp="审核" placement="top"
                                   :color="roleForm.responseDockerId ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="responseDockerName" style="margin-bottom: 0">
+                        <el-form-item prop="shr1UserNames" style="margin-bottom: 0">
                             <h4>审核</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.responseDockerId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.shr1UserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.responseDockerName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.shr1UserNames" readonly
                                           placeholder="选择审核人"
-                                          @click.native="choicePeoPle('responseDockerId', '选择审核人', roleForm.responseDockerId,true)"></el-input>
+                                          @click.native="choicePeoPle('shr1UserIds', '选择审核人', roleForm.shr1UserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="审定" placement="top"
-                                  :color="roleForm.lawsProveEngineerId ? '#66b1ff' : ''">
+                                  :color="roleForm.sdr1UserIds ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveEngineerName" style="margin-bottom: 0">
+                        <el-form-item prop="sdr1UserNames" style="margin-bottom: 0">
                             <h4>审定</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveEngineerId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.sdr1UserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveEngineerName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.sdr1UserNames" readonly
                                           placeholder="选择审定人"
-                                          @click.native="choicePeoPle('lawsProveEngineerId', '选择审定人', roleForm.lawsProveEngineerId,true)"></el-input>
+                                          @click.native="choicePeoPle('sdr1UserIds', '选择审定人', roleForm.sdr1UserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="批准" placement="top"
-                                  :color="roleForm.lawsProveMinisterId ? '#66b1ff' : ''">
+                                  :color="roleForm.pzr1UserId ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveMinisterName" style="margin-bottom: 0">
+                        <el-form-item prop="pzr1UserName" style="margin-bottom: 0">
                             <h4>批准</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveMinisterId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.pzr1UserId"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveMinisterName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.pzr1UserName" readonly
                                           placeholder="选择批准人"
-                                          @click.native="choicePeoPle('lawsProveMinisterId', '选择批准人', roleForm.lawsProveMinisterId,false)"></el-input>
+                                          @click.native="choicePeoPle('pzr1UserId', '选择批准人', roleForm.pzr1UserId,true)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="责任对接人分配任务" placement="top"
-                                  :color="roleForm.lawsProveViceChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.djrUserIds ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveViceChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="djrUserNames" style="margin-bottom: 0">
                             <h4>责任对接人分配任务</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveViceChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.djrUserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveViceChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.djrUserNames" readonly
                                           placeholder="责任对接人分配任务"
-                                          @click.native="choicePeoPle('lawsProveViceChiefId', '责任对接人分配任务', roleForm.lawsProveViceChiefId,true)"></el-input>
+                                          @click.native="choicePeoPle('djrUserIds', '责任对接人分配任务', roleForm.djrUserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="管理员" placement="top"
-                                  :color="roleForm.lawsProveChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.glyUserId ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="glyUserName" style="margin-bottom: 0">
                             <h4>管理员</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.glyUserId"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.glyUserName" readonly
                                           placeholder="管理员"
-                                          @click.native="choicePeoPle('lawsProveChiefId', '管理员', roleForm.lawsProveChiefId,false)"></el-input>
+                                          @click.native="choicePeoPle('glyUserId', '管理员', roleForm.glyUserId,true)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="审核" placement="top"
-                                  :color="roleForm.lawsProveChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.shr2UserIds ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="shr2UserNames" style="margin-bottom: 0">
                             <h4>审核</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.shr2UserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.shr2UserNames" readonly
                                           placeholder="审核"
-                                          @click.native="choicePeoPle('lawsProveChiefId', '审核', roleForm.lawsProveChiefId,true)"></el-input>
+                                          @click.native="choicePeoPle('shr2UserIds', '审核', roleForm.shr2UserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="审定" placement="top"
-                                  :color="roleForm.lawsProveChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.sdr2UserIds ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="sdr2UserNames" style="margin-bottom: 0">
                             <h4>审定</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.sdr2UserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.sdr2UserNames" readonly
                                           placeholder="审定"
-                                          @click.native="choicePeoPle('lawsProveChiefId', '审定', roleForm.lawsProveChiefId,true)"></el-input>
+                                          @click.native="choicePeoPle('sdr2UserIds', '审定', roleForm.sdr2UserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="批准" placement="top"
-                                  :color="roleForm.lawsProveChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.pzr2UserId ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="pzr2UserName" style="margin-bottom: 0">
                             <h4>批准</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.pzr2UserId"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.pzr2UserName" readonly
                                           placeholder="批准"
-                                          @click.native="choicePeoPle('lawsProveChiefId', '批准', roleForm.lawsProveChiefId,false)"></el-input>
+                                          @click.native="choicePeoPle('pzr2UserId', '批准', roleForm.pzr2UserId,true)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
 
                 <el-timeline-item timestamp="抄送" placement="top"
-                                  :color="roleForm.lawsProveChiefId ? '#66b1ff' : ''">
+                                  :color="roleForm.csrUserIds ? '#66b1ff' : ''">
                     <el-card>
-                        <el-form-item prop="lawsProveChiefName" style="margin-bottom: 0">
+                        <el-form-item prop="csrUserNames" style="margin-bottom: 0">
                             <h4>抄送</h4>
                             <div style="margin-top: 10px;width: 300px;">
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefId"
+                                <el-input :disabled="disabledXX" v-model="roleForm.csrUserIds"
                                           style="display: none;"></el-input>
-                                <el-input :disabled="disabledXX" v-model="roleForm.lawsProveChiefName" readonly
+                                <el-input :disabled="disabledXX" v-model="roleForm.csrUserNames" readonly
                                           placeholder="抄送"
-                                          @click.native="choicePeoPle('lawsProveChiefId', '抄送', roleForm.lawsProveChiefId,true)"></el-input>
+                                          @click.native="choicePeoPle('csrUserIds', '抄送', roleForm.csrUserIds,false)"></el-input>
                             </div>
                         </el-form-item>
                     </el-card>
                 </el-timeline-item>
             </el-form>
         </el-timeline>
-        <Role-tree v-if="!disabledXX"
-                   check-box
-                   :is-title="drawerTitle"
+        <Role-tree :is-title="drawerTitle"
                    :is-visible.sync="modalshowflag"
                    @checkedRole="checkedRole"
                    :nodeList="nodeList"
@@ -184,23 +182,32 @@
                 roleForm: {},
                 // 角色验证
                 roleFormRules: {
-                    responseDockerName: [
-                        {required: true, message: "请选择责任对接人", trigger: "change"}
+                    shr1UserNames: [
+                        {required: true, message: "请选择审核人", trigger: "change"}
                     ],
-                    responseUserName: [
-                        {required: true, message: "请选择责任人", trigger: "change"}
+                    sdr1UserNames: [
+                        {required: true, message: "请选择审定人", trigger: "change"}
                     ],
-                    lawsProveEngineerName: [
-                        {required: true, message: "请选择法规认证工程师", trigger: "change"}
+                    pzr1UserName: [
+                        {required: true, message: "请选择批准人", trigger: "change"}
                     ],
-                    lawsProveMinisterName: [
-                        {required: true, message: "请选择法规认证部部长", trigger: "change"}
+                    djrUserNames: [
+                        {required: true, message: "请选择责任对接人分配任务", trigger: "change"}
                     ],
-                    lawsProveViceChiefName: [
-                        {required: true, message: "请选择法规认证部副总监", trigger: "change"}
+                    glyUserName: [
+                        {required: true, message: "请选择管理员", trigger: "change"}
                     ],
-                    lawsProveChiefName: [
-                        {required: true, message: "请选择法规认证部总监", trigger: "change"}
+                    shr2UserNames: [
+                        {required: true, message: "请选择审核人", trigger: "change"}
+                    ],
+                    sdr2UserNames: [
+                        {required: true, message: "请选择审定人", trigger: "change"}
+                    ],
+                    pzr2UserName: [
+                        {required: true, message: "请选择批准人", trigger: "change"}
+                    ],
+                    csrUserNames: [
+                        {required: true, message: "请选择抄送人", trigger: "change"}
                     ],
                 },
                 disabledXX: false,
@@ -219,32 +226,52 @@
             //选择人
             choicePeoPle(type, title, id, isTrue) {
                 this.nodeList = [];
-                this.nodeList.push(id);
+                let ids = id ? id.split(',') : []
+                this.nodeList = ids;
                 this.type = type;
                 this.drawerTitle = title;
                 this.checkBox = isTrue
+                console.log(this.nodeList);
                 this.modalshowflag = true;
             },
             //选择人
             checkedRole(data) {
-                if (this.type === "responseDockerId") {
-                    this.roleForm.responseDockerId = data[0].id;
-                    this.roleForm.responseDockerName = data[0].name;
-                } else if (this.type === "responseUserId") {
-                    this.roleForm.responseUserId = data[0].id;
-                    this.roleForm.responseUserName = data[0].name;
-                } else if (this.type === "lawsProveEngineerId") {
-                    this.roleForm.lawsProveEngineerId = data[0].id;
-                    this.roleForm.lawsProveEngineerName = data[0].name;
-                } else if (this.type === "lawsProveMinisterId") {
-                    this.roleForm.lawsProveMinisterId = data[0].id;
-                    this.roleForm.lawsProveMinisterName = data[0].name;
-                } else if (this.type === "lawsProveViceChiefId") {
-                    this.roleForm.lawsProveViceChiefId = data[0].id;
-                    this.roleForm.lawsProveViceChiefName = data[0].name;
-                } else if (this.type === "lawsProveChiefId") {
-                    this.roleForm.lawsProveChiefId = data[0].id;
-                    this.roleForm.lawsProveChiefName = data[0].name;
+                console.log(data);
+                let ids = []
+                let names = []
+                if (data && data.length > 0) {
+                    for (let i = 0; i < data.length; i++) {
+                        ids.push(data[i].id)
+                        names.push(data[i].name)
+                    }
+                }
+                if (this.type === "shr1UserIds") {
+                    this.roleForm.shr1UserIds = ids.join(',')
+                    this.roleForm.shr1UserNames = names.join(',');
+                } else if (this.type === "sdr1UserIds") {
+                    this.roleForm.sdr1UserIds = ids.join(',');
+                    this.roleForm.sdr1UserNames = names.join(',');
+                } else if (this.type === "pzr1UserId") {
+                    this.roleForm.pzr1UserId = ids.join(',');
+                    this.roleForm.pzr1UserName = names.join(',');
+                } else if (this.type === "djrUserIds") {
+                    this.roleForm.djrUserIds = ids.join(',');
+                    this.roleForm.djrUserNames = names.join(',');
+                } else if (this.type === "glyUserId") {
+                    this.roleForm.glyUserId = ids.join(',');
+                    this.roleForm.glyUserName = names.join(',');
+                } else if (this.type === "shr2UserIds") {
+                    this.roleForm.shr2UserIds = ids.join(',');
+                    this.roleForm.shr2UserNames = names.join(',');
+                } else if (this.type === "sdr2UserIds") {
+                    this.roleForm.sdr2UserIds = ids.join(',');
+                    this.roleForm.sdr2UserNames = names.join(',');
+                } else if (this.type === "pzr2UserId") {
+                    this.roleForm.pzr2UserId = ids.join(',');
+                    this.roleForm.pzr2UserName = names.join(',');
+                } else if (this.type === "csrUserIds") {
+                    this.roleForm.csrUserIds = ids.join(',');
+                    this.roleForm.csrUserNames = names.join(',');
                 }
                 this.roleForm = {...this.roleForm}
                 this.modalshowflag = false;
diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue
index 55d084548..67ba009c2 100644
--- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue
@@ -8,27 +8,32 @@
                     type="primary"
                     class="common-button-primary add-button"
                     @click="addModel"
+                    v-if="isNodeDisplay"
             ><i class="el-icon-plus"></i>新增
             </el-button>
             <el-button
                     class="common-button-primary add-button"
                     @click="batchDeleteModel"
+                    v-if="isNodeDisplay"
             ><i class="iconfont">&#xe61b;</i>批量删除
             </el-button>
             <el-button
                     type="primary"
+                    v-if="isGenerateSummary"
                     class="common-button-primary add-button"
                     @click="generateSummary"
             >生成汇总单
             </el-button>
             <el-button
                     type="primary"
+                    v-if="isGenerateSummary"
                     class="common-button-primary add-button"
                     @click="generateReportComments"
             >生成上报意见
             </el-button>
             <el-button
                     type="primary"
+                    v-if="isExport"
                     class="common-button-primary add-button"
                     @click="exportModel"
             >导出
@@ -47,6 +52,7 @@
             <el-table-column
                     type="selection"
                     width="55"
+                    v-if="showSelection"
                     align="center">
             </el-table-column>
             <el-table-column
@@ -92,25 +98,30 @@
                     label="附件"
                     align="center">
             </el-table-column>
+
             <el-table-column
+                    v-if="isPersonInCharge"
                     prop="personInCharge"
                     label="责任人"
                     show-overflow-tooltip
                     align="center">
             </el-table-column>
             <el-table-column
+                    v-if="isCompleteFlag"
                     prop="completeFlag"
                     label="提出部门"
                     show-overflow-tooltip
                     align="center">
             </el-table-column>
             <el-table-column
+                    v-if="isCompleteFlag"
                     prop="proposingDepartment"
                     label="提出人"
                     show-overflow-tooltip
                     align="center">
             </el-table-column>
             <el-table-column
+                    v-if="isCompleteFlag"
                     prop="handlingSuggestion"
                     label="处理意见"
                     show-overflow-tooltip
@@ -119,12 +130,14 @@
             <el-table-column
                     prop="reason"
                     label="原因"
+                    v-if="isCompleteFlag"
                     show-overflow-tooltip
                     align="center">
             </el-table-column>
             <el-table-column
                     label="操作"
                     width="70"
+                    v-if="isOperate"
                     align="center">
                 <template slot-scope="scope">
                     <div @click.stop style="display: inline-block">
@@ -162,18 +175,75 @@
                 addOrEdit: 'add',
                 editNum: 0,
                 selectList: [],
+                taskKey: this.$route.query.taskKey,
             }
         },
+        computed: {
+            isNodeDisplay() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey8' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey9') {
+                    return true
+                }
+                return false
+            },
+            isGenerateSummary() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey13' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey14' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey15') {
+                    return true
+                }
+                return false
+            },
+            isExport() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey12') {
+                    return true
+                }
+                return false
+            },
+            isPersonInCharge() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey9' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey10' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey11') {
+                    return true
+                }
+                return false
+            },
+            isCompleteFlag() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey12' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey13' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey14' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey15' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey16') {
+                    return true
+                }
+                return false
+            },
+            isOperate() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey8' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey9' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey12') {
+                    return true
+                }
+                return false
+            },
+            showSelection() {
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey8' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey9') {
+                    return true
+                }
+                return false
+            },
+        },
         mounted() {
         },
         methods: {
-            generateSummary(){
+            generateSummary() {
 
             },
-            generateReportComments(){
+            generateReportComments() {
 
             },
-            exportModel(){
+            exportModel() {
 
             },
             addModel() {
diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue
index 22f2cf1da..ce5d20b18 100644
--- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue
+++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue
@@ -6,8 +6,12 @@
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
-            <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+            <div class="headerTabsItem" v-if="showPersonnel" :class="active === '2' ? 'active' : ''"
+                 @click="handleTabs('2')">人员信息
+            </div>
+            <div class="headerTabsItem" v-if="showApprovalHistory"
+                 :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史
+            </div>
         </div>
         <div class="content" v-show="active === '1'">
             <div style="flex: auto; overflow: auto;">
@@ -24,14 +28,16 @@
                     <div class="prc-content-border">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="政策编号" prop="lawsNumber" class="add-form-item form-item-disabled">
+                                <el-form-item label="政策编号"
+                                              :prop="!disabledXX ? 'lawsNumber':''"
+                                              class="add-form-item form-item-disabled">
                                     <el-input :disabled="true"
                                               class="formInput"
                                               v-model="dataForm.lawsNumber"
                                               placeholder="请输入政策编号"
                                               clearable
                                     />
-                                    <div class="addButton" style="padding-left: 10px">
+                                    <div v-if="!disabledXX" class="addButton" style="padding-left: 10px">
                                         <el-button :disabled="disabledXX" size="small" type="primary"
                                                    @click="handleSearchStandard">选择征求意见政策
                                         </el-button>
@@ -39,7 +45,9 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="政策名称" prop="lawsName" class="add-form-item form-item-disabled">
+                                <el-form-item label="政策名称"
+                                              :prop="!disabledXX ? 'lawsName':''"
+                                              class="add-form-item form-item-disabled">
                                     <el-input :disabled="true"
                                               v-model="dataForm.lawsName"
                                               placeholder="请输入政策名称"
@@ -51,7 +59,9 @@
 
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="截止时间" prop="endTime" class="add-form-item form-item-disabled">
+                                <el-form-item label="截止时间"
+                                              :prop="!disabledXX ? 'endTime':''"
+                                              class="add-form-item form-item-disabled">
                                     <el-date-picker :disabled="disabledXX"
                                                     v-model="dataForm.endTime"
                                                     type="date"
@@ -61,7 +71,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="责任单位截止时间" prop="responsibleUnitDeadline"
+                                <el-form-item label="责任单位截止时间"
+                                              :prop="!disabledXX ? 'responsibleUnitDeadline':''"
                                               class="add-form-item form-item-disabled">
                                     <el-date-picker :disabled="disabledXX"
                                                     v-model="dataForm.responsibleUnitDeadline"
@@ -72,9 +83,11 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
+
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="政策征求意见周期" prop="cycleTime"
+                                <el-form-item label="政策征求意见周期"
+                                              :prop="!disabledXX ? 'cycleTime':''"
                                               class="add-form-item form-item-disabled">
                                     <el-date-picker :disabled="disabledXX"
                                                     v-model="dataForm.cycleTime"
@@ -103,8 +116,7 @@
                                              style="margin-right: 5px;padding-left: 10px">
                                             <div class="fileClass">
                                                 <span @click="handlePreview(item)">{{ item.name }}</span>
-                                                <el-button :disabled="disabledXX"
-                                                           size="small"
+                                                <el-button size="small"
                                                            @click="clickButtonToUpload(item)"
                                                            icon="el-icon-download"
                                                            style="height: 32px; margin-left: 5px;"
@@ -113,7 +125,7 @@
                                         </div>
                                     </div>
                                     <div>
-                                        <el-button :disabled="disabledXX"
+                                        <el-button v-if="!disabledXX"
                                                    type="primary"
                                                    class="common-button-primary"
                                                    @click="fileUpload('templateFileList','templateFileId','.zip,.docx,.doc,.xls,.xlsx',200)"
@@ -124,15 +136,86 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
+
+                        <el-row :gutter="24" v-if="taskKey == 'PolicySolicitOpinionProcessKey7'">
+                            <el-col :span="12">
+                                <el-form-item label="责任人" prop="zrrUserNames"
+                                              class="add-form-item form-item-disabled">
+                                    <el-input @click.native="selectOperation('责任人',dataForm.zrrUserIds,false)"
+                                              v-model="dataForm.zrrUserNames"
+                                              readonly
+                                              placeholder="请选择责任人"
+                                              clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
+                        <el-row :gutter="24" v-if="taskKey == 'PolicySolicitOpinionProcessKey9'">
+                            <el-col :span="12">
+                                <el-form-item label="内部评审" prop="internalReviewFlag"
+                                              class="add-form-item form-item-disabled">
+                                    <el-select v-model="dataForm.internalReviewFlag"
+                                               @change="internalReviewFlagChange"
+                                               placeholder="请选择内部评审" clearable>
+                                        <el-option :value="'0'"
+                                                   label="是">是
+                                        </el-option>
+                                        <el-option :value="'1'"
+                                                   label="否">否
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="本单位审批人" prop="zrdwUserName"
+                                              v-if="dataForm.internalReviewFlag == '0'"
+                                              class="add-form-item form-item-disabled">
+                                    <el-input @click.native="selectOperation('审批人',dataForm.zrdwUserId,true)"
+                                              v-model="dataForm.zrdwUserName"
+                                              readonly
+                                              placeholder="请选择本单位审批人"
+                                              clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
+                        <el-row :gutter="24" v-if="taskKey == 'PolicySolicitOpinionProcessKey12'">
+                            <el-col :span="12">
+                                <el-form-item label="会签人" prop="hqrUserNames"
+                                              class="add-form-item form-item-disabled">
+                                    <el-input @click.native="selectOperation('会签人',dataForm.hqrUserIds,false)"
+                                              v-model="dataForm.hqrUserNames"
+                                              readonly
+                                              placeholder="请选择会签人"
+                                              clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+
+                        <el-row :gutter="24" v-if="taskKey == 'PolicySolicitOpinionProcessKey16'">
+                            <el-col :span="12">
+                                <el-form-item label="抄送人" prop="csr2UserNames"
+                                              class="add-form-item form-item-disabled">
+                                    <el-input @click.native="selectOperation('抄送人',dataForm.csr2UserIds,false)"
+                                              v-model="dataForm.csr2UserNames"
+                                              readonly
+                                              placeholder="请选择抄送人"
+                                              clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                     </div>
                 </el-form>
-                <solicitationList ref="solicitationListRef"/>
+                <solicitationList v-if="showSolicitation" ref="solicitationListRef"/>
             </div>
             <el-collapse accordion>
                 <el-collapse-item title="意见填写">
                     <div style="margin: 10px 0;">
-                        <el-input :disabled="disabledXX"
-                                  type="textarea"
+                        <el-input type="textarea"
                                   :rows="3"
                                   resize="none"
                                   placeholder="请输入意见"
@@ -142,26 +225,31 @@
                 </el-collapse-item>
             </el-collapse>
         </div>
-        <div class="content" v-show="active === '2'">
+        <div class="content" v-if="showPersonnel && active === '2'">
             <personnelInformation ref="personnelInformationRef"/>
         </div>
-        <div class="content" style="padding-top: 20px" v-show="active === '3'">
+        <div class="content" v-if="showApprovalHistory && active === '3'"
+             style="padding-top: 20px">
             <approvalHistory/>
         </div>
         <ProcessFooter show-submit
                        :show-save="showSave"
                        :submitLoading="isSubmit"
+                       :rejectLoading="isReject"
                        :saveLoading="saveLoading"
                        :show-transfer="showTransfer"
+                       :showReject="showReject"
                        @save="handleSave"
                        @transfer="handleTransfer"
                        @submit="handleSubmit"
+                       @reject="handleReject"
         >
         </ProcessFooter>
         <Role-tree
-                check-box
-                is-title="转办处理人"
+                :check-box="checkBox"
+                :is-title="title"
                 :is-visible.sync="drawerModal"
+                :nodeList="nodeList"
                 @checkedRole="checkedRole"
         ></Role-tree>
         <policySolicitingOpinions ref="policySolicitingOpinionsRef"
@@ -203,8 +291,8 @@
                 active: '1',
                 accept: '',
                 fileMax_M: 0,
-                disabledXX: false,
                 drawerModal: false,
+                nodeList: [],
                 formRules: {
                     lawsNumber: [
                         {required: true, message: '请输入政策编号', trigger: 'change'},
@@ -221,22 +309,99 @@
                     responsibleUnitDeadline: [
                         {required: true, message: '请选择责任单位截止时间', trigger: 'change'},
                     ],
+                    zrrUserNames: [
+                        {required: true, message: '请选择责任人', trigger: 'change'},
+                    ],
+                    internalReviewFlag: [
+                        {required: true, message: '请选择内部评审', trigger: 'change'},
+                    ],
+                    zrdwUserName: [
+                        {required: true, message: '请选择本单位审批人', trigger: 'change'},
+                    ],
+                    hqrUserNames: [
+                        {required: true, message: '请选择会签人', trigger: 'change'},
+                    ],
+                    csr2UserNames: [
+                        {required: true, message: '请选择抄送人', trigger: 'change'},
+                    ],
                 },
                 dataForm: {},
                 saveLoading: false,
                 isSubmit: false,
+                isReject: false,
                 commentText: '',
                 fileListName: '',
                 fileName: '',
+                taskKey: this.$route.query.taskKey,
+                title: '',
+                checkBox: false,
+                selectType: '',
             }
         },
         computed: {
-            showSave() {
+            showSave() { //是否展示保存
+                if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey3' || this.taskKey == 'PolicySolicitOpinionProcessKey7' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey8' || this.taskKey == 'PolicySolicitOpinionProcessKey9' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey16') {
+                    return true
+                }
+                return false
+            },
+            showTransfer() {//是否展示转办
+                if (!this.taskKey) {
+                    return false
+                }
                 return true
             },
-            showTransfer() {
+            showReject() {//是否展示驳回
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey2' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey4' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey5' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey10' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey11' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey12' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey13' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey14' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey15') {
+                    return true
+                }
+                return false
+            },
+            showApprovalHistory() { //是否展示历史信息
+                if (!this.taskKey) {
+                    return false
+                }
                 return true
-            }
+            },
+            showPersonnel() { //是否展示人员信息
+                if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey3') {
+                    return true
+                }
+                return false
+            },
+            showSolicitation() { //是否展示征求意见列表
+                if (this.taskKey == 'PolicySolicitOpinionProcessKey8' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey9' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey10' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey11' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey12' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey13' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey14' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey15' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey16') {
+                    return true
+                }
+                return false
+            },
+            disabledXX() {
+                if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1' ||
+                    this.taskKey == 'PolicySolicitOpinionProcessKey3') {
+                    return false
+                }
+                return true
+            },
         },
         methods: {
             handlePreview(file) {
@@ -288,8 +453,6 @@
                 let _formData = new FormData();
                 let json = this.form
                 json.commentText = this.commentText
-                json.filesId = this.addFjList
-                json.filesName = this.form.fjListName
                 _formData.append('id', this.bpnId || '')
                 _formData.append("createUser", this.$store.getters.userInfo.userId);
                 _formData.append("createUserName", this.$store.getters.userInfo.userName);
@@ -313,49 +476,8 @@
                     if (valid) {
                         this.$refs['Form'].validate((valid) => {
                             if (valid) {
-                                const json = Object.assign(this.form, this.roleForm);
-                                json.commentText = this.commentText
-                                json.filesId = this.addFjList
-                                json.filesName = this.form.fjListName
                                 this.isSubmit = true
                                 this.saveLoading = true;
-                                this.$http.post('lawss/activiti/startProcessRollBack', {
-                                    createUser: this.$store.getters.userInfo.userId,
-                                    createUserName: this.$store.getters.userInfo.userName,
-                                    type: 'laws2',
-                                    json: JSON.stringify({
-                                        form: json,
-                                        roleForm: this.roleForm,
-                                        commentText: this.commentText
-                                    })
-                                }, {_this: this}, res => {
-                                    if (res.ok) {
-                                        this.$http.post('lawss/activiti/completeTask', {
-                                            json: JSON.stringify(json),
-                                            taskId: res.data,
-                                            userId: this.$store.getters.userInfo.userId
-                                        }, {_this: this}, res => {
-                                            if (res.success) {
-                                                this.$message.success(res.message);
-                                                if (this.bpnId !== '') {
-                                                    let taskId = {
-                                                        id: this.bpnId
-                                                    }
-                                                    taskDel(taskId).then(res => {
-                                                        return res
-                                                    })
-                                                }
-                                                this.$router.push("/processCenter");
-                                            }
-                                            this.isSubmit = false;
-                                            this.saveLoading = false;
-                                        })
-                                    } else {
-                                        this.$message.warning('流程启动失败')
-                                        this.isSubmit = false
-                                        this.saveLoading = false;
-                                    }
-                                })
                             } else {
                                 return this.$message.warning('请完善人员信息')
                             }
@@ -365,25 +487,104 @@
                     }
                 })
             },
+            handleReject() {
+
+            },
+            startProcessRollBack() {
+                const json = Object.assign(this.form, this.roleForm);
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/startProcessRollBack', {
+                    createUser: this.$store.getters.userInfo.userId,
+                    createUserName: this.$store.getters.userInfo.userName,
+                    type: 'laws2',
+                    json: JSON.stringify({
+                        form: json,
+                        roleForm: this.roleForm,
+                        commentText: this.commentText
+                    })
+                }, {_this: this}, res => {
+                    if (res.ok) {
+                        this.completeTask(res.data)
+                    } else {
+                        this.$message.warning('流程启动失败')
+                        this.isSubmit = false
+                        this.saveLoading = false;
+                    }
+                })
+            },
+            completeTask(taskId) {
+                const json = Object.assign(this.form, this.roleForm);
+                json.commentText = this.commentText
+                this.$http.post('lawss/activiti/completeTask', {
+                    json: JSON.stringify(json),
+                    taskId: taskId || this.taskId,
+                    userId: this.$store.getters.userInfo.userId
+                }, {_this: this}, res => {
+                    if (res.success) {
+                        this.$message.success(res.message);
+                        if (this.bpnId !== '') {
+                            let taskId = {
+                                id: this.bpnId
+                            }
+                            taskDel(taskId).then(res => {
+                                return res
+                            })
+                        }
+                        this.$router.push("/processCenter");
+                    }
+                    this.isSubmit = false;
+                    this.saveLoading = false;
+                })
+            },
             handleTransfer() {
+                this.title = '转办处理人'
+                this.checkBox = true
+                this.selectType = '转办处理人'
+                this.nodeList = []
                 this.drawerModal = true
             },
             checkedRole(data) {
-                changeAssigneeNew({
-                    taskId: this.$route.query.taskIds, // 任务id
-                    userId: this.$store.getters.userInfo.userId, // 委托人
-                    assignee: data[0].id, // 被委托人
-                    pId: this.$route.query.prcId, // 流程实例
-                }).then(res => {
-                    if (res.success) {
-                        this.drawerModal = false
-                        this.$message.success('调整成功')
-                        this.processNum()
-                        this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
-                    } else {
-                        this.$message.warning(res.message)
+                let ids = []
+                let names = []
+                if (data && data.length > 0) {
+                    for (let i = 0; i < data.length; i++) {
+                        ids.push(data[i].id)
+                        names.push(data[i].name)
                     }
-                })
+                }
+                if (this.selectType == '转办处理人') {
+                    changeAssigneeNew({
+                        taskId: this.$route.query.taskIds, // 任务id
+                        userId: this.$store.getters.userInfo.userId, // 委托人
+                        assignee: data[0].id, // 被委托人
+                        pId: this.$route.query.prcId, // 流程实例
+                    }).then(res => {
+                        if (res.success) {
+                            this.drawerModal = false
+                            this.$message.success('调整成功')
+                            this.processNum()
+                            this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                        } else {
+                            this.$message.warning(res.message)
+                        }
+                    })
+                } else if (this.selectType == '责任人') {
+                    this.dataForm.zrrUserIds = ids.join(',')
+                    this.dataForm.zrrUserNames = names.join(',')
+                    this.dataForm = {...this.dataForm}
+                } else if (this.selectType == '审批人') {
+                    this.dataForm.zrdwUserId = ids.join(',')
+                    this.dataForm.zrdwUserName = names.join(',')
+                    this.dataForm = {...this.dataForm}
+                } else if (this.selectType == '会签人') {
+                    this.dataForm.hqrUserIds = ids.join(',')
+                    this.dataForm.hqrUserNames = names.join(',')
+                    this.dataForm = {...this.dataForm}
+                } else if (this.selectType == '抄送人') {
+                    this.dataForm.csr2UserIds = ids.join(',')
+                    this.dataForm.csr2UserNames = names.join(',')
+                    this.dataForm = {...this.dataForm}
+                }
             },
             // 请求转换流程图
             processNum(row) {
@@ -398,6 +599,20 @@
                     this.processStep = window.URL.createObjectURL(res.data)
                 })
             },
+
+            selectOperation(title, id, isTrue) {
+                this.title = title
+                this.checkBox = isTrue
+                this.selectType = title
+                let ids = id && id.length > 0 ? id.split(',') : []
+                this.nodeList = ids
+                this.drawerModal = true
+            },
+            internalReviewFlagChange() {
+                this.dataForm.zrdwUserId = ''
+                this.dataForm.zrdwUserName = ''
+                this.dataForm = {...this.dataForm}
+            },
         }
     }
 </script>