Merge branch 'dev' of http://172.16.90.250:3000/forest/forest-web into dev

src/views/oms/order/orderDetail.vue

@@ -24,7 +24,7 @@
         <div class="operate-button-container" v-show="order.status===1">
           <el-button size="mini" @click="showUpdateReceiverDialog">修改收货人信息</el-button>
           <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
-          <el-button size="mini">取消订单</el-button>
+          <!-- <el-button size="mini">取消订单</el-button> -->
           <el-button size="mini" @click="showMarkOrderDialog">备注订单</el-button>
         </div>
         <div class="operate-button-container" v-show="order.status===2||order.status===3">

src/views/pms/product/index.vue

@@ -23,9 +23,9 @@
           <el-form-item label="输入搜索：">
             <el-input style="width: 203px" v-model="listQuery.keyword" placeholder="商品名称"></el-input>
           </el-form-item>
-          <el-form-item label="商品货号：">
+         <!-- <el-form-item label="商品货号：">
             <el-input style="width: 203px" v-model="listQuery.productSn" placeholder="商品货号"></el-input>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="商品分类：">
             <el-cascader
               clearable
@@ -735,7 +735,7 @@
           });
           this.getList();
         });
-        
+
         // location.reload();
       },
       handleVerify(index,row){