add:新增上机明细查询

src/api/mes/md/workunit.js

@@ -8,6 +8,14 @@ export function listWorkunit(query) {
     params: query
   })
 }
+// 根据工作单元查询上机明细
+export function listWorkTmToolRequestList(query) {
+  return request({
+    url: "/md/workunit/getUpTmToolRequestList",
+    method: "get",
+    params: query,
+  });
+}
 
 // 查询工作单元详细
 export function getWorkunit(workunitId) {

src/views/mes/tm/toolmachinesrecord/index.vue

@@ -273,7 +273,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        toolMachinesRecordId: null,        toolMachinesId: null,        toolRequestUseItemId: null,        type: null,        upDate: null,        downDate: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        type: null,
+        typeStr: null,
+        warehouseStr: null,
+        toolRequestUseItemId: null,
+        upDate: null,
+        downDate: null,
+      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */

src/views/mes/tm/toolrequestlist/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="工作单元名称" prop="workunitName">
+        <el-input
+          v-model="queryParams.workunitName"
+          placeholder="请输入工作单元名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工作单元编码" prop="workunitCode">
+        <el-input
+          v-model="queryParams.workunitCode"
+          placeholder="请输入工作单元编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- <el-row :gutter="10" class="mb8"> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['tm:toolmachinesrecord:add']"
+        >新增</el-button>
+      </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['tm:toolmachinesrecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['tm:toolmachinesrecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['tm:toolmachinesrecord:export']"
+        >导出</el-button>
+      </el-col> -->
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="物料编码" width="130" align="center" prop="itemCode" />
+      <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
+      <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />
+      <el-table-column label="任务编码" width="120" align="center" prop="taskCode" />
+      <el-table-column label="任务名称" show-overflow-tooltip min-width="180" align="center" prop="taskName" />
+      <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
+      <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
+      <el-table-column label="数量" width="80" align="center" prop="allQuantity" />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['tm:toolmachinesrecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['tm:toolmachinesrecord:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改刀模板上下机记录对话框 -->
+    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="刀模板上下机主表ID" prop="toolMachinesId">
+          <el-input v-model="form.toolMachinesId" placeholder="请输入刀模板上下机主表ID" />
+        </el-form-item>
+        <el-form-item label="刀模板领用单附表id" prop="toolRequestUseItemId">
+          <el-input v-model="form.toolRequestUseItemId" placeholder="请输入刀模板领用单附表id" />
+        </el-form-item>
+        <el-form-item label="上下机类型(1上机2下机)" prop="type">
+          <el-select v-model="form.type" placeholder="请选择上下机类型(1上机2下机)">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上机时间" prop="upDate">
+          <el-date-picker clearable
+            v-model="form.upDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择上机时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="下机时间" prop="downDate">
+          <el-date-picker clearable
+            v-model="form.downDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择下机时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import { listWorkTmToolRequestList } from "@/api/mes/md/workunit";
+
+export default {
+  name: "Record",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 刀模板上下机记录表格数据
+      recordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        workunitCode: null,
+        workunitName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询上机明细列表 */
+    getList() {
+      this.loading = true;
+      const params = Object.assign({}, this.queryParams)
+      delete params.type
+      listWorkTmToolRequestList(params).then(response => {
+        this.recordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        workunitCode: null,
+        workunitName: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.toolMachinesRecordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加刀模板上下机记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const toolMachinesRecordId = row.toolMachinesRecordId || this.ids
+      getRecord(toolMachinesRecordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改刀模板上下机记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.toolMachinesRecordId != null) {
+            updateRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const toolMachinesRecordIds = row.toolMachinesRecordId || this.ids;
+      this.$modal.confirm('是否确认删除刀模板上下机记录编号为"' + toolMachinesRecordIds + '"的数据项？').then(function() {
+        return delRecord(toolMachinesRecordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('md/record/export', {
+        ...this.queryParams
+      }, `record_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>