Merge branch 'wsm' of http://139.196.39.194:9021/chenc/cd-work-flow-web into wsm

src/views/oa/BudgetCostList.vue

@@ -32,7 +32,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="登记日期">
-                <j-date placeholder="请选择登记日期" v-model="queryParam.registerDate"></j-date>
+                <j-date placeholder="请选择登记日期" v-model="queryParam.registerDate" style="width: 100%;"></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -44,7 +44,9 @@
                   format="YYYY"
                   :open="yearShowOne"
                   @openChange="openChangeOne"
-                  @panelChange="panelChangeOne"/>
+                  @panelChange="panelChangeOne"
+                  style="width: 100%;"
+                  />
               </a-form-item>
             </a-col>
           </template>
@@ -387,6 +389,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/BudgetReplyList.vue

@@ -17,7 +17,7 @@
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="登记日期">
-                <j-date placeholder="请选择登记日期" v-model="queryParam.registerDate"></j-date>
+                <j-date placeholder="请选择登记日期" v-model="queryParam.registerDate" style="width: 100%;"></j-date>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -29,7 +29,9 @@
                   format="YYYY"
                   :open="yearShowOne"
                   @openChange="openChangeOne"
-                  @panelChange="panelChangeOne"/>
+                  @panelChange="panelChangeOne"
+                  style="width: 100%;"
+                  />
               </a-form-item>
             </a-col>
           </template>