Merge branch 'dev-0625' into dev-expressNo-0702

# Conflicts:
#	src/views/goods/order-manage.vue

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;
\ No newline at end of file
+export const originForm = form;

src/views/goods/order-manage.vue

@@ -228,8 +228,8 @@
         <div class="view-content">
           <i class="el-icon-truck" style="font-size: 18px"></i><span class="send-status">已发货</span>
           <span class="view-number">{{logisticeInfo}}</span>
-          <el-button type="text" @click="copyTxt">复制</el-button>
-          <el-button type="text" @click="changeExpressNo">修改物流单号</el-button>
+          <el-button type="text" @click="copyTxt">复制单号</el-button>
+          <el-button type="text" @click="updateOrderNo">修改物流单号</el-button>
         </div>
         <input type="text" id="copyInput" class="hidden-input" />
         <span slot="footer" class="dialog-footer">
@@ -290,6 +290,30 @@
         <el-button size="small" type="primary" @click="confirmTui">完成</el-button>
       </span>
     </el-dialog>
+
+
+    <el-dialog
+      class="tui-dialog"
+      title="修改物流单号"
+      :visible="showOrderNoFlag"
+      @close="showOrderNoFlag = false"
+      width="385px"
+    >
+      <el-form ref="tuiForm" :rules="rules" :model="tuiForm" label-width="120px">
+        <el-form-item label="快递公司" prop="name">
+          <el-input v-model="tuiForm.money"></el-input>
+        </el-form-item>
+        <el-form-item label="快递单号" prop="name">
+          <el-input v-model="tuiForm.money"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="name">
+          <el-input v-model="tuiForm.money"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="confirmTui">完成</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -390,6 +414,7 @@
         ownerId:'',
         brokerList:[],
         brokerOwnerList:[],
+        showOrderNoFlag:false,
         pickerOptions1: {
           disabledDate: time => {
             return (
@@ -638,6 +663,11 @@
       changeOwner(data) {
         this.ownerId = data;
         this.brokerListAll();
+      },
+      // 修改物流单号
+      updateOrderNo(){
+        this.viewLogisticsDialog = false;
+        this.showOrderNoFlag = true;
       }
 
 

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) {