Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!237

src/views/purchase/DemandSummary/index.vue

@@ -109,14 +109,14 @@
               </el-col>
               <el-col :span="1.5">
                 <el-form-item label="供应仓库">
-                  <el-select clearable size="mini" v-model="queryParams.lastWarehouse" @focus="chooseRefer('WAREHOUSE_PARAM', true, '末级供应仓库')" style="width: 200px">
+                  <el-select clearable size="mini" v-model="queryParams.lastWarehouse" @focus="chooseRefer('WAREHOUSE_PARAM', true, '供应仓库')" style="width: 200px">
                     <el-option v-for="item in lastWarehouseOptions" :key="item.id" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="1.5">
                 <el-form-item label="供应库位">
-                  <el-select clearable size="mini" v-model="queryParams.lastAllocation" @focus="chooseRefer('ALLOCATION_PARAM', true, '末级供应库位', queryParams.lastWarehouse)" style="width: 200px">
+                  <el-select clearable size="mini" v-model="queryParams.lastAllocation" @focus="chooseRefer('ALLOCATION_PARAM', true, '供应库位', queryParams.lastWarehouse)" style="width: 200px">
                     <el-option v-for="item in lastAllocationOptions" :key="item.id" :label="item.name" :value="item.id" />
                   </el-select>
                 </el-form-item>
@@ -720,11 +720,11 @@ export default {
         this.customerOptions = selection
         this.queryParams.customer = selection[0].id
       }
-      if (this.referCondition.title == '末级供应仓库') {
+      if (this.referCondition.title == '供应仓库') {
         this.lastWarehouseOptions = selection
         this.queryParams.lastWarehouse = selection[0].id
       }
-      if (this.referCondition.title == '末级供应库位') {
+      if (this.referCondition.title == '供应库位') {
         this.lastAllocationOptions = selection
         this.queryParams.lastAllocation = selection[0].id
       }