代码更新

2022-09-05 15:10:01 +08:00
parent ab4f712f48
commit 1613117ece
10 changed files with 333 additions and 25 deletions
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/ItemDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/ItemDialog.vue
@@ -14,6 +14,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"
@@ -53,6 +62,7 @@
      </el-table-column>
      <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="备注" />
      <el-table-column prop="create_name" label="创建人姓名" />
@@ -73,10 +83,14 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudDevicerepairitems from '@/api/wms/basedata/em/devicerepairitems'
+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'

 export default {
  name: 'Item',
-  components: { rrOperation, pagination },
+  components: { rrOperation, pagination, Treeselect },
  cruds() {
    return CRUD({
      title: '维修项目',
@@ -96,6 +110,9 @@ export default {
  },
  data() {
    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
      dialogVisible: false,
      tableRadio: null,
      checkrow: null,
@@ -109,6 +126,17 @@ export default {
      }
    }
  },
+  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: {
    clickChange(item) {
      this.tableRadio = item
@@ -148,6 +176,34 @@ export default {
      this.crud.resetQuery(false)
      this.$emit('update:dialogShow', false)
      this.$emit('tableChanged1', this.rows)
+    },
+    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
+        })
+      })
    }
  }
 }
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
@@ -48,10 +48,11 @@

      <el-table-column prop="device_code" label="设备编码" min-width="130" show-overflow-tooltip />
      <el-table-column prop="device_name" label="设备名称" min-width="130" show-overflow-tooltip />
+      <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
      <el-table-column prop="class_name" label="设备类型" show-overflow-tooltip />
      <el-table-column prop="device_spec" label="规格" min-width="130" show-overflow-tooltip />
-      <el-table-column prop="device_model" label="型号" />
-      <el-table-column prop="supplier_name" label="供应商" />
+      <el-table-column prop="device_model" label="型号" show-overflow-tooltip />
+      <el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip />
      <el-table-column prop="device_type" label="设备属性" :formatter="formatTypeName"/>
      <el-table-column prop="workprocedure_name" label="工序" />
      <el-table-column prop="is_produceuse" label="生产用途" show-overflow-tooltip />
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/ItemDialog.vue
@@ -14,6 +14,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"
@@ -70,14 +79,15 @@
          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
        </template>
      </el-table-column>
-      <el-table-column prop="maint_item_code" label="保养项目编码" />
-      <el-table-column prop="maint_item_name" label="保养项目名称" />
+      <el-table-column prop="maint_item_code" label="保养项目编码" width="100px" />
+      <el-table-column prop="maint_item_name" label="保养项目名称" width="100px" />
+      <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 />
      <el-table-column prop="acceptancecriteria" label="验收标准" show-overflow-tooltip />
      <el-table-column prop="remark" label="备注" />
-      <el-table-column prop="create_name" label="创建人姓名" />
+      <el-table-column prop="create_name" label="创建人" />
      <el-table-column prop="create_time" label="创建时间" width="150px"/>
    </el-table>
    <!--分页组件-->
@@ -95,10 +105,14 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudDevicemaintenanceitems from '@/api/wms/basedata/em/devicemaintenanceitems'
+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'

 export default {
  name: 'Item',
-  components: { rrOperation, pagination },
+  components: { rrOperation, pagination, Treeselect },
  cruds() {
    return CRUD({
      title: '保养项目',
@@ -118,6 +132,9 @@ export default {
  },
  data() {
    return {
+      classes: [],
+      class_idStr: null,
+      materOpt_code: '23',
      dialogVisible: false,
      tableRadio: null,
      checkrow: null,
@@ -137,6 +154,17 @@ export default {
      }
    }
  },
+  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: {
    clickChange(item) {
      this.tableRadio = item
@@ -185,6 +213,34 @@ export default {
      this.crud.resetQuery(false)
      this.$emit('update:dialogShow', false)
      this.$emit('tableChanged1', this.rows)
+    },
+    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
+        })
+      })
    }
  }
 }