Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/components/PopDialog/fourClass.vue

@@ -6,6 +6,7 @@
       :close-on-click-modal="false"
       :append-to-body="true"
       v-dialogDrag
+      @close="resetParam"
       class="userDialog"
       :visible.sync="visible"
     >
@@ -137,6 +138,9 @@ export default {
       //   resolve(node.data.childrens.sort((a, b) => a.code - b.code));
       // else resolve(this.threedata);
     },
+    resetParam() {
+      this.filterText = ''
+    }
   },
 };
 </script>

src/views/purchase/PurchaseDemandList/index.vue

@@ -256,7 +256,7 @@
       </el-row>
       <el-row style="margin-bottom: 20px;">
         <span style="margin-right: 10px;">供应货位</span>
-        <el-select clearable size="mini" v-model="download.cargoSpace" @clear="download.cargoSpace = ''" @focus="chooseOrg('ALLOCATION_PARAM', true, '选择货位', download.warehouseId)">
+        <el-select clearable size="mini" v-model="download.cargoSpace" @clear="download.cargoSpace = ''" @focus="mbHuowei('ALLOCATION_PARAM', true, '选择货位', download.warehouseId)">
           <el-option v-for="item in mBcargoSpace" :key="item.id" :label="item.name" :value="item.code" />
         </el-select>
       </el-row>
@@ -655,6 +655,17 @@ export default {
         this.queryParams.demandDept = selection[0].id
       }
     },
+    mbHuowei(type, isPage, title, stordocId) {
+      this.referCondition.type = type
+      this.referCondition.isPage = isPage
+      this.referCondition.title = title
+      if(stordocId) {
+        this.referCondition.stordocId = stordocId
+        this.$refs.refer.init(this.referCondition)
+      } else {
+        this.$modal.msgWarning("请先选择仓库")
+      }
+    },
     cleanMb() {
       this.download.warehouse = ''
       this.download.warehouseId = ''