Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/productBrank.js

@@ -10,6 +10,15 @@ export function createProductBrank(data) {
 }
 
 // 更新品牌
+export function updateProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改品牌默认收费模式
 export function changeFeeModel(data) {
   return request({
     url: '/ecw/product-brank/changeFeeMode',

src/plugins/tab.js

@@ -32,7 +32,11 @@ export default {
   // 关闭指定tab页签
   closePage(obj) {
     if (obj === undefined) {
-      return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => {
+      return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
+        let lastPath = '/'
+        if (visitedViews.length > 0){
+          lastPath = visitedViews[visitedViews.length - 1]
+        }
         return router.push(lastPath || '/');
       });
     }

src/views/ecw/order/warehousing/components/editDialog.vue

 <template>
   <div>
     <el-dialog
-      :title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + '-货物入仓'"
+      :title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + ' - ' + warehousing.orderNo"
       :visible.sync="opened"
       width="1080px"
     >

src/views/ecw/order/warehousing/index.vue

@@ -86,8 +86,8 @@
     </el-table>
 
     <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
-    <el-form ref="form" :model="form" label-width="120px" style="max-width: 550px;">
-      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 300px">
+    <el-form ref="form" :model="form" label-width="120px">
+      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 400px">
         <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
           <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
             <el-option