添加弹窗属性

src/utils/model/date/index.vue

@@ -40,7 +40,9 @@
         title="设置"
         :visible.sync="dialogVisible"
         width="30%"
-        :before-close="handleClose">
+        :before-close="handleClose"
+        :append-to-body="true" 
+        :close-on-click-modal="false">
         <div>
             <el-radio-group v-model="radio">
                 <div v-for="item in typeList" :key="item.value" class="radio">

src/utils/model/upload/index.vue

@@ -54,7 +54,8 @@
       :visible.sync="dialogVisible"
       width="500px"
       :before-close="handleClose"
-      :append-to-body="true">
+      :append-to-body="true" 
+      :close-on-click-modal="false">
       <div slot="title">提示信息<span class="title" ><i class="el-icon-warning"></i></span></div>
       <div>
         <div v-if="discontent.length>0">

src/views/analyse/custom/components/Tabs/DataItem.vue

@@ -44,7 +44,7 @@
         </template>
       </el-container>
     </div>
-    <el-dialog title="编辑" :visible.sync="dialogVisible" width="700px" append-to-body>
+    <el-dialog title="编辑" :visible.sync="dialogVisible" width="700px" :append-to-body="true"  :close-on-click-modal="false">
       <div class="sc-form-table">
         <el-table :data="copyData" border>
           <el-table-column type="index" width="50" fixed="left">

src/views/analyse/custom/index.vue

@@ -54,7 +54,7 @@
       </el-container>
     </el-container>
 
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose">
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" :append-to-body="true"  :close-on-click-modal="false">
       <el-form v-if="dialogVisible" ref="ruleForm" :model="form2" :rules="rules" label-position="left" label-width="100px">
         <el-form-item label="所属组" prop="parentId" v-if="form2.type">
           <el-select v-model="form2.parentId" filterable allow-create placeholder="请选择" style="width: 100%">

src/views/analyse/report/create/index.vue

@@ -21,7 +21,7 @@
         <patent-list ref="patentList" v-if="showList" @submit="handleConfirm2" />
       </el-main>
     </el-container>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="900px" :before-close="handleClose">
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="900px" :before-close="handleClose" :append-to-body="true"  :close-on-click-modal="false">
       <el-form inline>
         <el-form-item label="模板名称">
           <el-input v-model="queryParams.name" placeholder="请输入模板名称" size="small"></el-input>
@@ -63,7 +63,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="dialogVisible2" width="450px" :before-close="handleClose2">
+    <el-dialog :title="title" :visible.sync="dialogVisible2" width="450px" :before-close="handleClose2" :append-to-body="true"  :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="ruleForm" label-width="80px">
         <el-form-item label="报告名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入报告名称"></el-input>

src/views/client/index.vue

@@ -67,7 +67,7 @@
       </el-footer>
     </el-container>
 
-    <el-dialog :title="title" :visible.sync="visible" width="500px" :before-close="close" append-to-body>
+    <el-dialog :title="title" :visible.sync="visible" width="500px" :before-close="close" :append-to-body="true"  :close-on-click-modal="false">
       <el-form v-if="visible" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
         <el-form-item label="客户名称" prop="name">
           <el-autocomplete style="width:100%" v-model="ruleForm.name" :fetch-suggestions="querySearch" @input="input"

src/views/components/dialog/examine.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 审核任务弹窗 -->
   <div>
-    <el-dialog title="添加审核任务" :visible.sync="showTask" width="500px" @close="handleCloseTask"
+    <el-dialog title="添加审核任务" :visible.sync="showTask" width="500px" @close="handleCloseTask" :append-to-body="true"
       :close-on-click-modal="false">
       <el-form :model="form" :rules="TaskRules" ref="form" label-width="120px">
         <el-form-item label="任务名称：" prop="name">

src/views/components/dialog/nodeCopy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="nodeCopy">
-    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="700px"
+    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="700px" :append-to-body="true"
       :close-on-click-modal="false">
         <div>
             <div class="margin-bottom_10">

src/views/components/dialog/person.vue

@@ -5,7 +5,9 @@
         :visible.sync="dialogVisible"
         width="700px"
         :before-close="handleClose"
-        :append-to-body="true">
+        :append-to-body="true" 
+        :close-on-click-modal="false"
+        >
         <div>
             <client-table :personIds="personIds" :persons="persons" @getPersonIds="getPersonIds"></client-table>
         </div>

src/views/components/drawer/Field.vue

@@ -61,7 +61,7 @@
       </el-container>
     </el-drawer>
 
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" append-to-body destroy-on-close :before-close="cancel" top="10vh">
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :append-to-body="true"  :close-on-click-modal="false" destroy-on-close :before-close="cancel" top="10vh">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
         <el-form-item label="字段名称" prop="name">
           <el-input v-model="ruleForm.name" placeholder="请输入字段名称"></el-input>

src/views/components/import/conditionImport/components/projectListDialog.vue

@@ -5,34 +5,41 @@
       :visible.sync="dialogVisible"
       width="500px"
       :before-close="handleClose"
+      :append-to-body="true" 
+      :close-on-click-modal="false"
     >
       <div>
         <el-form ref="form" :model="form" :rules="rules" >
-          <el-form-item label="导入到:">
-            <el-select v-model="form.importToType" clearable @change="changeImportToType" placeholder="请选择">
-                <el-option
-                  v-for="(item,key) in importToTypes"
-                  :key="item"
-                  :label="item"
-                  :value="key"
-                >
-                </el-option>
-              </el-select>
-          </el-form-item>
-          <el-form-item v-if="form.importToType || form.importToType == 0 " :label="'选择' + (importToTypes[form.importToType]?importToTypes[form.importToType]:'')" prop="importToId">
-            <div >
-              <el-select v-model.number="form.importToId" filterable remote clearable @change="changeProjectId" placeholder="请选择" v-SelectLazyLoading="lazyLoading" :remote-method="remoteMethod">
-                <el-option
-                  v-for="item in ods.data"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="parseInt(item.id)"
-                >
-                </el-option>
-              </el-select>
-            <!-- <el-button @click="addProject"><i class="el-icon-plus"></i></el-button> -->
+          <template v-if="firstShow">
+            <div>
+              <el-form-item label="导入到:">
+                <el-select v-model="form.importToType" clearable @change="changeImportToType" placeholder="请选择">
+                    <el-option
+                      v-for="(item,key) in importToTypes"
+                      :key="item"
+                      :label="item"
+                      :value="key"
+                    >
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+              <el-form-item v-if="form.importToType || form.importToType == 0 " :label="'选择' + (importToTypes[form.importToType]?importToTypes[form.importToType]:'')" prop="importToId">
+                <div >
+                  <el-select v-model.number="form.importToId" filterable remote clearable @change="changeProjectId" placeholder="请选择" v-SelectLazyLoading="lazyLoading" :remote-method="remoteMethod">
+                    <el-option
+                      v-for="item in ods.data"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="parseInt(item.id)"
+                    >
+                    </el-option>
+                  </el-select>
+                <!-- <el-button @click="addProject"><i class="el-icon-plus"></i></el-button> -->
+                </div>
+              </el-form-item>
             </div>
-          </el-form-item>
+          </template>
+          
           <!-- <el-form-item label="作为对比文件">
                   <el-switch
                     v-model="form.asCompare"
@@ -229,7 +236,8 @@ export default {
           },
           loading:false,
       },
-      rules:{}
+      rules:{},
+      firstShow:true,
     };
   },
   watch: {},
@@ -244,7 +252,11 @@ export default {
       };
       if (this.form.importToType) {
         this.title = `导入到${this.importToTypes[this.form.importToType]}`;
-      } else [(this.title = `导入专利`)];
+        this.firstShow = false
+      } else {
+          this.title = `导入专利`
+          this.firstShow = true
+      };
       if (this.form.importToId) {
 
       }

src/views/components/import/conditionImport/search.vue

@@ -21,7 +21,7 @@
             <component :is='isComponent' @search="search" :countryList="countryList" :DBType="DBType"></component>
         </div>
 
-        <el-dialog title="检索历史" :visible.sync="dialogVisible" width="1200px" :close-on-click-modal="false">
+        <el-dialog title="检索历史" :visible.sync="dialogVisible" width="1200px" :append-to-body="true" :close-on-click-modal="false">
             <div>
                 <searchHistory ref="searchHistory" :importData="importData"></searchHistory> 
             </div>

src/views/components/import/task/components/index.vue

@@ -150,9 +150,26 @@ export default {
   methods: {
     initTask() {
       var webSocket = this.webSocket
+      console.log(webSocket)
       webSocket.onmessage = (e) => {
         const { code, data, message } = JSON.parse(e.data)
         console.log({ code, data, message });
+//         var a = {
+//     "code": 903,
+//     "data": {
+//         "total": 9,
+//         "index": 0,
+//         "taskId": 117,
+//         "taskStatus": 1,
+//         "complete": false,
+//         "url": "",
+//         "fileName": "cd30d6d6285d49229be2a73c6812f457",
+//         "taskType": 1,
+//         "percentage": 0,
+//         "oldName": ""
+//     },
+//     "message": "WebSocket请求成功"
+// }
         // if (code === 903 || code === 904) {
         //   const index = this.tableData.findIndex(item=>{return item.id == data.taskId})
         //   // const index = this.taskData.findIndex(item=>{return item.id == data.id})

src/views/event/components/details/visualDialog.vue

@@ -4,7 +4,9 @@
       :title="visuals.Scenario[0]+'场景应对流程'"
       :visible.sync="visible"
       width="1200px"
-      :before-close="handleClose">
+      :before-close="handleClose"
+      :append-to-body="true" 
+      :close-on-click-modal="false">
       <visual :visuals='visuals'></visual>
     </el-dialog>
   </div>

src/views/event/components/dialog/addEvent.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="addEvent">
-    <el-dialog :title="title" :visible.sync="dialogVisible" :width="width" :before-close="handleClose">
+    <el-dialog :title="title" :visible.sync="dialogVisible" :width="width" :before-close="handleClose" :append-to-body="true" :close-on-click-modal="false">
       <!-- 单个新增（事件） -->
       <div v-if="type == 1">
         <el-form :model="formData[0]" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">

src/views/layout/components/UserBar.vue

@@ -49,7 +49,7 @@
       </template>
     </el-dropdown>
 
-    <el-dialog title="修改密码" :visible.sync="changePwdDialogVisible" width="500px">
+    <el-dialog title="修改密码" :visible.sync="changePwdDialogVisible" width="500px" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="changePwdRuleForm" :rules="changePwdRules" ref="changePwdRuleForm" v-if="changePwdDialogVisible">
         <el-form-item label="旧密码" prop="oldPassword">
           <el-input v-model="changePwdRuleForm.oldPassword" type="password" placeholder="输入旧密码" />
@@ -66,7 +66,7 @@
         <el-button type="primary" @click="submitChangePwd" :loading="btnLoading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="个人信息" :visible.sync="userinfoDialogVisible" width="500px">
+    <el-dialog title="个人信息" :visible.sync="userinfoDialogVisible" width="500px" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="userinfoRuleForm" :rules="userinfoRules" ref="userinfoRuleForm" v-if="userinfoDialogVisible">
         <el-form-item label="用户名" required>
           <el-input v-model="userinfoRuleForm.username" placeholder="" disabled />
@@ -92,7 +92,7 @@
         <el-button type="primary" @click="submitUserinfo" :loading="btnLoading">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog width="1000px" :title="clientTitle" :visible.sync="clientVisible" :before-close="close">
+    <el-dialog width="1000px" :title="clientTitle" :visible.sync="clientVisible" :before-close="close" :append-to-body="true" :close-on-click-modal="false">
       <div style="height:600px">
         <ClientManage></ClientManage>
       </div>

src/views/layout/components/field.vue

@@ -60,7 +60,7 @@
           </el-footer> -->
         </el-container>
 
-      <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" append-to-body destroy-on-close :before-close="cancel" top="10vh">
+      <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :append-to-body="true" :close-on-click-modal="false" destroy-on-close :before-close="cancel" top="10vh">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
           <el-form-item label="字段名称" prop="name">
             <el-input v-model="ruleForm.name" placeholder="请输入字段名称"></el-input>

src/views/layout/components/setStyle.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="样式设置" :visible.sync="styleVisible" width="600px">
+        <el-dialog title="样式设置" :visible.sync="styleVisible" width="600px" :append-to-body="true" :close-on-click-modal="false">
             <div>
                 <el-form :model="form" label-position="right" label-width="100px">
                     <el-form-item label="字体大小：">

src/views/login/compoments/resePassword.vue

@@ -5,6 +5,7 @@
       :visible.sync="visible"
       width="500px"
       :before-close="close"
+      :append-to-body="true"
       :close-on-click-modal="false">
 
       <el-form :model="form" :rules="rules" ref="ruleForm" class="demo-ruleForm">

src/views/patentMining/components/dialog/addAndEditProject.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="850px" :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="850px" :before-close="handleClose" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="form" status-icon :rules="rules" ref="form" label-width="120px" class="demo-form">
         <template>
           <el-divider content-position="left">挖掘项目</el-divider>

src/views/patentMining/components/dialog/auditRecords.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 任务审核记录 -->
   <div class="auditRecords">
-    <el-dialog title="查看审核记录" :visible.sync="dialogVisible" width="1000px" :before-close="handleClose"
+    <el-dialog title="查看审核记录" :visible.sync="dialogVisible" width="1000px" :before-close="handleClose" :append-to-body="true"
       :close-on-click-modal="false">
       <el-table :data="tableData" style="width: 100%;" border header-row-class-name="custom-table-header"
         @sort-change="sortChange">

src/views/patentMining/components/dialog/createTask.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 创建挖掘任务弹窗 -->
   <div class="createTask">
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose"
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" :append-to-body="true"
       :close-on-click-modal="false">
       <el-form :model="form" status-icon :rules="rules" ref="form" label-width="120px" class="demo-ruleForm">
         <el-form-item label="任务名称：" prop="name">

src/views/patentMining/components/dialog/handleTask1.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 处理挖掘任务1（项目审核任务弹窗） -->
   <div class="handleTask1">
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="800px" :before-close="handleClose"
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="800px" :before-close="handleClose" :append-to-body="true"
       :close-on-click-modal="false">
       <el-form :model="form" status-icon :rules="rules" ref="form" label-width="120px" class="demo-ruleForm">
         <el-row>

src/views/patentMining/components/dialog/handleTask2.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 处理挖掘任务2（文件分配任务弹窗） -->
-  <div class="handleTask2">
-    <el-dialog ref="dialog" :title="title" :visible.sync="dialogVisible" width="900px" :before-close="handleClose"
+  <div class="handleTask2"> 
+    <el-dialog ref="dialog" :title="title" :visible.sync="dialogVisible" width="900px" :before-close="handleClose" :append-to-body="true"
       :close-on-click-modal="false">
 
       <el-form :model="form" status-icon :rules="rules" ref="form" label-position="top" label-width="120px"

src/views/patentMining/components/dialog/uploadFile.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="uploadFile">
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="600px" :before-close="handleClose"
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" :append-to-body="true"
       :close-on-click-modal="false" label-width="300px">
       <el-form :model="form" status-icon :rules="rules" ref="form" label-width="120px" class="demo-ruleForm">
         

src/views/product/components/dialog/addEditCategory.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增编辑产品类别 -->
   <div class="addEditCategory">
-    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="700px" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="700px" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
         <el-form-item label="类别名称" prop="name" >
           <el-input v-model="form.name" placeholder="请输入类别名称"></el-input>

src/views/product/components/dialog/addEditProduct.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 新增/编辑产品 -->
   <div class="addEditProduct">
-    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="600px" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="600px" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-form-item label="所属产品类别" prop="categoryId">
           <el-select

src/views/product/components/dialog/classifyNode.vue

@@ -2,7 +2,7 @@
   <!-- 新增/编辑架构分类节点 -->
   <div class="classifyNode">
     <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="600px"
-      :close-on-click-modal="false">
+    :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="row.type==1?'所属类别名称':'所属产品名称'" prop="productName">
           <el-input v-model="form.productName" disabled placeholder="请输入所属产品名称"></el-input>

src/views/product/components/dialog/marketing.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 营销数据 -->
   <div class="marketing">
-    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="1000px" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="dialogVisible" :before-close="handleClose" width="1000px" :append-to-body="true" :close-on-click-modal="false">
       <productMarket :id="productData.id" :licenseRate="productData.licenseRate"></productMarket>
     </el-dialog>
   </div>

src/views/project/components/drawer/form.vue

@@ -151,12 +151,12 @@
       </el-container>
     </el-drawer>
 
-    <el-dialog title="选择委托方" :visible.sync="visible" width="800px" append-to-body destroy-on-close :before-close="close2"
+    <el-dialog title="选择委托方" :visible.sync="visible" width="800px" :append-to-body="true" :close-on-click-modal="false" destroy-on-close :before-close="close2"
       top="10vh">
       <ClientTable :choseClient="true" @getClient="getClient"></ClientTable>
     </el-dialog>
 
-    <el-dialog title="选择产品或产品类别" :visible.sync="productVisible" width="1000px" append-to-body destroy-on-close :before-close="closeProduct">
+    <el-dialog title="选择产品或产品类别" :visible.sync="productVisible" width="1000px" :append-to-body="true" :close-on-click-modal="false" destroy-on-close :before-close="closeProduct">
       <div style="height:550px">
         <product :isChoose="true" @chooseItem="chooseItem"></product>
       </div>
@@ -342,6 +342,7 @@ export default {
 
       this.personnelList.data = []
       this.personnelList.queryParams.name = ''
+      console.log(this.ruleForm)
       if(this.ruleForm.headId){
         this.personnelList.queryParams.id = this.ruleForm.headId
         await this.getPersonnelList(1)

src/views/project/patentCollection/components/filter/Query.vue

@@ -62,7 +62,7 @@
       </el-footer>
     </el-container>
 
-    <el-dialog title="管理过滤字段" :visible.sync="visible" width="630px" append-to-body destroy-on-close :before-close="close" top="10vh">
+    <el-dialog title="管理过滤字段" :visible.sync="visible" width="630px" :append-to-body="true" :close-on-click-modal="false" destroy-on-close :before-close="close" top="10vh">
       <div class="paten-query-filter-dialog">
         <el-transfer
             class="transfer"

src/views/report/components/dialog/addAndEditReport.vue

@@ -204,7 +204,7 @@
     </el-dialog>
 
     <!-- 审核弹窗,做公用组件 -->
-    <el-dialog title="添加审核任务" :visible.sync="showTask" width="500px" @close="handleCloseTask">
+    <el-dialog title="添加审核任务" :visible.sync="showTask" width="500px" @close="handleCloseTask" :append-to-body="true" :close-on-click-modal="false">
       <el-form :model="taskForm" :rules="TaskRules" ref="TaskForm" label-width="120px" v-loading="loading">
         <el-form-item label="任务名称：" prop="taskName">
           <el-input v-model="taskForm.taskName" type="text" placeholder="输入任务名称" />
@@ -232,13 +232,13 @@
     </el-dialog>
 
     <!-- 无效应对报告下一步所打开弹窗 -->
-    <el-dialog :visible.sync="showEvidenceAndRequest" width="1000px" :close-on-click-modal="false">
+    <el-dialog :visible.sync="showEvidenceAndRequest" width="1000px" :append-to-body="true" :close-on-click-modal="false">
       <evidenceAndRequest ref="evidence" :examine="true" :reportId="reportId" @show="showEvidenceAndRequest = false">
       </evidenceAndRequest>
     </el-dialog>
 
     <!-- 委托方弹窗 -->
-    <el-dialog title="选择委托方" :visible.sync="visible" width="800px" append-to-body destroy-on-close :before-close="close2"
+    <el-dialog title="选择委托方" :visible.sync="visible" width="800px" :append-to-body="true" :close-on-click-modal="false" destroy-on-close :before-close="close2"
       top="10vh">
       <ClientTable :choseClient="true" @getClient="getClient"></ClientTable>
     </el-dialog>