up

src/views/company/Add.vue

@@ -70,7 +70,7 @@
                             </el-select>
                     </el-form-item>
                     <el-form-item label="上级公司" class="req">
-                            <el-select clearable v-model="form.parent_id" placeholder="请选择">
+                            <el-select clearable filterable v-model="form.parent_id" placeholder="请选择">
                                 <el-option v-for="(item,index) in company" :key="index" :label="item.name" :value="item.id"></el-option>
                             </el-select>
                     </el-form-item>

src/views/government/Index.vue

@@ -153,7 +153,7 @@
                 </el-form>
             </li>
             <li class="company" v-show="show">
-                <h1 v-if="form.id"><span style="width:75%;display:inline-block;">{{form.name}}下属企业</span>  <el-button @click="dialogFormVisible=true" size='mini' type="primary">添加</el-button></h1>
+                <h1 v-if="form.id"><span style="width:75%;display:inline-block;">{{form.name}}监管企业</span>  <el-button @click="dialogFormVisible=true" size='mini' type="primary">添加</el-button></h1>
                 <p v-for="item in form.enterprise" :key="item.id">{{item.name}}
                     <el-button
                             type="text"
@@ -169,7 +169,7 @@
     <el-dialog title="添加下属企业" :visible.sync="dialogFormVisible" width="500px" :close-on-click-modal='false' :close-on-press-escape='false'>
         <el-form :model="form">
             <el-form-item label="企业名称" >
-                <el-select v-model="enterprise.enterprise_id" placeholder="请选择">
+                <el-select filterable v-model="enterprise.enterprise_id" placeholder="请选择">
                     <el-option v-for="(item,index) in enterpriseList" :key="index" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>

src/views/task/Danger.vue

@@ -160,7 +160,7 @@ export default {
 	methods: {
         addNode(data,curnode,target){
             let curid = curnode.id;
-            let curname = curnode.name;
+            let curname = curnode.name;         
             data.forEach((item,i)=>{
                 if(item.id==curid&&item.name==curname){
                     const newChild = { id: target.id, name: target.name, children: [] };
@@ -192,6 +192,9 @@ export default {
         getData(){
             this.$api.getRiskpointList({name:this.filterText}).then(res=>{
                 this.data=res.data.data
+                this.form.enterprise_name=res.data.data[0].name
+                this.form.enterprise_id=res.data.data[0].id
+                this.curNode = res.data.data[0];
             })
         },
         edit(data){
@@ -202,7 +205,7 @@ export default {
             })
         },
         append(data){
-            console.log(this.data,33333333333)
+            // console.log(this.data,33333333333)
             this.curNode = data;
             // this.addNode(this.data,data,target)
             console.log(data)
@@ -244,6 +247,10 @@ export default {
         },
         save(){
           var parm=this.form;
+          if(!parm.enterprise_name){
+                this.$message.error('请选择公司名称');
+                return;
+          }
           if(!parm.name){
                 this.$message.error('请输入风险点名称');
                 return;