提交一版（宁波报废筛选）

src/views/rms/scrap/scrapApply/fastForm.vue

@@ -13,7 +13,7 @@
                     placeholder="请选择仓库"
                     style="width: 250px;margin-left: 0px"  
                     class="filter-item"
-                    @change="changeWarehouse">
+                    @change="toPostQuery">
                     <el-option
                     v-for="item in warehouseList"
                     :key="item.name"
@@ -21,34 +21,34 @@
                     :value="item.id">
                     </el-option>
                 </el-select>
-                <!-- <el-select v-model="equName" 
-                    class="filter-item"
-                    clearable 
-                    :filterable="true"
-                    :filter-method="dataFilter"
-                    placeholder="请选择装备"
-                    @change="changeWarehouse" 
-                    style="width: 300px;" >
-                    <el-option
-                    v-for="item in equNameList"
-                    :key="item.equName"
-                    :label="item.equName"
-                    :value="item.equName">
-                    </el-option>
-                </el-select>
-                <el-select v-model="sizeId" 
-                class="filter-item"
-                clearable filterable
-                placeholder="请选择装备型号名称" 
-                @change="toPostQuery" 
-                style="width: 300px;">
-                <el-option
+               <el-select v-model="equipmentId" 
+                  class="filter-item"
+                  clearable 
+                  :filterable="true"
+                  :filter-method="dataFilter"
+                  placeholder="请选择装备"
+                  @change="getListEquipmentSize" 
+                  style="width: 300px;" >
+                  <el-option
+                    v-for="item in equipmentList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+              </el-select>
+               <el-select v-model="equipmentSizeId" 
+                  class="filter-item"
+                  clearable filterable
+                  placeholder="请选择装备型号名称" 
+                  @change="toPostQuery" 
+                  style="width: 300px;">
+                  <el-option
                     v-for="item in equipmentSizeList"
                     :key="item.id"
                     :label="item.sizeName"
                     :value="item.id">
-                </el-option>
-                </el-select> -->
+                  </el-option>
+                </el-select>
                 </div>
                 
                 
@@ -124,6 +124,8 @@ import { quickAddFixed } from '@/api/fixReceiveApply'
 import { initPdata } from '@/api/data'
 import { transform } from '@/utils/index'
 import { getListOrgWarehouse } from '@/api/warehouse'
+import { getListEquipmentDetail } from '@/api/equipmentDetail'
+import { getListEquipmentSize } from '@/api/equipmentSize'
 export default {
     mixins: [initData],
     props: {
@@ -148,11 +150,13 @@ export default {
       equipmentCode: '',
       equipmentSizecode: '',
       equNameList: [],
+      equipmentList:[],
       equipmentSizeList: [],
       equId: null,
+      equipmentId: null,
       equName:'',
       equipmentSizeList: [], 
-      sizeId: null,
+      equipmentSizeId: null,
       form: {
         id: '',
         action: 1,
@@ -169,8 +173,7 @@ export default {
   components: { equInfoDetail },
   created() {
     this.getListOrgWarehouse()
-    // this.getEquipmentList()
-    // this.getListEquipmentSize()
+    this.getEquipmentList()
     this.initOrgList()
     this.$nextTick(() => {
     this.initPost()
@@ -189,47 +192,38 @@ export default {
         if (isFastAdd && this.warehouseList.length > 0) { 
           this.warehouseId = this.warehouseList[0].id
           this.equName = this.equName
-          console.log(this.equName)
-          this.changeWarehouse()
+          this.toPostQuery()
           }
       })
     },
-    // //获取装备
-    // getEquipmentList() {
-    //   this.warehouseId = this.warehouseList[0].id
-    //   this.equipmentList = []
-    //   this.equId = null
-    //   this.changeWarehouse()
-    // },
-    // //选择装备，根据装备获取装备型号名称
-    // getListEquipmentSize() {
-    //   this.equipmentSizeList = []
-    //   this.sizeId = null
-    //   this.changeWarehouse()
-    // },
-    changeWarehouse() {
+    //获取装备
+    getEquipmentList() {
+      getListEquipmentDetail({}).then(res => {
+        this.equipmentList = res.data
+        //保留数据源
+        this.copy = Object.assign(this.equipmentList)
+      })
+    },
+    //选择装备，根据装备获取装备型号名称
+    getListEquipmentSize(data) {
+      this.equipmentSizeList = []
+      this.equipmentSizeId = null
+      getListEquipmentSize({detailId : this.equipmentId}).then(res => {
+        this.equipmentSizeList = res.data
         this.toPostQuery()
-        this.url = window._CONFIG['serviceURL'] + '/api/Notice/GetTreeScrapMsg'
-        this.params = { page: this.page, size: this.size, orgId : this.orgId || this.$store.state.user.user.baseJpOrganization.id }
-        const warehouseId = this.warehouseId
-        const equId = this.equId
-        const equName = this.equName
-        const sizeId = this.sizeId
-        const days = this.days
-        const scrap = this.scrap
-        if (warehouseId) { this.params['warehouseId'] = warehouseId }
-        if (equId) { this.params['equId'] = equId }
-        if (equName) { this.params['equName'] = equName }
-        if (sizeId) { this.params['sizeId'] = sizeId }
-        if (days) { this.params['days'] = days }
-        if (scrap != null && scrap != undefined) { this.params['scrap'] = scrap }
-        return true
+      })
     },
     beforeInit() {
       this.url = window._CONFIG['serviceURL'] + '/api/Notice/GetTreeScrapMsg'
       this.params = { page: this.page, size: this.size, orgId : this.orgId || this.$store.state.user.user.baseJpOrganization.id }
+      const warehouseId = this.warehouseId
+      const equId = this.equipmentId
+      const sizeId = this.equipmentSizeId
       const days = this.days
       const scrap = this.scrap
+      if (warehouseId) { this.params['warehouseId'] = warehouseId }
+      if (equId) { this.params['equId'] = equId }
+      if (sizeId) { this.params['sizeId'] = sizeId }
       if (days) { this.params['days'] = days }
       if (scrap != null && scrap != undefined) { this.params['scrap'] = scrap }
       return true
@@ -288,17 +282,10 @@ export default {
       table.toggleRowExpansion(row)
     },
     
-    getListEquipmentSize() {
-      if (this.equipmentCode) {
-        getListEquipmentSize({detailId : this.equipmentCode}).then(res => {
-          this.equipmentSizeList = res.data
-        })
-      }
-    },
     dataFilter(v) {
       //对绑定数据赋值
       this.equipmentList = this.copy.filter((item) => {
-        console.log(item)
+        //console.log(item)
         //如果直接包含输入值直接返回true
         if (item.name.indexOf(v) !== -1) return true;
         //将label拆散成小写拼音数组
@@ -349,7 +336,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.detailList = val
-      // console.log(val)
+      console.log(val)
     },
     // selectionChange(val){
     //   this.detailList = val
@@ -358,6 +345,7 @@ export default {
     quickScrap(row){
         // console.log(row)
       this.form.warehouseId = this.warehouseId
+      console.log(this.form.warehouseId)
       this.form.flowType = 'scrap'
       this.form.detailList = []
       this.detailList.forEach(element => {