Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue

@@ -395,7 +395,6 @@ export default {
       let matterId = this.$route.query.matterId;
       this.getMatterInfo(matterId);
     }
-    console.log(this.matterDict);
     this.getDeptListData();
   },
   methods: {

base-manager-ui/admin/src/pages/basicset/addmatter/components/pursuant.vue

@@ -23,9 +23,11 @@
         :data-source="tableData"
         :rowKey="(record) => record.id"
       >
+        <!-- 需要 -->
         <template slot="num" slot-scope="text, record, index">
           {{ (current - 1) * size + index + 1 }}
         </template>
+        <!-- 查看详情 -->
         <template slot="more" slot-scope="text">
           <a class="look-more" @click="lookMore(text)">查看详情</a>
         </template>

base-manager-ui/admin/src/pages/basicset/addmatter/group/addPursuant.vue

@@ -5,6 +5,7 @@
       @cancel="handleClose"
       :title="title"
       @ok="handleOk"
+      :maskClosable="false"
     >
       <template slot="footer">
         <a-button @click="handleInit">重置</a-button>