Browse Source

项目画像联系人取值调整,通用应用弹窗调整

qymljy 6 months ago
parent
commit
c7a6653483

+ 2 - 2
src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -516,8 +516,8 @@
                 </div>
                 <div class="peopleInfo-content">
                   <div class="leader">
-                    <div class="content" v-if="baseInfo.contacts && baseInfo.contacts.length">
-                      <div class="item" v-for="(item,index) in baseInfo.contacts" :key="index">
+                    <div class="content" v-if="baseInfo.contact && baseInfo.contact.length">
+                      <div class="item" v-for="(item,index) in baseInfo.contact" :key="index">
                         <div class="avatar">{{ item.name.substr(0,1) }}</div>
                         <div class="Info">
                           <div>

+ 7 - 0
src/HDrpManagement/workReport/modules/createReport/index.vue

@@ -19,6 +19,7 @@
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
+      :wrapperClosable="false"
       append-to-body
       size="800px"
     >
@@ -51,6 +52,12 @@
         </upload>
       </div>
       <div class="fixed__btn__panel">
+        <el-button
+            class="normal-btn-width"
+            size="small"
+            @click="drawer = false"
+        >{{ $t("取 消") }}</el-button
+        >
         <el-button
           class="normal-btn-width"
           :loading="loading"

+ 1 - 0
src/HDrpManagement/workReport/modules/reportSet/components/add.vue

@@ -7,6 +7,7 @@
       :title="$t(`汇报设置`)"
       append-to-body
       :show-close="false"
+      :wrapperClosable="false"
       :visible.sync="dialog"
       size="1100px"
     >

+ 2 - 1
src/HDrpManagement/workReport/modules/reportSet/components/edit.vue

@@ -7,6 +7,7 @@
       :title="$t(`汇报设置`)"
       append-to-body
       :show-close="false"
+      :wrapperClosable="false"
       :visible.sync="dialog"
       size="1100px"
     >
@@ -282,7 +283,7 @@ import addPeople from "./addPeople";
 import addOption from "./addOption";
 import addDepartment from "./addDepartment";
 export default {
-  name: "add",
+  name: "edit",
   props: ["data"],
   components: { selectTeam, addPeople, addOption, addDepartment },
   data() {

+ 1 - 0
src/HManagement/accountManage/modules/add.vue

@@ -7,6 +7,7 @@
       size="664px"
       direction="rtl"
       append-to-body
+      :wrapperClosable="false"
       :show-close="false"
       @close="onClose">
       <div class="drawer__panel">

+ 1 - 0
src/HManagement/accountManage/modules/edit.vue

@@ -7,6 +7,7 @@
       size="664px"
       direction="rtl"
       :show-close="false"
+      :wrapperClosable="false"
       append-to-body>
       <div class="drawer__panel">
         <el-row :gutter="20">

+ 1 - 1
src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">{{$t('新建联系人')}}</el-button>
-    <el-drawer :title="$t(`新建联系人`)" append-to-body :visible.sync="dialogFormVisible" size="664px" @close="onClose">
+    <el-drawer :title="$t(`新建联系人`)" append-to-body :visible.sync="dialogFormVisible" size="664px" @close="onClose" :wrapperClosable="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="tool.onlyZh('90px')" size="small">

+ 1 - 1
src/HManagement/addressList/mycontact/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-button type="text" size="small" icon="el-icon-edit" @click="onShow(dialogFormVisible = true)" style="color:#333">{{$t('编 辑')}}</el-button>
-    <el-drawer :title="$t(`编辑联系人`)" append-to-body :visible.sync="dialogFormVisible" size="664px">
+    <el-drawer :title="$t(`编辑联系人`)" append-to-body :visible.sync="dialogFormVisible" size="664px" :wrapperClosable="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" :label-width="tool.onlyZh('90px')" size="small">

+ 1 - 1
src/HManagement/department/staff/list/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">{{ $t('新建员工') }}</el-button>
-  <el-drawer :title="$t(`新建员工`)" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="onClose" :show-close="false">
+  <el-drawer :title="$t(`新建员工`)" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="onClose" :show-close="false" :wrapperClosable="false">
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" :label-width="tool.onlyZh('100px')">

+ 1 - 1
src/HManagement/department/staff/list/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-button type="default" size="mini" @click="onShow">{{$t('编 辑')}}</el-button>
-  <el-drawer :title="$t(`编辑员工`)" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()" :show-close="false">
+  <el-drawer :title="$t(`编辑员工`)" direction="rtl" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="$refs.form.clearValidate()" :show-close="false" :wrapperClosable="false">
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" :label-width="tool.onlyZh('100px')">

+ 1 - 0
src/HManagement/roleManage/modules/add.vue

@@ -4,6 +4,7 @@
     <el-drawer
       :title="$t(`创建角色`)"
       :visible.sync="drawer"
+      :wrapperClosable="false"
       append-to-body
       size="80%"
       direction="rtl">

+ 1 - 0
src/HManagement/roleManage/modules/edit.vue

@@ -5,6 +5,7 @@
       :title="$t(`编辑角色`)"
       :visible.sync="drawer"
       append-to-body
+      :wrapperClosable="false"
       size="30%"
       direction="rtl">
       <div class="drawer__panel">

+ 1 - 0
src/HManagement/task/modules/add.vue

@@ -10,6 +10,7 @@
         direction="rtl"
         append-to-body
         :show-close="false"
+        :wrapperClosable="false"
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">

+ 1 - 0
src/HManagement/task/modules/edit.vue

@@ -10,6 +10,7 @@
         direction="rtl"
         append-to-body
         :show-close="false"
+        :wrapperClosable="false"
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">