feat: 标准库 统一组织结构树组件

src/components/treeSelect/treeSelectNew.vue

@@ -0,0 +1,270 @@
+<template>
+    <el-drawer
+            class="org-tree"
+            :title="drawerTitle"
+            :visible.sync="modalShowFlag"
+            :size="width"
+            :append-to-body=true
+            :before-close="cancelUserInfo"
+            >
+        <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
+                 :load="loadNode"
+                 :lazy="lazy"
+                 :show-checkbox="multiple"
+                 :node-key="nodeKey"
+                 :check-strictly="checkStrictly"
+                 :expand-on-click-node="false"
+                 :default-checked-keys="defaultCheckedKeys"
+                 :highlight-current="true"
+                 @node-click="handleNodeClick"
+                 @check-change="handleCheckChange"></el-tree>
+        <div id="roleFormButton" class="demo-drawer-footer">
+            <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
+        </div>
+    </el-drawer>
+</template>
+
+<script>
+     export default {
+        name: "treeSelectNew",
+        props: {
+            // 树结构数据
+            data: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            url: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+            urlChild: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+            params: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            defaultProps: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            // 配置是否可多选
+            multiple: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            lazy: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            nodeKey: {
+                type: String,
+                default () {
+                    return 'id';
+                }
+            },
+            // 显示复选框情况下，是否严格遵循父子不互相关联
+            checkStrictly: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            disabled: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+            // 默认选中的节点key数组
+            checkedKeys: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            width: {
+                type: String,
+                default () {
+                    return "";
+                }
+            },
+            drawerTitle:{
+                type: String,
+                default () {
+                    return '';
+                }
+            },
+            // 配置是否展开
+            modalShowFlag: {
+                type: Boolean,
+                default () {
+                    return false;
+                }
+            },
+        },
+        data () {
+            return {
+                nodeList: [],
+                defaultCheckedKeys: [],
+                isShowSelect: false, // 是否显示树状选择器
+                options: [],
+                selectedData: [], // 选中的节点
+                style: 'width:' + this.width + 'px;' + 'height:100%;',
+                selectStyle: 'width:100%;',
+                checkedIds: [],
+                checkedData: [],
+            };
+        },
+        created(){
+        },
+        mounted () {
+            if (this.checkedKeys.length > 0) {
+                if (this.multiple) {
+                    this.defaultCheckedKeys = this.checkedKeys;
+                    this.getChildByIDSList(this.defaultCheckedKeys);
+                    // this.selectedData = this.checkedKeys.map((item) => {
+                    //     var node = this.$refs.tree.getNode(item);
+                    //     return node.label;
+                    // });
+                } else {
+                    const item = this.checkedKeys[0];
+                    this.getChildByIDSList(item);
+                    // this.$refs.tree.setCurrentKey(item);
+                    // var node = this.$refs.tree.getNode(item);
+                    // this.selectedData = node.label;
+                }
+            }
+        },
+        methods: {
+            loadNode(node, resolve) {
+                const that = this;
+
+                if (node.level === 0) {
+                    that.loadTreeData(resolve);
+                }
+
+                if (node.level >= 1) {
+                    setTimeout(() => {
+                        this.getChildByList(node.data.id, resolve);
+                    }, 500);
+                    return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
+                }
+
+
+            },
+            getChildByIDSList( _parentID) {     // 获取子节点请求
+                let params = {ids : _parentID};
+                this.$http.get(this.urlChild, params, {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        this.$emit('popoverHide', this.checkedIds, res.data,false);
+                    }
+                })
+            },
+            getChildByList( _parentID,resolve) {     // 获取子节点请求
+                let params = {ids : _parentID};
+                this.$http.get(this.urlChild, params, {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        resolve(res.data);
+                    }else {
+                        return false;
+                    }
+                })
+            },
+            loadTreeData(resolve) {
+            // 获取loadtreeData 就是父节点数据，getChildByList就是异步获取子节点数据
+                this.$http.get(this.url, '', {
+                    _this: this
+                }, res => {
+                    if(res.data){
+                        resolve(res.data)
+                    }else {
+                        return false;
+                    }
+                })
+            },
+            popoverHide () {
+
+            },
+            // 节点被点击时的回调,返回被点击的节点数据
+            handleNodeClick (data, node) {
+                if (!this.multiple) {
+                    let tmpMap = {};
+                    tmpMap.value = node.key;
+                    tmpMap.label = node.label;
+                    this.options = [];
+                    this.options.push(tmpMap);
+                    this.selectedData = node.label;
+                    this.isShowSelect = !this.isShowSelect;
+                }
+            },
+            // 节点选中状态发生变化时的回调
+            handleCheckChange () {
+                var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+                this.options = checkedKeys.map((item) => {
+                    var node = this.$refs.tree.getNode(item); // 所有被选中的节点对应的node
+                    let tmpMap = {};
+                    tmpMap.value = node.key;
+                    tmpMap.label = node.label;
+                    return tmpMap;
+                });
+                this.selectedData = this.options.map((item) => {
+                    return item.label;
+                });
+            },
+            saveUserInfo () {
+                if (this.multiple) {
+                    this.checkedIds = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+                    this.checkedData = this.$refs.tree.getCheckedNodes(); // 所有被选中的节点所组成的数组数据
+                } else {
+                    this.checkedIds = this.$refs.tree.getCurrentKey();
+                    this.checkedData = this.$refs.tree.getCurrentNode();
+                }
+                this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
+            },
+            cancelUserInfo () {
+                this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
+            },
+        },
+        watch: {
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+.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;
+}
+</style>

src/pages/details/otherStandardDetails/index.vue

@@ -56,7 +56,7 @@
                 </p>
                 <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
                 <p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
-                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
+                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystem || '-' }}</span></p>
                 <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
                 <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
                 <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->

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

@@ -122,12 +122,17 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                                    <tree-select-new
                                             :key="key"
+                                            :multiple=false
+                                            :lazy=false
+                                            :modalShowFlag="modalShowFlag1"
+                                            :drawerTitle="drawerTitle"
                                             width = "340"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
@@ -501,28 +506,46 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
+                                    <tree-select-new
                                             width = "340"
                                             :key="key1"
-                                            :data="busVppsOptions"
+                                            :lazy=true
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag2"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
+                                    <tree-select-new
                                             width = "340"
                                             :key="key2"
-                                            :data="busVppsOptions"
+                                            :lazy=true
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag3"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
-                                            :key="key3"
+                                    <tree-select-new
                                             width = "340"
-                                            :data="modelOptions"
+                                            :key="key3"
+                                            :lazy=true
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag4"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input
@@ -1104,9 +1127,17 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+    import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
     export default {
         name: "bzrkStep1",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle,
+            TreeSelect,
+            TreeSelectNew
+        },
         data () {
             return {
               standardDrawer: false,
@@ -1191,6 +1222,12 @@
                 key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
+                modalShowFlag1: false, // drawer开关
+                modalShowFlag2: false, // drawer开关
+                modalShowFlag3: false, // drawer开关
+                modalShowFlag4: false, // drawer开关
+                url:'',
+                urlChild:'',
                 drawerTitle: '', //drawer标题
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
@@ -1330,7 +1367,9 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 busVppsOptions: [], // 车系体系架构
+                busVppsChildOptions: [], // 车系体系架构子集合
                 modelOptions: [], // 模块体系架构
+                modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
@@ -1398,12 +1437,6 @@
                 },
             },
         },
-        components: {
-            ProcessHeader,
-            ProcessFooter,
-            ProcessTitle,
-            TreeSelect
-        },
         methods: {
             clearFormData(data){
                 this.form = {
@@ -1628,7 +1661,6 @@
                         this.zrUserIds.push(data)
                     }
 
-                    console.log(this.zrUserIds)
                 }else {
                     var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
                     if(getlist.length == 1) {
@@ -1646,6 +1678,38 @@
                 this.drawerTitle = title
                 this.modalShowFlag = true
             },
+            choiceZRR1 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag1 = true
+                this.key++
+            },
+            choiceZRR2 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag2 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarVppsTree/list"
+                this.urlChild="sarVppsTree/childByList"
+                this.key1++
+            },
+            choiceZRR3 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag3 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarVppsTree/list"
+                this.urlChild="sarVppsTree/childByList"
+                this.key2++
+            },
+            choiceZRR4 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag4 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarModelTree/list"
+                this.urlChild="sarModelTree/childByList"
+                this.key3++
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
                     this.treeData = res.data
@@ -1889,29 +1953,51 @@
                 this.fileMadel = true
                 this.fileType = type;
             },
-            popoverHide (checkedIds, checkedData) {
+            popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
-                    this.form.standSystem = checkedData.id
+                    if(checkedData.length > 0){
-                    this.form.standSystemName = checkedData.menuName
+                        this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+                    }else {
+                        this.form.standSystem = checkedData.menuName
+                    }
                 }
+                this.modalShowFlag1 = false
             },
-            popoverHideBusVs (checkedIds, checkedData) {
+            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData){
+                if(checkedData) {
-                    this.form.cycvppsbm = checkedData.code
+                    if(checkedData.length > 0){
-                    this.form.cycvppscn = checkedData.chineseName
+                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                    }else {
+                        this.form.cycvppsbm = checkedData.code
+                        this.form.cycvppscn = checkedData.chineseName
+                    }
                 }
+                this.modalShowFlag2 = false
             },
-            popoverHideCarVs (checkedIds, checkedData) {
+            popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData){
+                if(checkedData) {
-                    this.form.kccvppsbm = checkedData.code
+                    if(checkedData.length > 0){
-                    this.form.kccvppscn = checkedData.chineseName
+                        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
+                    }
                 }
+                this.modalShowFlag3 = false
             },
-            popoverHideModel (checkedIds, checkedData) {
+            popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData){
+                if(checkedData) {
-                    this.form.dybxh = checkedData.model
+                    if(checkedData.length > 0){
-                    this.form.dymc = checkedData.name
+                        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
+                    }
                 }
+                this.modalShowFlag4 = false
             },
             closeDrawer() {
                 this.ListModel = false
@@ -2006,6 +2092,14 @@
                     this.busVppsOptions = res.data
                 })
             },
+            busVsChildFunc(id){
+                this.$http.get('sarVppsTree/childByList', {id:id}, {
+                    _this: this
+                }, res => {
+                    this.busVppsChildOptions = []
+                    this.busVppsChildOptions = res.data
+                })
+            },
             modelFunc(){
                 this.$http.get('sarModelTree/list', '', {
                     _this: this

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

@@ -119,13 +119,7 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.standSystem" disabled></el-input>
-                                            :key="key"
-                                            width = "340"
-                                                 :disabled="false"
-                                                 :data="standSystemOptions"
-                                                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                                 :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                    <el-input
@@ -326,31 +320,13 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.cycvppsbm" disabled></el-input>
-                                            :key="key1"
-                                            :disabled="true"
-                                            width = "340"
-                                            :data="busVppsOptions"
-                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.kccvppsbm" disabled></el-input>
-                                            :key="key2"
-                                            :disabled="true"
-                                            width = "340"
-                                            :data="busVppsOptions"
-                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.dybxh" disabled></el-input>
-                                            :key="key3"
-                                            width = "340"
-                                            :disabled="true"
-                                            :data="modelOptions"
-                                            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input

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

@@ -118,13 +118,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.standSystem" disabled></el-input>
-                          :key="key"
-                          width = "340"
-                          :disabled="true"
-                          :data="standSystemOptions"
-                          :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -319,31 +313,13 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.cycvppsbm" disabled></el-input>
-                          :key="key1"
-                          :disabled="true"
-                          width = "340"
-                          :data="busVppsOptions"
-                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.kccvppsbm" disabled></el-input>
-                          :key="key2"
-                          :disabled="true"
-                          width = "340"
-                          :data="busVppsOptions"
-                          :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.dybxh" disabled></el-input>
-                          :key="key3"
-                          width = "340"
-                          :disabled="true"
-                          :data="modelOptions"
-                          :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-input

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

@@ -114,13 +114,17 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <tree-select v-if="treeStatus"
+                  <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
-                               :key="key"
+                  <tree-select-new
-                               width = "340"
+                          :key="key"
-                               :disabled="false"
+                          :multiple=false
+                          :lazy=false
+                          :modalShowFlag="modalShowFlag1"
+                          :drawerTitle="drawerTitle"
+                          width = "800"
                           :data="standSystemOptions"
                           :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -488,28 +492,46 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
+                  <tree-select-new
+                          width = "800"
                           :key="key1"
-                          width = "340"
+                          :lazy=true
-                          :data="busVppsOptions"
+                          :multiple=false
+                          :modalShowFlag="modalShowFlag2"
+                          :drawerTitle="drawerTitle"
+                          :url="url"
+                          :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
+                  <tree-select-new
+                          width = "800"
                           :key="key2"
-                          width = "340"
+                          :lazy=true
-                          :data="busVppsOptions"
+                          :multiple=false
+                          :modalShowFlag="modalShowFlag3"
+                          :drawerTitle="drawerTitle"
+                          :url="url"
+                          :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                  <tree-select
+                  <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
+                  <tree-select-new
+                          width = "800"
                           :key="key3"
-                          width = "340"
+                          :lazy=true
-                          :data="modelOptions"
+                          :multiple=false
+                          :modalShowFlag="modalShowFlag4"
+                          :drawerTitle="drawerTitle"
+                          :url="url"
+                          :urlChild="urlChild"
                           :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
+                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-input
@@ -992,9 +1014,17 @@ import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {inboundLiaisonDetail,processCreateStand} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
 export default {
   name: "bzrkStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle,
+    TreeSelect,
+    TreeSelectNew
+  },
   data () {
     return {
       activeName:'1',
@@ -1034,6 +1064,13 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      modalShowFlag1: false, // drawer开关
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      url:'',
+      urlChild:'',
+      drawerTitle: '', //drawer标题
       treeStatus:false,
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
@@ -1200,18 +1237,44 @@ export default {
       prcName : this.$route.query.prcName,
     }
   },
-  components: {
-    ProcessHeader,
-    ProcessFooter,
-    ProcessTitle,
-    TreeSelect
-  },
   computed: {
     listNoDataText () {
       return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
     },
   },
   methods: {
+    choiceZRR1 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag1 = true
+      this.key++
+    },
+    choiceZRR2 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag2 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarVppsTree/list"
+      this.urlChild="sarVppsTree/childByList"
+      this.key1++
+    },
+    choiceZRR3 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag3 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarVppsTree/list"
+      this.urlChild="sarVppsTree/childByList"
+      this.key2++
+    },
+    choiceZRR4 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag4 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarModelTree/list"
+      this.urlChild="sarModelTree/childByList"
+      this.key3++
+    },
     busVsFunc(){
       this.$http.get('sarVppsTree/list', '', {
         _this: this
@@ -1464,29 +1527,51 @@ export default {
       this.fileMadel = true
       this.fileType = type;
     },
-    popoverHide (checkedIds, checkedData) {
+    popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
       if(checkedData) {
-        this.form.standSystem = checkedData.id
+        if(checkedData.length > 0){
-        this.form.standSystemName = checkedData.menuName
+          this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+        }else {
+          this.form.standSystem = checkedData.menuName
+        }
       }
+      this.modalShowFlag1 = false
     },
-    popoverHideBusVs (checkedIds, checkedData) {
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData){
+      if(checkedData) {
-        this.form.cycvppsbm = checkedData.code
+        if(checkedData.length > 0){
-        this.form.cycvppscn = checkedData.chineseName
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
       }
+      this.modalShowFlag2 = false
     },
-    popoverHideCarVs (checkedIds, checkedData) {
+    popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData){
+      if(checkedData) {
-        this.form.kccvppsbm = checkedData.code
+        if(checkedData.length > 0){
-        this.form.kccvppscn = checkedData.chineseName
+          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
+        }
       }
+      this.modalShowFlag3 = false
     },
-    popoverHideModel (checkedIds, checkedData) {
+    popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData){
+      if(checkedData) {
-        this.form.dybxh = checkedData.model
+        if(checkedData.length > 0){
-        this.form.dymc = checkedData.name
+          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
+        }
       }
+      this.modalShowFlag4 = false
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -267,6 +267,7 @@
         :wrapperClosable="false"
         size="800px"
         @close="resetForm"
+        append-to-body
       >
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
@@ -397,11 +398,7 @@
                           class="add-form-item"
                   >
                       <template slot="label">标准体系</template>
-                      <tree-select
+                      <el-input v-model="sarStandardsInfoEO.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', sarStandardsInfoEO.standSystem)"></el-input>
-                              width = "593"
-                              :data="standSystemOptions"
-                              :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                              :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                   </el-form-item>
               </template>
               <template v-for="field in displayLocation.child">
@@ -453,12 +450,7 @@
                               class="add-form-item"
                         >
                           <template slot="label">乘用车VPPS编码</template>
-                          <tree-select
+                          <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
-                                  :disabled="false"
-                                  width = "340"
-                                  :data="busVppsOptions"
-                                  :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                  :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                       </el-form-item>
                     </template>
                     <template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -468,12 +460,7 @@
                                 class="add-form-item"
                         >
                             <template slot="label">卡车VPPS编码</template>
-                            <tree-select
+                            <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
-                                    :disabled="false"
-                                    width = "340"
-                                    :data="busVppsOptions"
-                                    :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                    :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                         </el-form-item>
                        </template>
                        <template v-else-if="field.attrField === 'DYBXH'">
@@ -483,12 +470,7 @@
                                 class="add-form-item"
                         >
                             <template slot="label">模块结构单元变型号</template>
-                            <tree-select
+                            <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                                    width = "340"
-                                    :disabled="false"
-                                    :data="modelOptions"
-                                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                         </el-form-item>
                     </template>
                     <template v-else-if="field.attrField === 'CYCVPPSCN'">
@@ -980,6 +962,46 @@
                         @click="closeModal">取消</el-button>
             </div>
         </el-drawer>
+      <!-- 组件树-->
+        <tree-select-new
+                :multiple=false
+                :lazy=false
+                :modalShowFlag="modalShowFlag1"
+                :drawerTitle="drawerTitle"
+                width = "500"
+                :data="standSystemOptions"
+                :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
+                :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+        <tree-select-new
+                width = "500"
+                :lazy=true
+                :multiple=false
+                :modalShowFlag="modalShowFlag2"
+                :drawerTitle="drawerTitle"
+                :url="url"
+                :urlChild="urlChild"
+                :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+                :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+        <tree-select-new
+                width = "500"
+                :lazy=true
+                :multiple=false
+                :modalShowFlag="modalShowFlag3"
+                :drawerTitle="drawerTitle"
+                :url="url"
+                :urlChild="urlChild"
+                :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+                :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+        <tree-select-new
+                width = "500"
+                :lazy=true
+                :multiple=false
+                :modalShowFlag="modalShowFlag4"
+                :drawerTitle="drawerTitle"
+                :url="url"
+                :urlChild="urlChild"
+                :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1234,6 +1256,7 @@ import Bus from '@/common/eventHub'
 import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
 import { interfaceUrl } from '@/sysConfig'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
 export default {
   name: 'domesticStandardsAndRegulations',
@@ -1254,7 +1277,8 @@ export default {
     CustomSVPPS,
     CustomRoleTree,
     CustomDatePickWithText2,
-    TreeSelect
+    TreeSelect,
+    TreeSelectNew
   },
   data () {
     return {
@@ -1267,6 +1291,13 @@ export default {
         children: 'children',
         label: 'menuName'
       },
+      modalShowFlag1: false, // drawer开关
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      url:'',
+      urlChild:'',
+      drawerTitle: '', //drawer标题
       nodeKey: 'id',
       nodeKeyCode: 'code',
       nodeKeyModel: 'model',
@@ -1903,27 +1934,83 @@ export default {
     }
   },
   methods: {
-      popoverHideBusVs (checkedIds, checkedData) {
+      choiceZRR1 (type, title, id) {
-        if(checkedData){
+          this.drawerTitle = title
-            this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+          this.modalShowFlag1 = true
-            this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
-            this.$forceUpdate()
-        }
       },
-      popoverHideCarVs (checkedIds, checkedData) {
+      choiceZRR2 (type, title, id) {
-        if(checkedData){
+          this.drawerTitle = title
-            this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+          this.modalShowFlag2 = true
-            this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+          this.url = ''
-            this.$forceUpdate()
+          this.urlChild = ''
-        }
+          this.url="sarVppsTree/list"
-
+          this.urlChild="sarVppsTree/childByList"
       },
-      popoverHideModel (checkedIds, checkedData) {
+      choiceZRR3 (type, title, id) {
-          if(checkedData){
+          this.drawerTitle = title
-              this.sarStandardsInfoEO.DYBXH = checkedData.model
+          this.modalShowFlag3 = true
-              this.sarStandardsInfoEO.DYMC = checkedData.name
+          this.url = ''
-              this.$forceUpdate()
+          this.urlChild = ''
+          this.url="sarVppsTree/list"
+          this.urlChild="sarVppsTree/childByList"
+      },
+      choiceZRR4 (type, title, id) {
+          this.drawerTitle = title
+          this.modalShowFlag4 = true
+          this.url = ''
+          this.urlChild = ''
+          this.url="sarModelTree/list"
+          this.urlChild="sarModelTree/childByList"
+      },
+      popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",")
+              }else {
+                  this.sarStandardsInfoEO.standSystem = checkedData.menuName
+              }
           }
+          this.modalShowFlag1 = false
+          this.$forceUpdate()
+      },
+      popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
+                  this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+              }else {
+                  this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+                  this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+              }
+          }
+          this.modalShowFlag2 = false
+          this.$forceUpdate()
+      },
+      popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
+                  this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+              }else {
+                  this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+                  this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+              }
+          }
+          this.modalShowFlag3 = false
+          this.$forceUpdate()
+      },
+      popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+          if(checkedData) {
+              if(checkedData.length > 0){
+                  this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
+                  this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
+              }else {
+                  this.sarStandardsInfoEO.DYBXH = checkedData.model
+                  this.sarStandardsInfoEO.DYMC = checkedData.name
+              }
+          }
+          this.modalShowFlag4 = false
+          this.$forceUpdate()
       },
       busVsFunc(){
           this.$http.get('sarVppsTree/list', '', {
@@ -1939,11 +2026,6 @@ export default {
               this.modelOptions = res.data
           })
       },
-      popoverHide (checkedIds, checkedData) {
-          if(checkedData){
-              this.sarStandardsInfoEO.standSystem = checkedData.id
-          }
-      },
       closeModal () {
           this.productModal = false
           this.closeDrawer()
@@ -4259,7 +4341,6 @@ export default {
       this.syzrOptions = res.data.SYRZCLASS // 适用认证
       this.getGzzOption()
       this.setMap(this.standStateOptions)
-      console.log(this.standStateOptions, '文本状态')
     }, e => {
     })
     this.getDomesticStandardTable(this.tableFlag)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -510,12 +510,7 @@
                             class="add-form-item"
                     >
                       <template slot="label">乘用车VPPS编码</template>
-                      <tree-select
+                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
-                              :disabled="false"
-                              width = "340"
-                              :data="busVppsOptions"
-                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -525,12 +520,7 @@
                             class="add-form-item"
                     >
                       <template slot="label">卡车VPPS编码</template>
-                      <tree-select
+                      <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
-                              :disabled="false"
-                              width = "340"
-                              :data="busVppsOptions"
-                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYBXH'">
@@ -540,12 +530,7 @@
                             class="add-form-item"
                     >
                       <template slot="label">模块结构单元变型号</template>
-                      <tree-select
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                              width = "340"
-                              :disabled="false"
-                              :data="modelOptions"
-                              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                              :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
@@ -1031,6 +1016,37 @@
                   @click="closeModal">取消</el-button>
         </div>
       </el-drawer>
+      <!-- 组件树-->
+      <tree-select-new
+              width = "500"
+              :lazy=true
+              :multiple=false
+              :modalShowFlag="modalShowFlag2"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :urlChild="urlChild"
+              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
+              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+      <tree-select-new
+              width = "500"
+              :lazy=true
+              :multiple=false
+              :modalShowFlag="modalShowFlag3"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :urlChild="urlChild"
+              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+              :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+      <tree-select-new
+              width = "500"
+              :lazy=true
+              :multiple=false
+              :modalShowFlag="modalShowFlag4"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1078,6 +1094,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
 import { interfaceUrl } from "@/sysConfig";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
 export default {
   name: 'foreignStandardsAndRegulations',
@@ -1098,7 +1115,8 @@ export default {
     CustomSVPPS,
     CustomRoleTree,
     CustomDatePickWithText2,
-    TreeSelect
+    TreeSelect,
+    TreeSelectNew
   },
   data () {
     return {
@@ -1114,6 +1132,13 @@ export default {
       },
         nodeKeyCode: 'code',
         nodeKeyModel: 'model',
+      modalShowFlag1: false, // drawer开关
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      url:'',
+      urlChild:'',
+      drawerTitle: '', //drawer标题
       nodeKey: 'id',
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
@@ -1722,6 +1747,71 @@ export default {
   watch: {
   },
   methods: {
+    choiceZRR2 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag2 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarVppsTree/list"
+      this.urlChild="sarVppsTree/childByList"
+    },
+    choiceZRR3 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag3 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarVppsTree/list"
+      this.urlChild="sarVppsTree/childByList"
+    },
+    choiceZRR4 (type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag4 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url="sarModelTree/list"
+      this.urlChild="sarModelTree/childByList"
+    },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      console.log(checkedData)
+      debugger
+      if(checkedData) {
+        if(checkedData.length > 0){
+          this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
+          this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+          this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+        }
+      }
+      this.modalShowFlag2 = false
+      this.$forceUpdate()
+    },
+    popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData) {
+        if(checkedData.length > 0){
+          this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
+          this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+          this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+        }
+      }
+      this.modalShowFlag3 = false
+      this.$forceUpdate()
+    },
+    popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData) {
+        if(checkedData.length > 0){
+          this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
+          this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
+        }else {
+          this.sarStandardsInfoEO.DYBXH = checkedData.model
+          this.sarStandardsInfoEO.DYMC = checkedData.name
+        }
+      }
+      this.modalShowFlag4 = false
+      this.$forceUpdate()
+    },
     // 将文本状态的id与name对应
     setMap(data){
       data.forEach(item => {
@@ -1729,28 +1819,6 @@ export default {
       })
       console.log(this.textStatusMap, '文本状态的值')
     },
-      popoverHideBusVs (checkedIds, checkedData) {
-          if(checkedData){
-              this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
-              this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
-              this.$forceUpdate()
-          }
-      },
-      popoverHideCarVs (checkedIds, checkedData) {
-          if(checkedData){
-              this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
-              this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
-              this.$forceUpdate()
-          }
-
-      },
-      popoverHideModel (checkedIds, checkedData) {
-          if(checkedData){
-              this.sarStandardsInfoEO.DYBXH = checkedData.model
-              this.sarStandardsInfoEO.DYMC = checkedData.name
-              this.$forceUpdate()
-          }
-      },
       busVsFunc(){
           this.$http.get('sarVppsTree/list', '', {
               _this: this