From ed7f9eab1e6b435211d65f5d35897f06e6b5e3e1 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 12 Sep 2024 23:55:06 +0800
Subject: [PATCH] =?UTF-8?q?cpk=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/cpkUpdown.js                  |  44 ++
 src/api/quality/qcTable.js                    |   2 +-
 src/views/mes/mesLine/index.vue               |   6 +-
 src/views/quality/cpkUpDowConfig/index.vue    | 442 ++++++++++++++++++
 .../quality/cpkUpDowConfig/selectMaterial.vue | 153 ++++++
 5 files changed, 642 insertions(+), 5 deletions(-)
 create mode 100644 src/api/quality/cpkUpdown.js
 create mode 100644 src/views/quality/cpkUpDowConfig/index.vue
 create mode 100644 src/views/quality/cpkUpDowConfig/selectMaterial.vue

diff --git a/src/api/quality/cpkUpdown.js b/src/api/quality/cpkUpdown.js
new file mode 100644
index 00000000..9b9831f5
--- /dev/null
+++ b/src/api/quality/cpkUpdown.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检验节点维护列表
+export function listCpkUpdown(query) {
+    return request({
+        url: '/quality/cpkUpdown/list',
+        method: 'get',
+        params: query
+    });
+}
+
+// 查询检验节点维护详细
+export function getCpkUpdown(id) {
+    return request({
+        url: '/quality/cpkUpdown/' + id,
+        method: 'get'
+    });
+}
+
+// 新增检验节点维护
+export function addCpkUpdown(data) {
+    return request({
+        url: '/quality/cpkUpdown',
+        method: 'post',
+        data: data
+    });
+}
+
+// 修改检验节点维护
+export function updateCpkUpdown(data) {
+    return request({
+        url: '/quality/cpkUpdown',
+        method: 'put',
+        data: data
+    });
+}
+
+// 删除检验节点维护
+export function delCpkUpdown(id) {
+    return request({
+        url: '/quality/cpkUpdown/' + id,
+        method: 'delete'
+    });
+}
diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 625d967f..ccdbd82f 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -167,4 +167,4 @@ export function getIncomeChartList(query) {
 		method: 'post',
 		data: query
 	});
-}
\ No newline at end of file
+}
diff --git a/src/views/mes/mesLine/index.vue b/src/views/mes/mesLine/index.vue
index ea9d752c..d33b23c1 100644
--- a/src/views/mes/mesLine/index.vue
+++ b/src/views/mes/mesLine/index.vue
@@ -27,8 +27,7 @@
       <el-form-item label="产品编码" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
-          type="number"
-          placeholder="请输入标准用人"
+          placeholder="请输入产品编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -36,8 +35,7 @@
       <el-form-item label="产品名称" prop="productName">
         <el-input
           v-model="queryParams.productName"
-          type="number"
-          placeholder="请输入标准效率"
+          placeholder="请输入产品名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
diff --git a/src/views/quality/cpkUpDowConfig/index.vue b/src/views/quality/cpkUpDowConfig/index.vue
new file mode 100644
index 00000000..db10abf5
--- /dev/null
+++ b/src/views/quality/cpkUpDowConfig/index.vue
@@ -0,0 +1,442 @@
+<template>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+            <el-form-item label="检验类型" prop="typeCode">
+              <el-select
+                v-model="queryParams.typeCode"
+                clearable
+                placeholder="请选择检验类型"
+                @change="getCheckTypeList"
+              >
+                <el-option
+                  v-for="dict in dict.type.check_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="检验节点" prop="checkType">
+              <el-select
+                v-model="queryParams.checkType"
+                clearable
+                placeholder="检验节点"
+              >
+                <el-option
+                  v-for="dict in checkTypeList"
+                  :key="dict.checkType"
+                  :label="dict.checkName"
+                  :value="dict.checkType"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="物料号" prop="materialCode">
+                <el-input
+                        v-model="queryParams.materialCode"
+                        placeholder="请输入物料号"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+                <el-input
+                        v-model="queryParams.materialName"
+                        placeholder="请输入物料名称"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="检测项" prop="ruleName">
+                <el-input
+                        v-model="queryParams.ruleName"
+                        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="['quality:cpkUpDowConfig: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="['quality:cpkUpDowConfig: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="['quality:cpkUpDowConfig:remove']"
+                >删除
+                </el-button>
+            </el-col>
+            <!--
+            <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                  v-hasPermi="['mes:mesLine:export']"
+                >导入
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+            </el-col>-->
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="updownList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="物料号" width="150" align="center" prop="materialCode" :formatter="productCodeFormate"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"/>
+            <el-table-column label="检验类型" width="140" align="center" prop="typeCode">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.check_type" :value="scope.row.typeCode"/>
+              </template>
+            </el-table-column>  
+            <el-table-column label="检验节点" width="140" align="center" prop="checkType"/>
+            <el-table-column label="检测项编码" width="140" align="center" prop="ruleCode"/>
+            <el-table-column label="检测项名称" width="140" align="center" prop="ruleName"/>
+            <el-table-column label="上限" width="120" align="center" prop="upVal"/>
+            <el-table-column label="下限" width="120" align="center" prop="downVal"/>
+            <el-table-column label="创建时间" width="150" align="center" prop="createTime"/>
+        </el-table>
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+
+        <!-- 添加或修改物料CPK上下限维护对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-row :gutter="10">
+              <el-col :span="12">
+                <el-form-item label="检验类型" prop="typeCode">
+                    <el-select
+                      v-model="form.typeCode"
+                      clearable 
+                      style="width:100%"
+                      placeholder="请选择检验类型"
+                      @change="getCheckTypeList"
+                    >
+                      <el-option
+                        v-for="dict in dict.type.check_type"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      ></el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="检验类型" prop="checkType">
+                  <el-select
+                    v-model="form.checkType"
+                    clearable
+                    style="width:100%"
+                    placeholder="检验节点"
+                    @change="getProjectListFunc"
+                  >
+                    <el-option
+                      v-for="dict in checkTypeList"
+                      :key="dict.checkType"
+                      :label="dict.checkName"
+                      :value="dict.checkType"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="物料号" prop="materialCode">
+                      <el-input v-model="form.materialCode" placeholder="请输入物料号">
+                      <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
+                      </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="物料名称" prop="materialName">
+                      <el-input v-model="form.materialName" placeholder="请输入物料名称" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="选择检测项" prop="ruleCode">
+                      <el-select
+                        v-model="form.ruleCode"
+                        clearable
+                        style="width:100%"
+                        placeholder="检验节点"
+                        filterable
+                         @change="getProjectNameFunc"
+                      >
+                        <el-option
+                        v-for="item in projectNoOptions"
+                        :key="item.recordId"
+                        :label="item.ruleName"
+                        :value="item.recordId"
+                        ></el-option>
+                      </el-select>
+                  </el-form-item>
+                  
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="检测项名称" prop="ruleName" >
+                      <el-input v-model="form.ruleName" placeholder="请输入物料名称" disabled/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="上限" prop="upVal">
+                      <el-input v-model="form.upVal" type="number" placeholder="请输入上限" min="0"/>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="下限" prop="downVal">
+                      <el-input v-model="form.downVal" type="number" placeholder="请输入下限" min="0"/>
+                  </el-form-item>
+                </el-col>
+                </el-row>
+            </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>
+            <ItemSelectMaterial
+            ref="itemSelectMaterial"
+            @onSelected="onSelectMaterial"
+          ></ItemSelectMaterial>
+
+    </div>
+</template>
+
+<script>
+import {listCpkUpdown,getCpkUpdown, delCpkUpdown,addCpkUpdown,updateCpkUpdown } from "@/api/quality/cpkUpdown";
+import ItemSelectMaterial from "@/views/quality/cpkUpDowConfig/selectMaterial";
+import {getCheckTypeList,getProjectOptionList} from "@/api/quality/qcTable";
+    export default {
+        name: "Updown",
+        dicts: ["check_type"],
+        components: {ItemSelectMaterial},
+        data() {
+            return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            checkTypeList: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 物料CPK上下限维护表格数据
+            updownList: [],
+            projectNoOptions: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                typeCode: null,
+                checkType: null,
+                factoryCode: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: null
+            },
+            // 表单参数
+            form: {downVal:0,upVal:0},
+            // 表单校验
+            rules: {
+              typeCode: [{ required: true, message: "检验类型", trigger: "blur" }],
+              checkType: [{ required: true, message: "检验节点", trigger: "blur" }],
+              materialCode: [{ required: true, message: "物料名称", trigger: "blur" }],
+              ruleName: [{ required: true, message: "检测项名称", trigger: "blur" }],
+            }
+          };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+          /** 查询物料CPK上下限维护列表 */
+          getList() {
+              this.loading = true;
+              listCpkUpdown(this.queryParams).then(response => {
+                  this.updownList = response.rows;
+                  this.total = response.total;
+                  this.loading = false;
+              });
+          },
+          // 取消按钮
+          cancel() {
+              this.open = false;
+              this.reset();
+          },
+          // 表单重置
+          reset() {
+              this.form = {
+                id: null,
+                typeCode: null,
+                checkType: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                factoryCode: null,
+                delFlag: null,
+                materialCode: null,
+                materialName: null,
+                upVal: null,
+                downVal: 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.id)
+              this.single = selection.length !== 1
+              this.multiple = !selection.length
+          },
+          /** 新增按钮操作 */
+          handleAdd() {
+              this.reset();
+              this.open = true;
+              this.title = "添加物料CPK上下限维护";
+          },
+          /** 修改按钮操作 */
+          handleUpdate(row) {
+              this.reset();
+              const id =
+              row.id || this.ids
+              getCpkUpdown(id).then(response => {
+                  this.form = response.data;
+                  this.open = true;
+                  this.title = "修改物料CPK上下限维护";
+         
+                  this.getCheckTypeList(this.form.typeCode);
+
+                  this.getProjectListFunc(this.form.checkType)
+              });
+          },
+          /** 提交按钮 */
+          submitForm() { 
+            this.$refs["form"].validate(valid => {
+              if (valid) {
+                if (this.form.id != null) {
+                  updateCpkUpdown(this.form).then(response => {
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                } else {
+                  addCpkUpdown(this.form).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                }
+              }
+			      })
+          },
+          /** 删除按钮操作 */
+          handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal.confirm('是否确认删除数据项？').then(function() {
+              return delCpkUpdown(ids);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          },
+          		/** 导出按钮操作 */
+        handleExport() {
+          this.download('quality/cpkUpdown/export', {
+            ...this.queryParams
+          }, `cpkUpDow_${new Date().getTime()}.xlsx`)
+        },
+        getCheckTypeList(val) {
+          getCheckTypeList(val).then((response) => {
+            this.checkTypeList = response;
+          });
+        },
+            //产品编码格式化
+        productCodeFormate(row, column, cellValue) {
+          if (cellValue != null) {
+            return cellValue.slice(7, 18); //返回值
+          }
+        },
+        //物料选择
+        handleSelectProduct() {
+          this.$refs.itemSelectMaterial.showFlag = true;
+        },
+        //物料选择确认
+        onSelectMaterial(obj) {
+          this.form.materialName = obj[0].productName;
+          this.form.materialCode = obj[0].productCode;
+        },
+        //获取定量检测项
+        getProjectListFunc(val) {
+          getProjectOptionList(val).then((response) => {
+            this.projectNoOptions = response;
+          });
+        },
+        getProjectNameFunc(value){
+          const selectedOption = this.projectNoOptions.find(option => option.recordId === value);  
+          if (selectedOption) {  
+            this.form.ruleName = selectedOption.ruleName;
+          }  
+        }
+	}
+};
+</script>
diff --git a/src/views/quality/cpkUpDowConfig/selectMaterial.vue b/src/views/quality/cpkUpDowConfig/selectMaterial.vue
new file mode 100644
index 00000000..4dfee3a7
--- /dev/null
+++ b/src/views/quality/cpkUpDowConfig/selectMaterial.vue
@@ -0,0 +1,153 @@
+<template>
+  <el-dialog title="BOM物料选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="1000px"
+  >
+    <el-row :gutter="20">
+      <!--BOM数据-->
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
+          <el-form-item label="物料编码" prop="itemCode">
+            <el-input
+              v-model="queryParams.productCode"
+              placeholder="请输入物料编码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料名称" prop="itemName">
+            <el-input
+              v-model="queryParams.productName"
+              placeholder="请输入物料名称"
+              clearable
+              style="width: 240px"
+              @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-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
+          <el-table-column width="50" align="center" type="selection">
+          </el-table-column>
+          <!-- 序号 -->
+          <el-table-column type="index" width="90" align="center" label="序号"></el-table-column>
+          <el-table-column label="BOM物料组件编码"  align="left" key="productCode" prop="productCode" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="BOM物料组件名称"  align="left" key="productName" prop="productName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitBomForm">确 定</el-button>
+              <el-button @click="showFlag=false">取 消</el-button>
+       </div>
+  </el-dialog>
+</template>
+<script>
+
+import {getProductListBom } from "@/api/mes/mesLine";
+export default {
+  name: "itemSelectMaterial",
+  data() {
+    return {
+      showFlag:false,
+      // 选中数组
+      selectedRows: {},
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: false,
+      // 显示搜索条件
+      showSearch: true,
+      selectedList: [],
+      // 总条数
+      total: 0,
+      // BOM产品表格数据
+      itemList: [],
+      productList:[],
+      //树名称
+      bomCode: undefined,
+      defaultProps: {
+        id: "id",
+        label: "label"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productCode: '',
+        productName: ''
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `BOM物料编码`, visible: true },
+        { key: 1, label: `产品名称`, visible: true },
+        { key: 2, label: `BOM物料组件编码`, visible: true },
+        { key: 3, label: `BOM物料组件名称`, visible: true }
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    handleEquipmentSelectionChange (val) {
+       this.itemList = val
+    },
+
+    /** 查询BOM列表*/
+    getList() {
+      this.loading = true;
+      getProductListBom(this.queryParams).then(response => {
+          this.itemList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+
+    // 多选框选中数据
+		handleBomSelectionChange(selection) {
+      if(selection.length==1){
+        this.productList = selection;
+      }else{
+        this.$modal.msgSuccess("请选择一个产品");
+      }
+
+		},
+
+
+    submitBomForm() {
+      this.$emit('onSelected', this.productList);
+      this.showFlag = false;
+    }
+  }
+};
+</script>