Merge branch 'dev-heart0629' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-heart0629

src/views/modules/communityParty/article/drafts.vue

@@ -104,9 +104,9 @@ export default {
           limit: 1,
           editDisabled: true,
           rules: [],
-          value: [],
+          value: () => [],
           supKeys: ["imgUrlArr", "imgUrl"],
-          supValues: [[], ""],
+          supValues: [() => [], ""],
           beforeImgUpload(file, item, that) {
             console.log(file);
             const isLt1M = file.size / 1024 / 1024 < 10;
@@ -217,8 +217,8 @@ export default {
                 label: "以组织名义",
                 optionList: [
                   {
-                    label: agencyId,
-                    value: agencyName,
+                    label: agencyName,
+                    value: agencyId,
                     type: "agency",
                   },
                 ],

src/views/modules/cpts/base/index.vue

@@ -93,10 +93,7 @@
         </el-form>
       </div>
 
-      <div
-        class="div_table"
-        :style="{ height: maxTableHeight + 130 + 'px' }"
-      >
+      <div class="div_table" :style="{ height: maxTableHeight + 130 + 'px' }">
         <div class="div_btn">
           <el-button
             class="diy-button--add"
@@ -142,6 +139,7 @@
         </div>
 
         <el-table
+          ref="ref_table"
           :data="tableData"
           border
           :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
@@ -447,6 +445,11 @@ export default {
     this.computeSearchHeight();
   },
 
+  activated() {
+    console.log('-------------activated')
+    this.$refs["ref_table"].doLayout();
+  },
+
   methods: {
     computeSearchHeight() {
       this.ref_search_height = this.$refs["ref_search"].clientHeight;