From ccf2b575d104dc672d9ad138fa74ba1172f7b812 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Sun, 19 Jun 2022 16:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E8=AE=A1=E5=88=92-=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/dv/checksubject.js         |  44 +++++++
 src/views/mes/dv/checkplan/index.vue   |   7 +-
 src/views/mes/dv/checkplan/subject.vue | 165 +++++++++++++++++++++++++
 3 files changed, 214 insertions(+), 2 deletions(-)
 create mode 100644 src/api/mes/dv/checksubject.js
 create mode 100644 src/views/mes/dv/checkplan/subject.vue

diff --git a/src/api/mes/dv/checksubject.js b/src/api/mes/dv/checksubject.js
new file mode 100644
index 0000000..7aac373
--- /dev/null
+++ b/src/api/mes/dv/checksubject.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询点检项目列表
+export function listChecksubject(query) {
+  return request({
+    url: '/mes/dv/checksubject/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询点检项目详细
+export function getChecksubject(recordId) {
+  return request({
+    url: '/mes/dv/checksubject/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增点检项目
+export function addChecksubject(data) {
+  return request({
+    url: '/mes/dv/checksubject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改点检项目
+export function updateChecksubject(data) {
+  return request({
+    url: '/mes/dv/checksubject',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除点检项目
+export function delChecksubject(recordId) {
+  return request({
+    url: '/mes/dv/checksubject/' + recordId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue
index 29d99a9..addfbf1 100644
--- a/src/views/mes/dv/checkplan/index.vue
+++ b/src/views/mes/dv/checkplan/index.vue
@@ -231,7 +231,9 @@
         <el-tab-pane label="设备清单"> 
           <Checkmachinery ref="machinerylist" :optType="optType" :planId="form.planId" ></Checkmachinery>        
         </el-tab-pane>
-        <el-tab-pane label="点检项目"></el-tab-pane>
+        <el-tab-pane label="点检项目">
+          <Checksubject ref="subjectlist" :optType="optType" :planId="form.planId" ></Checksubject>
+        </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
@@ -246,11 +248,12 @@
 <script>
 import { listCheckplan, getCheckplan, delCheckplan, addCheckplan, updateCheckplan } from "@/api/mes/dv/checkplan";
 import Checkmachinery from "./machinery.vue"
+import Checksubject from "./subject.vue"
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Checkplan",
   dicts: ['mes_cycle_type','mes_order_status'],
-  components:{Checkmachinery},
+  components:{Checkmachinery,Checksubject},
   data() {
     return {
       autoGenFlag: false,
diff --git a/src/views/mes/dv/checkplan/subject.vue b/src/views/mes/dv/checkplan/subject.vue
new file mode 100644
index 0000000..9fe50ee
--- /dev/null
+++ b/src/views/mes/dv/checkplan/subject.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="app-container">
+    <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-if="optType !='view'"
+          v-hasPermi="['mes:dv:checksubject:add']"
+        >新增</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-if="optType !='view'"
+          v-hasPermi="['mes:dv:checksubject:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="checksubjectList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="项目编码" align="center" prop="subjectCode" />
+      <el-table-column label="项目名称" align="center" prop="subjectName" />
+      <el-table-column label="项目类型" align="center" prop="subjectType" />
+      <el-table-column label="项目内容" align="center" width="300px" prop="subjectContent" :show-overflow-tooltip="true"/>
+      <el-table-column label="标准" align="center" width="300px" prop="subjectStandard" :show-overflow-tooltip="true"/>
+      <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-delete"
+            v-if="optType !='view'"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:dv:checksubject: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"
+    />
+  </div>
+</template>
+
+<script>
+import { listChecksubject, getChecksubject, delChecksubject, addChecksubject, updateChecksubject } from "@/api/mes/dv/checksubject";
+
+export default {
+  name: "Checksubject",
+  props:{
+      planId: null,
+      optType: null
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 点检项目表格数据
+      checksubjectList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planId: this.planId,
+        subjectId: null,
+        subjectCode: null,
+        subjectName: null,
+        subjectType: null,
+        subjectContent: null,
+        subjectStandard: null,
+      },
+      // 表单参数
+      form: {}
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询点检项目列表 */
+    getList() {
+      this.loading = true;
+      listChecksubject(this.queryParams).then(response => {
+        this.checksubjectList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加点检项目";
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recordId != null) {
+            updateChecksubject(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addChecksubject(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recordIds = row.recordId || this.ids;
+      this.$modal.confirm('是否确认删除点检项目编号为"' + recordIds + '"的数据项？').then(function() {
+        return delChecksubject(recordIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+
+  }
+};
+</script>