From bd454046104358a7fe5f5fa147a20e01655ae699 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 31 Dec 2021 17:58:07 +0800
Subject: [PATCH] feat: There is no way the,

---
 .../treeSelect/treeSelectModule.vue           | 128 +++++++--------
 .../pages/creatProcess/qbrk-product/step1.vue |  44 +++--
 .../creatProcess/qbrk/common/formEditList.vue |  38 ++++-
 .../creatProcess/qbrk/common/formList.vue     |  22 ++-
 .../creatProcess/qbrk/common/formListIn.vue   |  20 ++-
 .../pages/creatProcess/qbrk/step1.vue         | 153 +++++++++++++-----
 .../pages/creatProcess/qbrk/step10.vue        |   6 +
 .../pages/creatProcess/qbrk/step11.vue        |   6 +
 .../pages/creatProcess/qbrk/step12.vue        |   6 +
 .../pages/creatProcess/qbrk/step2.vue         |   6 +
 .../pages/creatProcess/qbrk/step3.vue         |  29 +++-
 .../pages/creatProcess/qbrk/step4.vue         |   6 +
 .../pages/creatProcess/qbrk/step5.vue         |   6 +
 .../pages/creatProcess/qbrk/step6.vue         |  29 +++-
 .../pages/creatProcess/qbrk/step7.vue         |   6 +
 .../pages/creatProcess/qbrk/step8.vue         |   6 +
 .../pages/creatProcess/qbrk/step9.vue         |   6 +
 .../pages/creatProcess/qbrk/stepC3.vue        |  46 ++++--
 .../pages/creatProcess/qbrk/stepC6.vue        |  92 ++++++++---
 .../pages/creatProcess/qbrk/stepDetail.vue    |   6 +
 20 files changed, 484 insertions(+), 177 deletions(-)

diff --git a/src/components/treeSelect/treeSelectModule.vue b/src/components/treeSelect/treeSelectModule.vue
index 30e0c8a03..61f34970d 100644
--- a/src/components/treeSelect/treeSelectModule.vue
+++ b/src/components/treeSelect/treeSelectModule.vue
@@ -7,7 +7,7 @@
             :append-to-body=true
             :before-close="cancelUserInfo"
             :show-checkbox="showCheckBox"
-            >
+    >
         <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
                  :load="loadNode"
                  :lazy="lazy"
@@ -45,12 +45,12 @@
                     return "";
                 }
             },
-          type: {
-            type: String,
-            default () {
-              return "";
-            }
-          },
+            type: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
             urlChild: {
                 type: String,
                 default () {
@@ -120,7 +120,7 @@
                     return '';
                 }
             },
-          showCheckBox:{
+            showCheckBox:{
                 type: Boolean,
                 default () {
                     return true;
@@ -233,20 +233,20 @@
                     this.isShowSelect = !this.isShowSelect;
                 }
             },
-          // 递归
-          getTreeData(data) {
-            // 循环遍历json数据
-            for (let i = 0; i < data.length; i++) {
-              if (data[i].children.length < 1) {
-                // children若为空数组，则将children设为undefined
-                delete data[i].children
-              } else {
-                // children若不为空数组，则继续 递归调用 本方法
-                this.getTreeData(data[i].children)
-              }
-            }
-            return data
-          },
+            // 递归
+            getTreeData(data) {
+                // 循环遍历json数据
+                for (let i = 0; i < data.length; i++) {
+                    if (data[i].children.length < 1) {
+                        // children若为空数组，则将children设为undefined
+                        delete data[i].children
+                    } else {
+                        // children若不为空数组，则继续 递归调用 本方法
+                        this.getTreeData(data[i].children)
+                    }
+                }
+                return data
+            },
             // 节点选中状态发生变化时的回调
             handleCheckChange () {
                 var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
@@ -281,52 +281,44 @@
 </script>
 
 <style lang="less" scoped>
-/deep/ .expanded{
-    background-image: none !important;
-    background-size:100% 100%;
-}
-.el-drawer__body{
-& > div:first-child{
-      display: flex;
-      flex: auto;
-      flex-direction: column;
-  }
-}
-::v-deep .el-drawer__header{
-&>span:first-child{
-     outline: none!important;
- }
-}
-::v-deep .el-drawer{
-    outline: none!important;
-}
+    /deep/ .expanded{
+        background-image: none !important;
+        background-size:100% 100%;
+    }
+    .el-drawer__body{
+        & > div:first-child{
+            display: flex;
+            flex: auto;
+            flex-direction: column;
+        }
+    }
+    ::v-deep .el-drawer__header{
+        &>span:first-child{
+            outline: none!important;
+        }
+    }
+    ::v-deep .el-drawer{
+        outline: none!important;
+    }
 
-//#tree {
-//  .el-checkbox .el-checkbox__inner {
-//    display: none;
-//  }
-//  div[role="group"] {
-//    .el-checkbox .el-checkbox__inner {
-//      display: inline-block;
-//    }
-//  }
-//}
-//
-//.el-tree-node {
-//  .is-leaf + .el-checkbox .el-checkbox__inner {
-//    display: inline-block;
-//  }
-//  .el-checkbox .el-checkbox__inner {
-//    display: none;
-//  }
-//}
+    //#tree {
+    //  .el-checkbox .el-checkbox__inner {
+    //    display: none;
+    //  }
+    //  div[role="group"] {
+    //    .el-checkbox .el-checkbox__inner {
+    //      display: inline-block;
+    //    }
+    //  }
+    //}
+    //
+    //.el-tree-node {
+    //  .is-leaf + .el-checkbox .el-checkbox__inner {
+    //    display: inline-block;
+    //  }
+    //  .el-checkbox .el-checkbox__inner {
+    //    display: none;
+    //  }
+    //}
 
-/deep/ .el-tree-node{
-  .is-leaf + .el-checkbox .el-checkbox__inner{
-    display: inline-block;
-  }
-  .el-checkbox .el-checkbox__inner{
-    display: none;
-  }
-}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index e4524af2b..c41f9480e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -237,7 +237,7 @@
                             <el-col :span="12">
                                 <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
                                     <el-input
-                                            clearable
+                                            readonly="readonly"
                                             v-model="form.QCDW"
                                             placeholder="选择起草部门"
                                             @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
@@ -478,7 +478,7 @@
                                     <el-form-item prop="bussUser2Name" style="margin-bottom: 0">
                                         <h4>其他起草人</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser2Name" clearable placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input>
+                                            <el-input v-model="roleForm.bussUser2Name" readonly="readonly" clearable placeholder="其他起草人" @click.native="choiceZRRList('bussUser2', '选择其他起草人', roleForm.bussUser2)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -488,7 +488,7 @@
                                     <el-form-item prop="bussUser3Name" style="margin-bottom: 0">
                                         <h4>企标编写汇总修订人</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input disabled v-model="roleForm.bussUser3Name" clearable placeholder="企标编写汇总修订人"></el-input>
+                                            <el-input disabled v-model="roleForm.bussUser3Name" readonly="readonly" clearable placeholder="企标编写汇总修订人"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -498,7 +498,7 @@
                                     <el-form-item prop="bussUser4Name" style="margin-bottom: 0">
                                         <h4>总院各中心兼职标准化员/各事业部标准化员</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser4Name" placeholder="选择总院各中心兼职标准化员/各事业部标准化员" @click.native="choiceZRR('bussUser4', '选择总院各中心兼职标准化员/各事业部标准化员', roleForm.bussUser4)"></el-input>
+                                            <el-input v-model="roleForm.bussUser4Name" readonly="readonly" placeholder="选择总院各中心兼职标准化员/各事业部标准化员" @click.native="choiceZRR('bussUser4', '选择总院各中心兼职标准化员/各事业部标准化员', roleForm.bussUser4)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -508,7 +508,7 @@
                                     <el-form-item prop="bussUser5Name" style="margin-bottom: 0">
                                         <h4>会签征求意见人员</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser5Name" placeholder="选择会签征求意见人员" @click.native="choiceZRRList('bussUser5', '选择会签征求意见人员', roleForm.bussUser5)"></el-input>
+                                            <el-input v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择会签征求意见人员" @click.native="choiceZRRList('bussUser5', '选择会签征求意见人员', roleForm.bussUser5)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -528,7 +528,7 @@
                                     <el-form-item prop="bussUser7Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准法规部人员</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser7Name" placeholder="总院标准法规部产品标准工程师/各事业部标准法规部人员" @click.native="choiceZRR('bussUser7', '选择总院标准法规部产品标准工程师/各事业部标准法规部人员', roleForm.bussUser7)"></el-input>
+                                            <el-input v-model="roleForm.bussUser7Name" readonly="readonly" placeholder="总院标准法规部产品标准工程师/各事业部标准法规部人员" @click.native="choiceZRR('bussUser7', '选择总院标准法规部产品标准工程师/各事业部标准法规部人员', roleForm.bussUser7)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -538,7 +538,7 @@
                                     <el-form-item prop="bussUser8Name" style="margin-bottom: 0">
                                         <h4>总院项目总工/各事业部整车所产品经理</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser8Name" placeholder="选择总院项目总工/各事业部整车所产品经理" @click.native="choiceZRR('bussUser8', '选择总院项目总工/各事业部整车所产品经理', roleForm.bussUser8)"></el-input>
+                                            <el-input v-model="roleForm.bussUser8Name" readonly="readonly" placeholder="选择总院项目总工/各事业部整车所产品经理" @click.native="choiceZRR('bussUser8', '选择总院项目总工/各事业部整车所产品经理', roleForm.bussUser8)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -548,7 +548,7 @@
                                     <el-form-item prop="bussUser9Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser9Name" placeholder="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" @click.native="choiceZRR('bussUser9', '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', roleForm.bussUser9)"></el-input>
+                                            <el-input v-model="roleForm.bussUser9Name" readonly="readonly" placeholder="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" @click.native="choiceZRR('bussUser9', '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', roleForm.bussUser9)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -558,7 +558,7 @@
                                     <el-form-item prop="bussUser10Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser10Name" placeholder="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" @click.native="choiceZRR('bussUser10', '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', roleForm.bussUser10)"></el-input>
+                                            <el-input v-model="roleForm.bussUser10Name" readonly="readonly" placeholder="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" @click.native="choiceZRR('bussUser10', '选择总院标准法规部高级经理/各事业部标准业务/认证业务经理', roleForm.bussUser10)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -568,7 +568,7 @@
                                     <el-form-item prop="bussUser11Name" style="margin-bottom: 0">
                                         <h4>总院技术管理中心主任/各事业部主管标准业务高级经理</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser11Name" placeholder="选择总院技术管理中心主任/各事业部主管标准业务高级经理" @click.native="choiceZRR('bussUser11', '选择总院技术管理中心主任/各事业部主管标准业务高级经理', roleForm.bussUser11)"></el-input>
+                                            <el-input v-model="roleForm.bussUser11Name" readonly="readonly" placeholder="选择总院技术管理中心主任/各事业部主管标准业务高级经理" @click.native="choiceZRR('bussUser11', '选择总院技术管理中心主任/各事业部主管标准业务高级经理', roleForm.bussUser11)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -578,7 +578,7 @@
                                     <el-form-item prop="bussUser12Name" style="margin-bottom: 0">
                                         <h4>总院平台总监/各事业部研发副总裁</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser12Name" placeholder="选择总院平台总监/各事业部研发副总裁" @click.native="choiceZRR('bussUser12', '选择总院平台总监/各事业部研发副总裁', roleForm.bussUser12)"></el-input>
+                                            <el-input v-model="roleForm.bussUser12Name" readonly="readonly" placeholder="选择总院平台总监/各事业部研发副总裁" @click.native="choiceZRR('bussUser12', '选择总院平台总监/各事业部研发副总裁', roleForm.bussUser12)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -588,7 +588,7 @@
                                     <el-form-item prop="bussUser13Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准化员</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser13Name" placeholder="选择总院标准法规部产品标准工程师/各事业部标准化员" @click.native="choiceZRR('bussUser13', '选择总院标准法规部产品标准工程师/各事业部标准化员', roleForm.bussUser13)"></el-input>
+                                            <el-input v-model="roleForm.bussUser13Name" readonly="readonly" placeholder="选择总院标准法规部产品标准工程师/各事业部标准化员" @click.native="choiceZRR('bussUser13', '选择总院标准法规部产品标准工程师/各事业部标准化员', roleForm.bussUser13)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -598,7 +598,7 @@
                                     <el-form-item prop="bussUser14Name" style="margin-bottom: 0">
                                         <h4>抄送人员</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser14Name" placeholder="选择抄送人员" @click.native="choiceZRR('bussUser14', '选择标抄送人员', roleForm.bussUser14)"></el-input>
+                                            <el-input v-model="roleForm.bussUser14Name" readonly="readonly" placeholder="选择抄送人员" @click.native="choiceZRR('bussUser14', '选择标抄送人员', roleForm.bussUser14)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -1950,7 +1950,19 @@
             },
             choiceZRRList (type, title, id) {
                 this.nodeList2 = []
-                this.nodeList2.push(id)
+                if(type === 'qcUserId'){
+                    if ( this.roleForm.qcUserId.length > 0) {
+                        this.nodeList2 = this.roleForm.qcUserId.split(',')
+                    }
+                }else if(type === 'hqUserId'){
+                    if ( this.roleForm.hqUserId.length > 0) {
+                        this.nodeList2 = this.roleForm.hqUserId.split(',')
+                    }
+                }else if(type === 'QCRBUSS'){
+                    if ( this.form.QCRBUSSID.length > 0) {
+                        this.nodeList2 = this.form.QCRBUSSID.split(',')
+                    }
+                }
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true
@@ -2004,7 +2016,9 @@
             },
             choiceQCDW(type, title, id) {
                 this.nodeListZRBM = []
-                this.nodeListZRBM.push(id)
+                if(this.form.QCDWID.length > 0){
+                    this.nodeListZRBM = this.form.QCDWID.split(',')
+                }
                 this.drawerTitle = title
                 this.modalShowFlagZRBM = true
             },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index d5faa5184..929bb5a08 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -254,12 +254,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+        </el-form-item>
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
         </el-form-item>
-        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
-        </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
@@ -292,8 +298,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+        <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -502,6 +514,22 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+    choiceZRR1(type, title, id) {
+      this.$emit('formChoiceZRR1',type,title,id)
+    },
+
+    choiceZRR2(type, title, id,flag) {
+      this.$emit('formChoiceZRR2',type,title,id,flag)
+    },
+
+    choiceZRR3(type, title, id) {
+      this.$emit('formChoiceZRR3',type,title,id)
+    },
+
+    choiceZRR4(type, title, id) {
+      this.$emit('formChoiceZRR4',type,title,id)
+    },
+
     choiceQCDW(type, title, id) {
       this.$emit('formChoiceQCDW',type,title,id)
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 61e3a8edb..4bd186dbf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -159,12 +159,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
-        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-        </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
@@ -190,8 +196,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
+        <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
index 8460fa8f6..9d1c608b3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
@@ -168,8 +168,14 @@
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
-        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
+        <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -196,8 +202,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
+        <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index e8ef175fa..ff0260e24 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -263,12 +263,18 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
+                                <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+                                </el-form-item>
                                 <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></el-input>
-                                </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
@@ -301,8 +307,14 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+                                <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+                                </el-form-item>
+                                <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -981,28 +993,56 @@
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                 :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
-        <tree-select-new
-                width = "500"
-                :lazy=true
-                :multiple="multipleFlag2"
-                :check-strictly=true
-                :modalShowFlag="modalShowFlag2"
-                :drawerTitle="drawerTitle"
-                :url="url"
-                :urlChild="urlChild"
-                :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width = "500"
+            :lazy=true
+            :multiple="multipleFlag2"
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag2"
+            :drawerTitle="drawerTitle"
+            :type="type"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
     </div>
 </template>
 
 <script>
-    import { onlyOfficeUrl } from '@/sysConfig'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -1012,7 +1052,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            treeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -1120,7 +1161,7 @@
                     unit: '',
                     esName: '',
                     planStatus: '0,3',
-                    reviseStatus: '2',
+                    reviseStatus: '',
                 },
                 tableData: {
                     // 标准表格数据
@@ -1266,6 +1307,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1876,7 +1923,7 @@
                 this.standardSearchForm.unit = ''
                 this.standardSearchForm.esName = ''
                 this.standardSearchForm.planStatus = '0,3'
-                this.standardSearchForm.reviseStatus = '2'
+                this.standardSearchForm.reviseStatus = ''
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)
@@ -2050,14 +2097,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -2066,7 +2114,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -2075,7 +2122,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2435,37 +2481,60 @@
                 }
 
             },
+            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.CYCVPPSBMBUSS = checkedData.code
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
+                    }
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
+                }
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
+            },
             popoverHideBusVsCancel(){
               this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.kccvppsbm = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.KCVPPSBMBUSS = checkedData.code
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
-
+                }else {
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
-                    }else {
-                        this.form.dybxh = checkedData.model
-                        this.form.dymc = checkedData.name
+                console.log(checkedData)
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                        this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
                popoverHideModelCancel(){
                 this.modalShowFlag4 = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index f74f63192..718eec59d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -839,6 +839,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index e5faa7cbd..69ac656cd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -838,6 +838,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 7988d7c2d..fb734d886 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -823,6 +823,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 49e7e0f04..42d6217c9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -829,6 +829,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 212d136ac..9212dcda4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -34,6 +34,10 @@
                     @formSelectLawsCancel = "formSelectLawsCancel"
                     @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                     @formChoiceQCDW = "formChoiceQCDW"
+                    @formChoiceZRR1 = "formChoiceZRR1"
+                    @formChoiceZRR2 = "formChoiceZRR2"
+                    @formChoiceZRR3 = "formChoiceZRR3"
+                    @formChoiceZRR4 = "formChoiceZRR4"
             />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
@@ -891,6 +895,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1122,6 +1132,18 @@
                 this.drawerTitle = title
                 this.modalShowFlagZRBM = true
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1718,14 +1740,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -1734,7 +1757,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -1743,7 +1765,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index c9973fcec..c2b374540 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -834,6 +834,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 9acadecdd..6a017fa49 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -971,6 +971,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index d1c2bef4e..276929263 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -34,6 +34,10 @@
                         @formSelectLawsCancel = "formSelectLawsCancel"
                         @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                         @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -965,6 +969,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1206,6 +1216,18 @@
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1800,14 +1822,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -1816,7 +1839,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -1825,7 +1847,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index 491cbf393..36d2ec9f6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -957,6 +957,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index 35b3acfbb..c5b961b73 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -959,6 +959,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 0dda1e300..24ecc51bc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -959,6 +959,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 9f5b8cc56..84475bed7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -29,20 +29,25 @@
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :fileMadelSub = "fileMadel"
+                        :fbgDown = "false"
                         @formCancel="formCancel"
                         @formSelectLawsCancel = "formSelectLawsCancel"
                         @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                         @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
                 />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
                 </ProcessTitle>
                 <template>
-                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                    <div class="prc-content-border" style="height: auto;position: relative;">
                         <el-table
                                 ref="selection"
                                 tooltip-effect="dark"
-                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
                                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
                                         fontWeight: 'bold', height: '48px'}"
                                 :data="form.fileModelList"
@@ -73,7 +78,7 @@
                                     <div @click="filePreview(scope.row,'onLine')" style="display: inline-block;cursor: pointer;color: #409EFF;">
                                         预览
                                     </div>
-                                    &nbsp;&nbsp;
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     <div @click="filePreview(scope.row,'down')" style="display: inline-block;cursor: pointer;color: #409EFF;">
                                         下载
                                     </div>
@@ -890,6 +895,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1121,6 +1132,18 @@
                 this.drawerTitle = title
                 this.modalShowFlagZRBM = true
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1717,14 +1740,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -1733,7 +1757,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -1742,7 +1765,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -1967,7 +1989,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1985,7 +2007,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2247,7 +2269,7 @@
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
@@ -2351,7 +2373,7 @@
                 }
             },
             handleSubmit() {
-                // this.getRule()
+                this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2370,7 +2392,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index baffa51fe..276d6dc4e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -34,6 +34,10 @@
                         @formSelectLawsCancel = "formSelectLawsCancel"
                         @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                         @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -68,23 +72,49 @@
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="70%"
+                                    min-width="35%"
                                     align="center">
                             </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见文件"
+                                    min-width="35%"
+                                    align="left">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                                            <!-- {{ value.name }} -->
+                                            {{value.name | ellipsis}}
+                                        </div>
+                                        <div v-else>
+                                            - -
+                                        </div>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    label="意见是否采纳"
+                                    min-width="15%"
+                                    align="center">
+                                <template slot-scope="scope">
+                                    <el-form-item
+                                            style="margin-left: 0;margin-bottom:0;"
+                                    >
+                                        <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                            <el-option
+                                                    v-for="item in opinionsAdoptedOptions"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                            ></el-option>
+                                        </el-select>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
                         </el-table>
                         <el-row :gutter="24">
-                            <el-col :span="12">
-                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsAdoptedOptions"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
                             <el-col :span="12">
                                 <el-form-item label="汇总评审意见文件" prop="summaryFileName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -678,6 +708,15 @@
             TreeSelectNew,
             formEditList
         },
+        filters: {
+            ellipsis (value) {
+                if (!value) return ''
+                if (value.length > 35) {
+                    return value.slice(0,35) + '...'
+                }
+                return value
+            }
+        },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
                 if(this.FBGBUSSFileList.length === 0){
@@ -930,6 +969,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1171,6 +1216,18 @@
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1765,14 +1822,15 @@
                 this.modalShowFlag1 = true
                 this.key++
             },
-            choiceZRR2 (type, title, id) {
+            choiceZRR2 (type, title, id,flag) {
                 this.drawerTitle = title
                 this.modalShowFlag2 = true
+                this.multipleFlag2 = flag
                 this.url = ''
                 this.urlChild = ''
+                this.type = type
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key1++
             },
             choiceZRR3 (type, title, id) {
                 this.drawerTitle = title
@@ -1781,7 +1839,6 @@
                 this.urlChild = ''
                 this.url="sarVppsTree/list"
                 this.urlChild="sarVppsTree/childByList"
-                this.key2++
             },
             choiceZRR4 (type, title, id) {
                 this.drawerTitle = title
@@ -1790,7 +1847,6 @@
                 this.urlChild = ''
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
-                this.key3++
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -2305,7 +2361,7 @@
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
index 2bf558e97..bee0f4cf8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -820,6 +820,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',