代码更新

mes/qd/src/views/wms/basedata/em/devicemaintain/index.vue

@@ -11,6 +11,15 @@
           label-width="80px"
           label-suffix=":"
         >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
           <el-form-item label="保养项目">
             <el-input
               v-model="query.maint_item_code"
@@ -89,6 +98,20 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="设备类别:" prop="material_type_id">
+                <treeselect
+                  v-model="form.material_type_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 230px;"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col span="24">
               <el-form-item label="保养内容:" prop="contents">
@@ -124,6 +147,7 @@
         <el-table-column v-if="false" prop="maint_item_id" label="设备保养项目标识" />
         <el-table-column prop="maint_item_code" label="保养项目编码" />
         <el-table-column prop="maint_item_name" label="保养项目名称" />
+        <el-table-column prop="class_name" label="设备类别" />
         <el-table-column prop="item_level" label="保养等级" :formatter="formatLevel"/>
         <el-table-column prop="contents" label="保养内容" show-overflow-tooltip />
         <el-table-column prop="requirement" label="保养要求" show-overflow-tooltip />
@@ -153,11 +177,15 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 
-const defaultForm = { maint_item_id: null, maint_item_code: null, maint_item_name: null, item_level: null, contents: null, requirement: null, acceptancecriteria: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
+const defaultForm = { material_type_id: null, maint_item_id: null, maint_item_code: null, maint_item_name: null, item_level: null, contents: null, requirement: null, acceptancecriteria: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
 export default {
   name: 'Devicemaintenanceitems',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -176,6 +204,9 @@ export default {
   },
   data() {
     return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
       itemLevelList: [
         { 'label': '日常', 'value': '01' },
         { 'label': '一级', 'value': '02' },
@@ -198,9 +229,23 @@ export default {
         ],
         acceptancecriteria: [
           { required: true, message: '验收标准不能为空', trigger: 'blur' }
+        ],
+        material_type_id: [
+          { required: true, message: '设备类别不能为空', trigger: 'blur' }
         ]
       }}
   },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
@@ -217,6 +262,34 @@ export default {
       } else if (row.item_level === '03') {
         return '二级'
       }
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
     }
   }
 }

mes/qd/src/views/wms/basedata/em/devicerepairitems/index.vue

@@ -11,6 +11,15 @@
           label-width="80px"
           label-suffix=":"
         >
+          <el-form-item label="设备类别">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadClass"
+              :options="classes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
           <el-form-item label="维修项目">
             <el-input
               v-model="query.repair_item_code"
@@ -50,6 +59,20 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="设备类别:" prop="material_type_id">
+                <treeselect
+                  v-model="form.material_type_id"
+                  :load-options="loadClass"
+                  :options="classes"
+                  style="width: 200px;"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col span="24">
               <el-form-item label="维修要求:" prop="requirement">
@@ -77,6 +100,7 @@
         <el-table-column v-if="false" prop="repair_item_id" label="设备维修项目标识" />
         <el-table-column prop="repair_item_code" label="维修项目编码" />
         <el-table-column prop="repair_item_name" label="维修项目名称" />
+        <el-table-column prop="class_name" label="设备类别" />
         <el-table-column prop="requirement" label="维修要求" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人姓名" />
@@ -103,11 +127,15 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 
-const defaultForm = { repair_item_id: null, repair_item_code: null, repair_item_name: null, requirement: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
+const defaultForm = { material_type_id: null, repair_item_id: null, repair_item_code: null, repair_item_name: null, requirement: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, remark: null }
 export default {
   name: 'Devicerepairitems',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -126,6 +154,9 @@ export default {
   },
   data() {
     return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
       permission: {
       },
       rules: {
@@ -134,13 +165,55 @@ export default {
         ],
         requirement: [
           { required: true, message: '维修要求不能为空', trigger: 'blur' }
+        ],
+        material_type_id: [
+          { required: true, message: '设备类别不能为空', trigger: 'blur' }
         ]
       }}
   },
+  created() {
+    const param = {
+      'materOpt_code': this.materOpt_code
+    }
+    crudMaterialbase.getMaterOptType(param).then(res => {
+      this.class_idStr = res.class_idStr
+      this.crud.query.class_idStr = this.class_idStr
+      this.crud.toQuery()
+      this.queryClassId()
+    })
+  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    loadClass({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
     }
   }
 }