修改冲突代码

src/views/dic/dic_type.vue

@@ -118,7 +118,7 @@
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <span>字典详情</span>
-            <el-button type="primary" icon="el-icon-edit" style="float: right;margin-right:10px" @click="subshowCreate">
+            <el-button type="primary" icon="el-icon-edit" style="float: right;margin-left:10px" @click="subshowCreate">
               添加
             </el-button>
             <el-button
@@ -138,7 +138,6 @@
             height="700"
             highlight-current-row
             stripe
-            @row-click="onRowClick"
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="40" />
@@ -192,7 +191,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="subtotal>0" :total="subtotal" :page-num.sync="sublistQuery.pageNum" :page-row.sync="sublistQuery.pageSize" @pagination="getsubList" />
+          <pagination v-if="subtotal>0" :total="subtotal" :page-num.sync="sublistQuery.pageNum" :page-row.sync="sublistQuery.pageSize" @pagination="getsubList" />
         </el-card>
       </el-col>
     </el-row>
@@ -472,6 +471,7 @@ export default {
       this.secondDialogFormVisible = true
     },
     subcreateDicData() {
+      console.log(this.tempDicData)
       this.$refs['tempDicData'].validate(valid => {
         if (valid) {
           this.api({
@@ -534,7 +534,7 @@ export default {
             }
           }).then(() => {
             this.$message({ message: '删除成功。', type: 'success' })
-            this.getList()
+            this.getsubList()
           })
         })
       }

src/views/document/index.vue

@@ -21,7 +21,7 @@
           accept=".pdf"
           action=""
         >
-          <el-button slot="trigger" size="middle" type="primary">
+          <el-button slot="trigger" type="primary">
             上传文件
           </el-button>
         </el-upload>