合并冲突

src/views/plant/material/commonSpecialParts/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
      v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/material/maintainbom.vue

@@ -57,7 +57,7 @@
     />
 
     <!-- 添加或修改配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" fullscreen>
+    <el-dialog :title="title" :visible.sync="open" fullscreen :close-on-click-modal="false">
       <el-tabs type="border-card">
         <el-tab-pane label="当前字段">
           <el-form ref="form" :model="form" :rules="rules" label-width="120px">

src/views/plant/material/part/associatedStation.vue

@@ -3,6 +3,7 @@
     title="关联产线"
     visible
     width="540px"
+    :close-on-click-modal="false"
     :before-close="handleClose"
   >
     <el-transfer

src/views/plant/material/partRelationship/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
      v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/material/partVerificationRules/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
      v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/basicCommunication/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
     :before-close="handleClose"
     v-loading="loading"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/communicationRules/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
     :before-close="handleClose"
      v-loading="loading"
+     :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/mappingRules/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
      v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/openProtocol/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="90%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/operationType/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="60%"
      v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :rules="rules"

src/views/plant/processData/technology/OPCCommunication.vue

@@ -5,6 +5,7 @@
     width="80%"
     :before-close="handleClose"
     v-loading="loading"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/technology/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/technology/openProtocol.vue

@@ -5,6 +5,7 @@
     width="90%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/technology/operationGuide.vue

@@ -5,6 +5,7 @@
     width="80%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/processData/technology/scanRule.vue

@@ -5,6 +5,7 @@
     width="80%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/resource/operationDefinition/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="1035px"
     :before-close="handleClose"
     v-loading="loading"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/plant/resource/operationDefinition/associatedStation.vue

@@ -4,6 +4,7 @@
     visible
     width="540px"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-transfer
       v-model="value"

src/views/plant/resource/operationDefinition/dataDependency.vue

@@ -5,6 +5,7 @@
     width="80%"
     v-loading="loading"
     :before-close="handleClose"
+    :close-on-click-modal="false"
   >
     <el-table
         :data="tableData"

src/views/plant/resource/station/addOrEdit.vue

@@ -5,6 +5,7 @@
     width="80%"
     :before-close="handleClose"
     v-loading="loading"
+    :close-on-click-modal="false"
   >
     <el-form
       :inline="true"

src/views/role/ProductionLine.vue

@@ -4,6 +4,7 @@
     visible
     width="540px"
     :before-close="handleClose"
+    :close-on-click-modal="false"
     >
     <el-transfer
       v-model="value"

src/views/system/printer/printerTemplate/PrinterTemplateAddOrEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="isAddOrEdit=='edit' ? '编辑模板' :'添加模板'" visible width="800px" :before-close="cancel">
+  <el-dialog :title="isAddOrEdit=='edit' ? '编辑模板' :'添加模板'" :close-on-click-modal="false" visible width="800px" :before-close="cancel">
       <el-form ref="formRef" :model="formData" :rules="rules" style="overflow: hidden;" label-width="120px">
 				<el-col :span="8" v-for="(value, key, index) in formDataDefaultItem" :key="index">
 					<el-form-item