ysy 2 lat temu
rodzic
commit
e71978e67a
39 zmienionych plików z 42 dodań i 42 usunięć
  1. 1 1
      src/components/select/SelectUser/index.vue
  2. 1 1
      src/components/select/organization/components/org-edit.vue
  3. 1 1
      src/components/select/organization/components/org-user-edit.vue
  4. 1 1
      src/layout/components/password-modal.vue
  5. 1 1
      src/views/classifyManage/treeClassify/components/classifyManageEdit.vue
  6. 1 1
      src/views/classifyManage/treeClassify/components/list-edit.vue
  7. 1 0
      src/views/example/document/components/file-sort.vue
  8. 1 1
      src/views/extension/file/components/folder-add.vue
  9. 1 1
      src/views/extension/file/components/name-edit.vue
  10. 1 1
      src/views/extension/markdown/index.vue
  11. 1 1
      src/views/factoryModel/station/components/ProduceDialog.vue
  12. 1 1
      src/views/list/advanced/index.vue
  13. 1 1
      src/views/material/materialBOM/components/edit-dialog.vue
  14. 1 1
      src/views/material/product/components/MaterialAdd.vue
  15. 2 2
      src/views/material/product/components/MaterialModal.vue
  16. 1 2
      src/views/material/product/components/aridRegion.vue
  17. 1 1
      src/views/material/product/components/goodsAllocation.vue
  18. 1 1
      src/views/material/product/components/link-material-dialog.vue
  19. 1 1
      src/views/material/product/components/mouldDialog.vue
  20. 1 1
      src/views/rulesManagement/components/programRulesDialog.vue
  21. 1 1
      src/views/system/dictionary/components/dict-data-edit.vue
  22. 1 1
      src/views/system/organization/components/org-edit.vue
  23. 1 1
      src/views/system/organization/components/org-user-edit.vue
  24. 1 1
      src/views/system/role/components/role-edit.vue
  25. 1 1
      src/views/system/user/components/user-edit.vue
  26. 1 1
      src/views/technology/control/components/user-edit.vue
  27. 1 1
      src/views/technology/parameter/components/user-edit.vue
  28. 1 1
      src/views/technology/productParam/components/user-edit.vue
  29. 1 1
      src/views/technology/production/components/parameter/components/user-edit.vue
  30. 1 1
      src/views/technology/production/components/user-edit.vue
  31. 2 2
      src/views/technology/production/components/user-setting.vue
  32. 1 1
      src/views/technology/route/components/production/components/parameter/components/user-edit.vue
  33. 1 1
      src/views/technology/route/components/production/components/user-edit.vue
  34. 2 2
      src/views/technology/route/components/production/components/user-setting.vue
  35. 1 1
      src/views/technology/route/components/user-detail.vue
  36. 1 1
      src/views/technology/route/components/user-edit.vue
  37. 1 1
      src/views/technology/route/components/user-taskinstance.vue
  38. 1 1
      src/views/technology/version/components/user-edit.vue
  39. 1 1
      src/views/technology/work/components/user-edit.vue

+ 1 - 1
src/components/select/SelectUser/index.vue

@@ -3,7 +3,7 @@
     width="980px"
     height="60%"
     :visible="visibleInChild"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     fullscreen
     maxable

+ 1 - 1
src/components/select/organization/components/org-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="680px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改机构' : '添加机构'"
     @update:visible="updateVisible"

+ 1 - 1
src/components/select/organization/components/org-user-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="800px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改用户' : '添加用户'"
     @update:visible="updateVisible"

+ 1 - 1
src/layout/components/password-modal.vue

@@ -5,7 +5,7 @@
     title="修改密码"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     @update:visible="updateVisible"
     @closed="onClose"
   >

+ 1 - 1
src/views/classifyManage/treeClassify/components/classifyManageEdit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="500px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :title="isUpdate ? '编辑分类信息' : '新增分类信息'"
     @update:visible="updateVisible"
   >

+ 1 - 1
src/views/classifyManage/treeClassify/components/list-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="500px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :title="isUpdate ? '编辑分类信息' : '新增分类信息'"
     @update:visible="updateVisible"
   >

+ 1 - 0
src/views/example/document/components/file-sort.vue

@@ -4,6 +4,7 @@
     width="1100px"
     :visible="visible"
     title="卷内文件调整"
+    :close-on-click-modal="false"
     custom-class="demo-file-sort-dialog"
     @update:visible="updateVisible"
   >

+ 1 - 1
src/views/extension/file/components/folder-add.vue

@@ -3,7 +3,7 @@
     width="460px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     title="新建文件夹"
     @update:visible="updateVisible"

+ 1 - 1
src/views/extension/file/components/name-edit.vue

@@ -3,7 +3,7 @@
     width="460px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     title="重命名"
     @update:visible="updateVisible"

+ 1 - 1
src/views/extension/markdown/index.vue

@@ -17,7 +17,7 @@
       />
     </el-card>
     <!-- 内容弹窗 -->
-    <ele-modal width="400px" title="编辑器内容" :visible.sync="showViewContent">
+    <ele-modal  width="400px" title="编辑器内容" :visible.sync="showViewContent">
       <div>{{ content }}</div>
     </ele-modal>
   </div>

+ 1 - 1
src/views/factoryModel/station/components/ProduceDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <ele-modal width="70vw" :visible.sync="visible" :close-on-click-modal="true" append-to-body
+  <ele-modal width="70vw" :visible.sync="visible" :close-on-click-modal="false" append-to-body
     custom-class="ele-dialog-form" title="选择工序">
     <el-form label-width="120px">
       <el-row>

+ 1 - 1
src/views/list/advanced/index.vue

@@ -132,7 +132,7 @@
     <ele-modal
       width="460px"
       :visible.sync="visible"
-      :close-on-click-modal="true"
+      :close-on-click-modal="false"
       :title="form.id ? '任务编辑' : '任务添加'"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="82px">

+ 1 - 1
src/views/material/materialBOM/components/edit-dialog.vue

@@ -129,7 +129,7 @@
 
     <!-- 添加工序 -->
 
-    <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="false"
       @update:visible="closeAdd">
       <Production :tableData="productionList" ref="ProductionCom" :isRadio="true" />
       <template v-slot:footer>

+ 1 - 1
src/views/material/product/components/MaterialAdd.vue

@@ -1,6 +1,6 @@
 
 <template>
-    <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="false"
         custom-class="ele-dialog-form" title="物料BOM" @update:visible="updateVisible">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <header-title title="物料BOM"> </header-title>

+ 2 - 2
src/views/material/product/components/MaterialModal.vue

@@ -1,6 +1,6 @@
 
 <template>
-    <ele-modal width="1260px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1260px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="false"
         custom-class="ele-dialog-form" title="选择物料" @update:visible="updateVisible">
         <header-title title="基本信息"></header-title>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -168,7 +168,7 @@
 
         <!-- 添加工序 -->
 
-        <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="true"
+        <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="false"
             @update:visible="closeAdd">
             <Production :tableData="tableData" ref="ProductionCom" />
             <template v-slot:footer>

+ 1 - 2
src/views/material/product/components/aridRegion.vue

@@ -1,6 +1,5 @@
 <template>
-  <ele-modal :visible.sync="visible" title="干燥区管理" width="60%" @close="cancel">
-
+  <ele-modal :visible.sync="visible" title="干燥区管理" width="60%"   :close-on-click-modal="false" @close="cancel">
 
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-row>

+ 1 - 1
src/views/material/product/components/goodsAllocation.vue

@@ -1,5 +1,5 @@
 <template>
-  <ele-modal :visible.sync="visible" title="货位管理" width="60%" @close="cancel">
+  <ele-modal :visible.sync="visible" :close-on-click-modal="false"  title="货位管理" width="60%" @close="cancel">
 
 
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">

+ 1 - 1
src/views/material/product/components/link-material-dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <ele-modal :visible.sync="visible" title="" width="95%" @close="cancel">
+  <ele-modal :visible.sync="visible" title=""   :close-on-click-modal="false" width="95%" @close="cancel">
     <el-row :gutter="40">
       <el-col :span="11">
         <headerTitle>

+ 1 - 1
src/views/material/product/components/mouldDialog.vue

@@ -1,6 +1,6 @@
 
 <template>
-    <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="false"
         custom-class="ele-dialog-form" title="选择物料" @update:visible="updateVisible">
         <header-title title="基本信息"></header-title>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">

+ 1 - 1
src/views/rulesManagement/components/programRulesDialog.vue

@@ -353,7 +353,7 @@
       :visible="addDialog"
       :append-to-body="true"
       title="规则配置"
-      :close-on-click-modal="true"
+      :close-on-click-modal="false"
       @update:visible="closeAdd"
     >
       <el-select

+ 1 - 1
src/views/system/dictionary/components/dict-data-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="460px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :title="isUpdate ? '修改字典项' : '添加字典项'"
     @update:visible="updateVisible"
   >

+ 1 - 1
src/views/system/organization/components/org-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="880px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改机构' : '添加机构'"
     @update:visible="updateVisible"

+ 1 - 1
src/views/system/organization/components/org-user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="800px" :visible="visible" :close-on-click-modal="true" custom-class="ele-dialog-form"
+  <ele-modal width="800px" :visible="visible" :close-on-click-modal="false" custom-class="ele-dialog-form"
     :title="isUpdate ? '修改人员' : '添加人员'" @update:visible="updateVisible">
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
       <el-row :gutter="15">

+ 1 - 1
src/views/system/role/components/role-edit.vue

@@ -3,7 +3,7 @@
   <ele-modal
     width="460px"
     :visible="visible"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     :title="isUpdate ? '修改角色' : '添加角色'"
     @update:visible="updateVisible"
   >

+ 1 - 1
src/views/system/user/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="720px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改用户' : '添加用户'"
     @update:visible="updateVisible"

+ 1 - 1
src/views/technology/control/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="960px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改工序控制码' : '添加工序控制码'"
     @update:visible="updateVisible"

+ 1 - 1
src/views/technology/parameter/components/user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="960px" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="960px" :visible="visible" :append-to-body="true" :close-on-click-modal="false"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改参数' : '添加参数'" @update:visible="updateVisible">
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">

+ 1 - 1
src/views/technology/productParam/components/user-edit.vue

@@ -1,6 +1,6 @@
 
 <template>
-  <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="1160px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="false"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改参数' : '添加参数'" @update:visible="updateVisible">
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">

+ 1 - 1
src/views/technology/production/components/parameter/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="960px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改参数' : '添加参数'"
     @update:visible="updateVisible"

+ 1 - 1
src/views/technology/production/components/user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="960px" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="960px" :visible="visible" :append-to-body="true" :close-on-click-modal="false"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改工序' : '添加工序'" @update:visible="updateVisible">
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">

+ 2 - 2
src/views/technology/production/components/user-setting.vue

@@ -4,7 +4,7 @@
     width="1060px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="`给工序配置参数`"
     @update:visible="updateVisible"
@@ -90,7 +90,7 @@
       width="1720px"
       :visible="addDialog"
       :append-to-body="true"
-      :close-on-click-modal="true"
+      :close-on-click-modal="false"
       @update:visible="closeAdd"
       custom-class="ele-dialog-form"
     >

+ 1 - 1
src/views/technology/route/components/production/components/parameter/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="960px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改参数' : '添加参数'"
     @update:visible="updateVisible"

+ 1 - 1
src/views/technology/route/components/production/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="960px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改工序' : '添加工序'"
     @update:visible="updateVisible"

+ 2 - 2
src/views/technology/route/components/production/components/user-setting.vue

@@ -4,7 +4,7 @@
     width="1060px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="`给工序配置参数`"
     @update:visible="updateVisible"
@@ -90,7 +90,7 @@
       width="1720px"
       :visible="addDialog"
       :append-to-body="true"
-      :close-on-click-modal="true"
+      :close-on-click-modal="false"
       @update:visible="closeAdd"
       custom-class="ele-dialog-form"
     >

+ 1 - 1
src/views/technology/route/components/user-detail.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-    <ele-modal width="1060px" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1060px" :visible="visible" :append-to-body="true" :close-on-click-modal="false"
         custom-class="ele-dialog-form" title="修改工艺详情" @update:visible="updateVisible">
         <header-title title="基本信息"> </header-title>
         <el-form ref="form" :model="form" :rules="rules" label-width="140px">

+ 1 - 1
src/views/technology/route/components/user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="1060px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="1060px" :visible="visible" v-if="visible" :append-to-body="true" :close-on-click-modal="false"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改工艺路线' : '添加工艺路线'" @update:visible="updateVisible">
     <header-title title="基本信息"> </header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">

+ 1 - 1
src/views/technology/route/components/user-taskinstance.vue

@@ -41,7 +41,7 @@
     </div>
 
 
-    <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="true"
+    <ele-modal width="1720px" :visible="addDialog" :append-to-body="true" :close-on-click-modal="false"
       @update:visible="closeAdd">
       <Production :tableData="tableData" ref="ProductionCom" />
       <template v-slot:footer>

+ 1 - 1
src/views/technology/version/components/user-edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="1060px" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
+  <ele-modal width="1060px" :visible="visible" :append-to-body="true" :close-on-click-modal="false"
     custom-class="ele-dialog-form" :title="isUpdate ? '修改生产版本' : '添加生产版本'" @update:visible="updateVisible">
     <header-title title="基本信息"> </header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">

+ 1 - 1
src/views/technology/work/components/user-edit.vue

@@ -4,7 +4,7 @@
     width="960px"
     :visible="visible"
     :append-to-body="true"
-    :close-on-click-modal="true"
+    :close-on-click-modal="false"
     custom-class="ele-dialog-form"
     :title="isUpdate ? '修改工作中心' : '添加工作中心'"
     @update:visible="updateVisible"