Merge remote-tracking branch 'origin/wsm' into wsm

src/views/oa/ConferenceApplyList.vue

@@ -22,12 +22,12 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="发布日期">
-                <j-date placeholder="请选择发布日期" v-model="queryParam.postedDate"></j-date>
+                <j-date placeholder="请选择发布日期" v-model="queryParam.postedDate" style="width: 100%;"></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="会议日期">
-                <j-date placeholder="请选择会议日期" v-model="queryParam.conferenceDate"></j-date>
+                <j-date placeholder="请选择会议日期" v-model="queryParam.conferenceDate" style="width: 100%;"></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -253,6 +253,9 @@
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   @import '~@assets/less/common.less';
+  /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+    width: 28% ;
+  }
 </style>

src/views/oa/SealDestroyList.vue

@@ -224,6 +224,9 @@
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   @import '~@assets/less/common.less';
+  /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+    width: 26% ;
+  }
 </style>

src/views/oa/SealTurnList.vue

@@ -11,7 +11,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="上缴日期">
-              <j-date placeholder="请选择上缴日期" v-model="queryParam.turnDate"></j-date>
+              <j-date placeholder="请选择上缴日期" v-model="queryParam.turnDate" style="width: 100%;"></j-date>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -261,6 +261,9 @@
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   @import '~@assets/less/common.less';
+  /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+    width: 26% ;
+  }
 </style>