Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/platinum/platinum_fixed_investment_price_query/compoments/filter/index.vue

@@ -2,7 +2,7 @@
   <!-- 过滤 -->
   <div class="filterTable">
     <a-space>
-      <a-date-picker v-model:value="date" />
+      <a-date-picker class="commonDatePicker" v-model:value="date" />
     </a-space>
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
@@ -47,7 +47,7 @@ export default defineComponent({
 
 <style lang="less">
 .filterTable {
-    .commonPicker.ant-calendar-picker {
+    .commonDatePicker.ant-calendar-picker {
         display: inline-flex;
         padding-top: 9px;
         padding-bottom: 6px;

src/views/platinum/platinum_fixed_investment_query/list/plan/compoments/filter/index.vue

@@ -2,7 +2,7 @@
   <!-- 过滤 -->
   <div class="filterTable">
     <a-space>
-      <a-date-picker v-model:value="date" />
+      <a-date-picker class="commonDatePicker" v-model:value="date" />
     </a-space>
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
@@ -56,7 +56,7 @@ export default defineComponent({
 
 <style lang="less">
 .filterTable {
-    .commonPicker.ant-calendar-picker {
+    .commonDatePicker.ant-calendar-picker {
         display: inline-flex;
         padding-top: 9px;
         padding-bottom: 6px;

src/views/report/inventory-report/list/category/index.vue

@@ -45,12 +45,12 @@ export default defineComponent({
         initData(() => {
             const { getInitTime, getInitType } = handleInitTypeAndTime();
             // 获取列表数据
-            queryTable({ cycletype: getInitType(), cycletime: getInitTime() }, { sumfields: '2' });
+            queryTable({ cycletype: getInitType(), cycletime: getInitTime() }, { sumfields: '1,2' });
             // 注册表头信息 过滤
             registerColumn('table_pcweb_warehouse_category_report', []);
         });
         function update(value: TypeAndTime) {
-            queryTable(value, { sumfields: '2' });
+            queryTable(value, { sumfields: '1,2' });
         }
         // 查询
         function search(value: any) {

src/views/report/inventory-report/list/warehouse/index.vue

@@ -45,12 +45,12 @@ export default defineComponent({
         initData(() => {
             const { getInitTime, getInitType } = handleInitTypeAndTime();
             // 获取列表数据
-            queryTable({ cycletype: getInitType(), cycletime: getInitTime() }, { sumfields: '4' });
+            queryTable({ cycletype: getInitType(), cycletime: getInitTime() }, { sumfields: '1,2,4' });
             // 注册表头信息 过滤
             registerColumn('table_pcweb_warehouse_report', []);
         });
         function update(value: TypeAndTime) {
-            queryTable(value, { sumfields: '4' });
+            queryTable(value, { sumfields: '1,2,4' });
         }
         // 查询
         function search(value: any) {