Merge branch 'release' into 'master'

Release

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

src/views/goods/forms.js

@@ -60,10 +60,13 @@ const form = {
   optPrice:'',
   goodsStock:0,
   stock: 0,
-  externalGoodsCode: ''
+  externalGoodsCode: '',
+  leastCount:1,
+  mostCount: -1,
+  incrType:1
 };
 
 
 export const originForm1 = form1;
 export const originForm2 = form2;
-export const originForm = form;
+export const originForm = form;
\ No newline at end of file

src/views/goods/order-manage.vue

@@ -15,20 +15,25 @@
             <el-form-item label="买家名称">
               <el-input v-model="searchForm.receiver" size="small" placeholder="请输入买家名称"></el-input>
             </el-form-item>
-            <el-form-item label="下单时间">
-              <el-date-picker
-                  v-model="searchForm.orderDate"
-                  type="datetime"
-                  size="small"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="timestamp"
-                  placeholder="请选择下单时间">
-              </el-date-picker>
+            <el-form-item label="创建人">
+              <el-input v-model="searchForm.prescriberName" size="small" placeholder="请输入创建人名称"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
           <el-col :span="18">
+            <el-form-item label="下单时间" class="t-b">
+              <el-date-picker
+                v-model="createRangeTime"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%;"
+                :picker-options="pickerOptions1">
+              </el-date-picker>
+            </el-form-item>
             <el-form-item label="招募人">
               <el-select
                 v-model="searchForm.ownerId"
@@ -301,6 +306,7 @@
     },
     data(){
       return{
+        createRangeTime: '',
         curmbFirst: '云鹊店铺',
         curmbSecond: '订单管理',
         activeName: 'all',
@@ -310,7 +316,10 @@
           goodsName: '',
           orderNo: '',
           receiver: '',
-          orderDate: '',
+          prescriberName: '',
+          orderTime:'',
+          orderBeginTime:'',
+          orderEndTime: '',
           brokerId:'',
           ownerId:'',
           pageNo: 1,
@@ -380,7 +389,13 @@
         ownerId:'',
         brokerList:[],
         brokerOwnerList:[],
-
+        pickerOptions1: {
+          disabledDate: time => {
+            return (
+              time.getTime() > new Date().getTime()
+            ); //减去一天的时间代表可以选择同一天;
+          }
+        },
       }
     },
     created() {
@@ -392,6 +407,8 @@
     },
     methods: {
       searchList(){
+        this.searchForm.orderBeginTime = this.createRangeTime[0];
+        this.searchForm.orderEndTime = this.createRangeTime[1];
         console.log("searchList搜索开始")
         openLoading(this);
         queryOrderList(this.searchForm).then(res => {
@@ -406,10 +423,14 @@
       resetForm() {
         console.log("resetForm重置")
         this.activeName = 'all';
+        this.createRangeTime = '';
         this.searchForm = {
           showStatus: -1,
           storeId: this.$route.query.storeId,
           goodsName: '',
+          prescriberName: '',
+          orderBeginTime:'',
+          orderEndTime: '',
           orderNo: '',
           receiver: '',
           orderDate: '',
@@ -582,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;

src/views/shop/shop-list.vue

@@ -382,21 +382,37 @@
       },
       //店铺管理
       shopManage(row) {
-        this.$router.push({
+        let routeData = this.$router.resolve({
           path: '/goods-manage',
           query: {
             storeId: row.tradeStore.id,
             commissionFlag:row.tradeStore.commissionFlag
           }
-        })
+        });
+        window.open(routeData.href, '_blank');
+
+        // this.$router.push({
+        //   path: '/goods-manage',
+        //   query: {
+        //     storeId: row.tradeStore.id,
+        //     commissionFlag:row.tradeStore.commissionFlag
+        //   }
+        // })
       },
       orderManage(row) {
-        this.$router.push({
+        let routeData = this.$router.resolve({
           path: '/order-manage',
           query: {
-            storeId: row.tradeStore.id,
+            storeId: row.tradeStore.id
           }
-        })
+        });
+        window.open(routeData.href, '_blank');
+        // this.$router.push({
+        //   path: '/order-manage',
+        //   query: {
+        //     storeId: row.tradeStore.id,
+        //   }
+        // })
       },
       //编辑
       editShop(row) {