修改bug

src/router/views/index.js

@@ -3516,14 +3516,14 @@ export default [{
 },
 // 销售分析
 {
-  path: '/tirePartsMall/financialMaement/salesAnalysis/index',
+  path: '/tirePartsMall/financialManagement/salesAnalysis/index',
   component: Layout,
   hidden: true,
   children: [{
-    path: '/tirePartsMall/financialMaement/salesAnalysis/index',
+    path: '/tirePartsMall/financialManagement/salesAnalysis/index',
     name: '销售分析(L)',
     meta: {
-      i18n: '/tirePartsMall/financialMaement/salesAnalysis/index',
+      i18n: '/tirePartsMall/financialManagement/salesAnalysis/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/tirePartsMall/financialManagement/salesAnalysis/index')

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -60,7 +60,7 @@
                 </search-query>
             </template>
             <template slot="bsTypeSearch">
-                <search-query :datalist="bsTypeData" :selectValue="query.bsType" :clearable="true" :buttonIf="false"
+                <search-query :datalist="bsTypeData" :selectValue="query.bsType" :clearable="false" :buttonIf="false"
                     :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" placeholder="请选择单据状态"
                     @corpChange="corpChange($event, 'bsType')">
                 </search-query>
@@ -119,7 +119,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 18,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -179,6 +179,10 @@ export default {
                     prop: 'businesDate',
                     overHidden: true,
                 }, {
+                    label: '出库时间',
+                    prop: 'deliveryBusinesDate',
+                    overHidden: true,
+                }, {
                     label: '结算状态',
                     prop: 'actualPaymentStatus',
                     overHidden: true,
@@ -264,6 +268,28 @@ export default {
                     valueFormat: "yyyy-MM-dd",
                 },
                 {
+                    label: '出库开始',
+                    prop: 'dateStart',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 2.1,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, 
+                {
+                    label: '出库结束',
+                    prop: 'dateEnd',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 2.2,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                },
+                {
                     label: '单据状态',
                     prop: 'status',
                     overHidden: true,

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -60,7 +60,7 @@
                 </search-query>
             </template>
             <template slot="bsTypeSearch">
-                <search-query :datalist="bsTypeData" :selectValue="query.bsType" :clearable="true" :buttonIf="false"
+                <search-query :datalist="bsTypeData" :selectValue="query.bsType" :clearable="false" :buttonIf="false"
                     :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" placeholder="请选择单据状态"
                     @corpChange="corpChange($event, 'bsType')">
                 </search-query>
@@ -119,7 +119,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 12,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -177,6 +177,10 @@ export default {
                     prop: 'businesDate',
                     overHidden: true,
                 }, {
+                    label: '入库时间',
+                    prop: 'deliveryBusinesDate',
+                    overHidden: true,
+                }, {
                     label: '结算状态',
                     prop: 'actualPaymentStatus',
                     overHidden: true,
@@ -261,6 +265,26 @@ export default {
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
                 }, {
+                    label: '入库开始',
+                    prop: 'dateStart',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 2.1,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, {
+                    label: '入库结束',
+                    prop: 'dateEnd',
+                    overHidden: true,
+                    search: true,
+                    hide: true,
+                    searchOrder: 2.2,
+                    type: "date",
+                    format: "yyyy-MM-dd",
+                    valueFormat: "yyyy-MM-dd",
+                }, {
                     label: '单据状态',
                     prop: 'status',
                     overHidden: true,

src/views/tirePartsMall/financialManagement/salesAnalysis/index.vue

@@ -57,7 +57,7 @@ export default {
             query: {
                 businesDateStart: defaultDate3()[0],
                 businesDateEnd: defaultDate3()[1],
-                bsType: 1
+                bsType: 2
             },
             page: {
                 pageSize: 10,
@@ -99,6 +99,11 @@ export default {
                         decimals: 2
                     },
                     {
+                        name: 'freight',
+                        type: 'sum',
+                        decimals: 2
+                    },
+                    {
                         name: 'salesProfit',
                         type: 'sum',
                         decimals: 2
@@ -194,6 +199,11 @@ export default {
                     overHidden: true,
                 },
                 {
+                    label: '运费',
+                    prop: 'freight',
+                    overHidden: true,
+                },
+                {
                     label: '销售利润',
                     prop: 'salesProfit',
                     overHidde: true,
@@ -203,7 +213,8 @@ export default {
             salerData: [], // 业务员
             commodityData: [], // 合计数据
             // 合计的配置项
-            commodityLabel: [{
+            commodityLabel: [
+            {
                 id: 1,
                 label: '销售数量',
                 prop: 'salesQuantity',

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -78,11 +78,12 @@ export default {
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 18,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,
-        searchIndex: 2,
+        searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
@@ -257,14 +258,7 @@ export default {
           //   hide: true,
           //   showColumn: false
           // },
-          {
-            label: '显示已完成',
-            prop: 'notComplete',
-            overHidden: true,
-            hide: true,
-            search: true,
-            searchslot: true
-          }]
+          ]
       }
     }
   },
@@ -477,4 +471,8 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -251,9 +251,10 @@ export default {
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 6,
         searchIcon: true,
-        searchIndex: 2,
+        searchIndex: 3,
         highlightCurrentRow: true,
         expand: true,
         expandWidth: 60,
@@ -309,6 +310,14 @@ export default {
             value: 'id'
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=GYS',
+        },
+        {
+          label: '显示已完成',
+          prop: 'notComplete',
+          overHidden: true,
+          hide: true,
+          search: true,
+          searchslot: true
         }, {
           label: '仓库',
           prop: "storageId",
@@ -451,14 +460,6 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
-        },
-        {
-          label: '显示已完成',
-          prop: 'notComplete',
-          overHidden: true,
-          hide: true,
-          search: true,
-          searchslot: true
         }]
       }
     }
@@ -660,4 +661,7 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -190,18 +190,19 @@ export default {
         delBtn: false,
         addBtn: false,
         index: true,
-        span: 8,
+        span: 6,
         border: true,
         height: "auto",
         searchMenuPosition: "right",
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 6,
         searchIcon: true,
         expand: true,
         expandWidth: 60,
-        searchIndex: 2,
+        searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
@@ -226,6 +227,14 @@ export default {
           overHidden: true,
         },
         {
+          label: '显示已完成',
+          prop: 'notComplete',
+          overHidden: true,
+          hide: true,
+          search: true,
+          searchslot: true
+        },
+        {
           label: "业务来源",
           prop: "businessSource",
           overHidden: true,
@@ -351,11 +360,13 @@ export default {
           label: '退货状态',
           prop: "returnsStatus",
           overHidden: true,
-        }, {
+        }, 
+        {
           label: '应结日期',
           prop: "dueDate",
           overHidden: true,
-        }, {
+        }, 
+        {
           label: '业务日期',
           prop: "businesDate",
           searchProp: "businesDateList",
@@ -431,14 +442,6 @@ export default {
           searchDefaultTime: ["00:00:00", "23:59:59"],
           format: "yyyy-MM-dd",
           valueFormat: "yyyy-MM-dd HH:mm:ss"
-        },
-        {
-          label: '显示已完成',
-          prop: 'notComplete',
-          overHidden: true,
-          hide: true,
-          search: true,
-          searchslot: true
         }]
       }
     }
@@ -651,4 +654,7 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/tirePartsMall/salesService/returns/index.vue

@@ -78,11 +78,12 @@ export default {
         align: "center",
         size: "small",
         menuWidth: 50,
-        searchSpan: 8,
+        searchSpan: 6,
+        searchMenuSpan: 6,
         searchIcon: true,
         // expand: true,
         // expandWidth: 60,
-        searchIndex: 2,
+        searchIndex: 3,
         highlightCurrentRow: true,
         dialogWidth: "70%",
         summaryText: "合计",
@@ -118,6 +119,14 @@ export default {
             dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&cname={{key}}',
           },
           {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
             label: '业务员',
             disabled: false,
             prop: "salerId",
@@ -235,30 +244,8 @@ export default {
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
-          // {
-          //   label: "原业务日期",
-          //   prop: "oldBusinesDate",
-          //   searchProp: "oldBusinesDateList",
-          //   type: "date",
-          //   overHidden: true,
-          //   width: 100,
-          //   search: true,
-          //   searchRange: true,
-          //   searchDefaultTime: ["00:00:00", "23:59:59"],
-          //   format: "yyyy-MM-dd",
-          //   valueFormat: "yyyy-MM-dd HH:mm:ss",
-          //   hide: true,
-          //   showColumn: false
-          // },
-          {
-            label: '显示已完成',
-            prop: 'notComplete',
-            overHidden: true,
-            hide: true,
-            search: true,
-            searchslot: true
-          }]
+          }
+          ]
       }
     }
   },
@@ -471,4 +458,7 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+/deep/ .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>