Merge branch 'master' of https://git.elitescloud.com/sunshine.wang/connector-admin

src/views/wms/delivery/header/index.vue

@@ -10,8 +10,8 @@
         <el-input v-model="query.factoryNum" clearable placeholder="配送工厂" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
         <label class="el-form-item-label">配送库存地</label>
         <el-input v-model="query.locationTo" clearable placeholder="配送库存地" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <label class="el-form-item-label">配送门店</label>
-        <el-input v-model="query.storeTo" clearable placeholder="配送门店" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <label class="el-form-item-label">配送客户</label>
+        <el-input v-model="query.storeTo" clearable placeholder="配送客户" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -28,13 +28,13 @@
           <el-form-item label="配送库存地">
             <el-input v-model="form.locationTo" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="配送门店">
+          <el-form-item label="配送客户">
             <el-input v-model="form.storeTo" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="订单日期">
             <el-date-picker v-model="form.orderTime" type="datetime" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="配送单条码">
+          <el-form-item label="单号条码">
             <qrcode-vue :value="form.deliveryOrder" :size="size" level="H"/>
           </el-form-item>
         </el-form>
@@ -51,7 +51,7 @@
         <el-table-column prop="deliveryOrder" label="配送单号" />
         <el-table-column prop="factoryNum" label="配送工厂" />
         <el-table-column prop="locationTo" label="配送库存地" />
-        <el-table-column prop="storeTo" label="配送门店" />
+        <el-table-column prop="storeTo" label="配送客户" />
         <el-table-column prop="shift" label="班次" />
         <el-table-column prop="orderTime" label="订单日期" />
         <el-table-column prop="createBy" label="创建者" />
@@ -104,7 +104,7 @@ export default {
         { key: 'deliveryOrder', display_name: '配送单号' },
         { key: 'factoryNum', display_name: '配送工厂' },
         { key: 'locationTo', display_name: '配送库存地' },
-        { key: 'storeTo', display_name: '配送门店' }
+        { key: 'storeTo', display_name: '配送客户' }
       ],
       value: '',
       size: 150