1

src/views/meterModel/energyDialog.vue

@@ -79,8 +79,10 @@
                   v-show="false"
                 />
                 <fileMain
+                  v-if="visible"
                   v-model="form.modelImg"
                   :type="title == '详情' ? 'view' : 'add'"
+                  key="modelImg1"
                 ></fileMain>
               </el-form-item>
             </el-col>
@@ -344,9 +346,7 @@
             resizable: false
           }
         ],
-        form: {
-          ...defaultForm
-        },
+        form: JSON.parse(JSON.stringify(defaultForm)),
         rules: {
           name: [
             { required: true, message: '请输入', trigger: 'blur' },
@@ -387,6 +387,7 @@
         } else {
           this.title = '新增';
           this.resetForm();
+          console.log(this.form);
         }
         this.visible = true;
       },
@@ -441,9 +442,7 @@
       },
       // 重置表单
       resetForm() {
-        this.form = {
-          ...defaultForm
-        };
+        this.form = JSON.parse(JSON.stringify(defaultForm));
 
         this.measureList = [];
         this.parameterList = [];
@@ -483,8 +482,9 @@
       },
       // 取消
       handleCancel() {
-        this.visible = false;
         this.resetForm();
+
+        this.visible = false;
       }
     }
   };

src/views/sealManagement/index.vue

@@ -19,6 +19,7 @@
           :columns="columns"
           :datasource="datasource"
           :cache-key="cacheKeyUrl"
+          @columns-change="handleColumnChange"
           height="calc(100vh - 350px)"
         >
           <template v-slot:toolbar>
@@ -135,8 +136,12 @@
   import { reviewStatus } from '@/enum/dict';
   import processSubmitDialog from '@/components/processSubmitDialog/processSubmitDialog.vue';
   import { getUserPage } from '@/api/system/organization';
+  import dictMixins from '@/mixins/dictMixins';
+  import tableColumnsMixin from '@/mixins/tableColumnsMixin';
 
   export default {
+    mixins: [dictMixins, tableColumnsMixin],
+
     components: {
       SealDialog,
       HistoryVersionDialog,
@@ -184,9 +189,12 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'type',
+            prop: 'sealType',
             label: '类型',
             align: 'center',
+            formatter: (_row) => {
+              return this.getDictValue('印章类型', _row.sealType);
+            },
             minWidth: 110,
             showOverflowTooltip: true
           },
@@ -296,15 +304,10 @@
           },
           {
             label: '印章类型',
-            value: 'type',
-            type: 'select',
-            placeholder: '请选择',
-            planList: [
-              { label: '法律效力章', value: '1' },
-              { label: '财务专用章', value: '2' },
-              { label: '业务专用章', value: '3' },
-              { label: '内部管理章', value: '4' }
-            ]
+            value: 'sealType',
+            type: 'DictSelection',
+            dictName: '印章类型',
+            placeholder: '请选择'
           },
           {
             label: '印章持有人',
@@ -322,6 +325,7 @@
       }
     },
     created() {
+      this.requestDict('印章类型');
       // 格式化公司数据
       getUserPage({
         size: 999