Merge branch 'hotfix-0623' into 'release'

Hotfix 0623

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!270

src/views/goods/order-manage.vue

@@ -423,6 +423,7 @@
       resetForm() {
         console.log("resetForm重置")
         this.activeName = 'all';
+        this.createRangeTime = '';
         this.searchForm = {
           showStatus: -1,
           storeId: this.$route.query.storeId,
@@ -602,9 +603,9 @@
         });
       },
       exportOrder() {
-        const { goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId } = this.searchForm;
+        const { goodsName, orderNo, receiver, orderDate, storeId, brokerId, ownerId, prescriberName, orderBeginTime, orderEndTime} = this.searchForm;
 
-        getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId }).then(res => {
+        getOrdersExportUrl({ goodsName, orderNo, receiver, orderDate, storeId,brokerId,ownerId,prescriberName, orderBeginTime, orderEndTime}).then(res => {
           if (res.code != '000000') {
             this.$message({ message: res.message, type: 'error' });
             return;