rev:设备管理功能优化

mes/qd/src/views/wms/device_manage/repair/devicevprs/FaultDialog.vue

@@ -162,6 +162,9 @@ export default {
   methods: {
     open() {
       this.query.material_type_id = this.openParam.material_type_id
+      this.crud.query.class_idStr = this.class_idStr
+      this.queryClassId()
+      this.queryClassId2()
       this.crud.toQuery()
     },
     clickChange(item) {
@@ -216,17 +219,10 @@ export default {
       }
     },
     queryClassId() {
-      const param = {
-        'class_idStr': '2'
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
+      const data = {}
+      data.id = this.openParam.material_type_id
+      data.parent_id = '2'
+      this.getSubTypes(data)
     },
     queryClassId2() {
       const param = {

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue

@@ -18,7 +18,7 @@
               size="mini"
               placeholder="所属仓库"
               class="filter-item"
-              @change="crud.toQuery"
+              @change="changeSect(query.stor_id)"
             >
               <el-option
                 v-for="item in storlist"
@@ -29,6 +29,24 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="所属库区">
+            <el-select
+              v-model="query.sect_id"
+              clearable
+              size="mini"
+              placeholder="所属库区"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in sectlist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="入库日期">
             <el-date-picker
               v-model="query.createTime"
@@ -131,6 +149,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
 import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
 import semiproductivt from '@/views/wms/storage_manage/semiproduct/semiproductIvt/semiproductivt'
 
 export default {
@@ -153,6 +172,7 @@ export default {
       height: document.documentElement.clientHeight - 180 + 'px;',
       permission: {},
       storlist: [],
+      sectlist: [],
       storId: null
     }
   },
@@ -167,12 +187,18 @@ export default {
       this.storlist = res.content
     })
   },
+
   methods: {
     downloadMethod() {
       semiproductivt.exportFile(this.query).then(res => {
         this.crud.notify('导出成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })
     },
+    changeSect(){
+      crudSectattr.getSect({ 'stor_id': this.query.stor_id }).then(res => {
+        this.sectlist = res.content[0].children
+      })
+    },
     formatBillType(row, column) {
       return this.dict.label.ST_INV_BCP_IN_TYPE[row.bill_type]
     }

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductout/StructIvt.vue

@@ -19,6 +19,24 @@
           label-width="80px"
           label-suffix=":"
         >
+          <el-form-item label="库区">
+            <el-select
+              v-model="query.sect_id"
+              clearable
+              size="mini"
+              placeholder="所属库区"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            >
+              <el-option
+                v-for="item in sectlist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="货位">
             <el-input
               v-model="query.struct_search"
@@ -84,6 +102,8 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
 
 const start = new Date()
 export default {
@@ -110,6 +130,7 @@ export default {
     return {
       dialogVisible: false,
       rows: [],
+      sectlist: [],
       tableData: []
     }
   },
@@ -137,7 +158,9 @@ export default {
       }
     },
     open() {
-      this.crud.toQuery()
+      crudSectattr.getSect({ 'stor_id': '15286279952695336962' }).then(res => {
+        this.sectlist = res.content[0].children
+      })
     },
     close() {
       this.$emit('update:dialogShow', false)