Merge remote-tracking branch 'origin/master'

dangan-ui/src/views/dangan/pictureRecard/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
 
-    <div style="width: 250px;margin-top: 20px;">
+    <div style="width: 200px;margin-top: 20px;">
       <div :class="dict.value===queryParams.ywType?'c-tabs__item is-active':'c-tabs__item'"
            v-for="dict in dict.type.yw_type" :key="dict.value" @click="handleYwType(dict.value)">
         {{ dict.label }}
       </div>
     </div>
 
-    <div>
+    <div style="width: calc(100% - 220px);">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="档案目录ID" prop="muId">
           <el-input