yusheng 1 год назад
Родитель
Сommit
42719a1465

+ 18 - 15
src/views/factoryModel/station/components/ProductModal.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :title="title" :visible.sync="visible" v-if="visible" :before-close="handleClose"
-    :close-on-click-modal="false" :close-on-press-escape="false" append-to-body width="75%">
+  <ele-modal :title="title" :visible.sync="visible" v-if="visible" :before-close="handleClose"
+    :close-on-click-modal="false" :close-on-press-escape="false" append-to-body width="75%" :maxable="true">
     <el-card shadow="never">
       <ProductSearch @search="reload" ref="searchRef" />
 
@@ -25,7 +25,7 @@
       <el-button type="primary" size="small" @click="selected">选择</el-button>
       <el-button size="small" @click="handleClose">关闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>
@@ -60,6 +60,13 @@ export default {
           align: 'center',
           reserveSelection: true
         },
+        {
+          action: 'action',
+          slot: 'action',
+          align: 'center',
+          label: '选择',
+          fixed: 'left'
+        },
         {
           prop: 'code',
           label: '编码'
@@ -128,12 +135,7 @@ export default {
           showOverflowTooltip: true
         },
 
-        {
-          action: 'action',
-          slot: 'action',
-          align: 'center',
-          label: '选择'
-        }
+     
       ],
 
       columns2: [
@@ -146,6 +148,13 @@ export default {
           showOverflowTooltip: true,
           fixed: 'left'
         },
+        {
+          action: 'action',
+          slot: 'action',
+          align: 'center',
+          fixed: 'left',
+          label: '选择'
+        },
         {
           prop: 'fixCode',
           label: '固资编码',
@@ -195,12 +204,6 @@ export default {
           label: '生命周期',
           showOverflowTooltip: true,
           minWidth: 110
-        },
-        {
-          action: 'action',
-          slot: 'action',
-          align: 'center',
-          label: '选择'
         }
       ],
 

+ 3 - 2
src/views/factoryModel/station/components/edit.vue

@@ -1,6 +1,6 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <el-dialog
+  <ele-modal
     class="ele-dialog-form"
     :title="title"
     :visible.sync="visible"
@@ -8,6 +8,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     width="1200px"
+    :maxable="true"
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="110px">
       <el-card
@@ -380,7 +381,7 @@
       @close="codeShow = false"
       @chooseCode="chooseCode"
     ></CodeDialog>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>

+ 1 - 0
src/views/factoryModel/station/components/equipmentTable.vue

@@ -6,6 +6,7 @@
       :columns="columns"
       :datasource="datasource"
       cache-key="systemRoleTable4"
+      :maxable="true"
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

+ 3 - 3
src/views/factoryModel/station/components/staffSelection.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="container">
     <!-- 单据弹窗 -->
-    <el-dialog
+    <ele-modal
       title="选择设备"
       :before-close="handleClose"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :append-to-body="true"
-      width="80%"
+      width="80%" :maxable="true"
     >
       <el-row class="zw-page">
         <el-col :span="6" class="zw-page-left">
@@ -130,7 +130,7 @@
         <el-button size="small" @click="handleClose">关 闭</el-button>
         <el-button size="small" @click="sumbit" type="primary">确 认</el-button>
       </div>
-    </el-dialog>
+    </ele-modal>
   </div>
 </template>
   <script>