代码更新

2022-09-22 17:34:26 +08:00
parent 35d96da6ba
commit b30a546522
13 changed files with 417 additions and 27 deletions
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue
@@ -14,7 +14,7 @@
      </el-col>
      <el-col :span="6">
        <span>
-          <el-button icon="el-icon-check" size="mini" type="primary" @click="endRepair">结束维修</el-button>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="endRepair">保存并结束</el-button>
          <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">保存</el-button>
          <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
        </span>
@@ -81,6 +81,38 @@
      </el-row>
    </el-form>

+    <div class="crud-opts2">
+      <span class="role-span">结果录入</span>
+    </div>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="故障描述" prop="fault_comment">
+            <el-input v-model="form.fault_comment" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障原因" prop="fault_cause">
+            <el-input v-model="form.fault_cause" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="问题分析" prop="fault_analysis">
+            <el-input v-model="form.fault_analysis" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="处理措施" prop="measure">
+            <el-input v-model="form.measure" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
    <div class="crud-opts2">
      <span class="role-span">项目明细</span>
    </div>
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -133,7 +133,7 @@
        >
          班组验收
        </el-button>
-        <el-button
+<!--        <el-button
          slot="right"
          class="filter-item"
          type="success"
@@ -143,7 +143,7 @@
          @click="resuftRepair"
        >
          结果录入
-        </el-button>
+        </el-button>-->
      </crudOperation>
      <!--表格渲染-->
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
--- a/mes/qd/src/views/wms/sb/repair/devicevprs/DeviceDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicevprs/DeviceDialog.vue
@@ -0,0 +1,221 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="设备">
+        <el-input
+          v-model="query.device_code"
+          clearable
+          size="mini"
+          placeholder="编码、名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属部门">
+        <treeselect
+          v-model="query.dept_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
+      <el-form-item label="使用班组">
+        <treeselect
+          v-model="query.use_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+
+      <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="dept_name" label="归属部门" show-overflow-tooltip />
+      <el-table-column prop="use_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="型号" 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 />
+      <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudDevicemaintenanceplanmst from '@/api/wms/sb/devicemaintenanceplanmst'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getDepts } from '@/api/system/dept'
+
+export default {
+  name: 'Device',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({
+      title: '设备',
+      url: 'api/devicemaintenanceplanmst/queryDevice2',
+      crudMethod: { ...crudDevicemaintenanceplanmst }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      checkrow: null,
+      class_idStr: null,
+      depts: [],
+      rows: [],
+      XLList: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  created() {
+    this.getDepts()
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    formatTypeName(row, cloum) {
+      if (row.device_type === '01') {
+        return '资产'
+      } else if (row.device_type === '02') {
+        return '普通设备'
+      } else if (row.device_type === '03') {
+        return '其他'
+      }
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        if (val.length > 1) {
+          this.$refs.table.clearSelection()
+          this.$refs.table.toggleRowSelection(val.pop())
+        } else {
+          this.checkrow = row
+        }
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged2', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选设备')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged2', this.rows)
+    },
+    // 获取弹窗内部门数据
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+
--- a/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicevprs/index.vue
@@ -96,19 +96,6 @@
                </el-input>
              </el-form-item>
            </el-col>
-            <el-col span="12">
-              <el-form-item label="故障描述:" prop="solutions">
-                <el-input v-model="form.fault_desc" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col span="12">
-              <el-form-item label="班组配合人:" prop="product_person_name">
-                <el-input v-model="form.product_person_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
            <el-col span="12">
              <el-form-item label="故障等级:" prop="fault_level">
                <el-select
@@ -129,6 +116,22 @@
            </el-col>
          </el-row>

+          <el-row>
+            <el-col span="12">
+              <el-form-item label="班组配合人:" prop="product_person_name">
+                <el-input v-model="form.product_person_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="故障描述:" prop="solutions">
+                <el-input v-model="form.fault_desc" style="width: 650px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
          <el-row>
            <el-col span="24">
              <el-form-item label="备注:" prop="remark">
@@ -202,7 +205,7 @@ 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'
 import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog'
-import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog'
+import DeviceDialog from '@/views/wms/sb/repair/devicevprs/DeviceDialog'
 import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog'
 import { getDepts } from '@/api/system/dept'

@@ -309,13 +312,7 @@ export default {
      })
    },
    formaLevelName(row, cloum) {
-      if (row.fault_level === '01') {
-        return '一级'
-      } else if (row.fault_level === '02') {
-        return '二级'
-      } else if (row.fault_level === '03') {
-        return '三级'
-      }
+      return this.dict.label.EM_FAULT_LEVEL[row.fault_level]
    },
    formatStatusName(row, cloum) {
      if (row.status === '01') {
--- a/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue
+++ b/mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue
@@ -69,11 +69,13 @@
        <el-table-column type="selection" width="55" />
        <el-table-column prop="dept_name" label="使用部门" />
        <el-table-column prop="class_name" label="设备类型" />
+        <el-table-column prop="device_name" label="设备名称" />
        <el-table-column prop="device_code" label="设备编码">
          <template slot-scope="scope">
            <el-link type="warning" @click="openDtl(scope.row)">{{ scope.row.device_code }}</el-link>
          </template>
        </el-table-column>
+        <el-table-column prop="extend_code" label="自编码" />
        <el-table-column prop="device_model" label="型号规格" />
        <el-table-column prop="nunm" label="故障次数" />
        <el-table-column prop="avgVal_time" label="平均故障间隔时间(小时)" :formatter="crud.formatNum2" />
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
@@ -111,6 +111,7 @@
        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
        <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
        <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
+        <el-table-column prop="detail_count" label="明细数" />
        <el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
        <el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
        <el-table-column prop="real_end_date" label="实际结束日期" width="150px" />