From 633a75c6732ad3b5a505ce35bfa06bbca5831547 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Thu, 19 May 2022 23:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/qc/iqcline.js              |  44 +++++++
 src/components/vendorSelect/single.vue |  10 +-
 src/views/mes/qc/iqc/iqc.vue           |  98 +++++++++++----
 src/views/mes/qc/iqc/iqcline.vue       | 162 +++++++++++++++++++++++++
 4 files changed, 291 insertions(+), 23 deletions(-)
 create mode 100644 src/api/mes/qc/iqcline.js
 create mode 100644 src/views/mes/qc/iqc/iqcline.vue

diff --git a/src/api/mes/qc/iqcline.js b/src/api/mes/qc/iqcline.js
new file mode 100644
index 0000000..fe811cc
--- /dev/null
+++ b/src/api/mes/qc/iqcline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询来料检验单行列表
+export function listIqcline(query) {
+  return request({
+    url: '/mes/qc/iqcline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询来料检验单行详细
+export function getIqcline(lineId) {
+  return request({
+    url: '/mes/qc/iqcline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增来料检验单行
+export function addIqcline(data) {
+  return request({
+    url: '/mes/qc/iqcline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改来料检验单行
+export function updateIqcline(data) {
+  return request({
+    url: '/mes/qc/iqcline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除来料检验单行
+export function delIqcline(lineId) {
+  return request({
+    url: '/mes/qc/iqcline/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/src/components/vendorSelect/single.vue b/src/components/vendorSelect/single.vue
index 351b8bd..a191948 100644
--- a/src/components/vendorSelect/single.vue
+++ b/src/components/vendorSelect/single.vue
@@ -77,7 +77,11 @@
     </el-form>
 
     <el-table v-loading="loading" :data="vendorList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column  width="55" align="center" >
+        <template v-slot="scope">
+          <el-radio v-model="selectedVendorId" :label="scope.row.vendorId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+        </template>
+      </el-table-column>
       <el-table-column label="供应商编码" align="center" prop="vendorCode" >
       </el-table-column>
       <el-table-column label="供应商名称" align="center" prop="vendorName" width="150px" :show-overflow-tooltip="true"/>
@@ -104,6 +108,10 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="confirmSelect">确 定</el-button>
+      <el-button @click="showFlag=false">取 消</el-button>
+    </div>
   </el-dialog>
 </template>
 
diff --git a/src/views/mes/qc/iqc/iqc.vue b/src/views/mes/qc/iqc/iqc.vue
index fad297d..1223d7b 100644
--- a/src/views/mes/qc/iqc/iqc.vue
+++ b/src/views/mes/qc/iqc/iqc.vue
@@ -137,7 +137,15 @@
 
     <el-table v-loading="loading" :data="iqcList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="来料检验单编号" width="140px" align="center" prop="iqcCode" />
+      <el-table-column label="来料检验单编号" width="140px" align="center" prop="iqcCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:qc:iqc:query']"
+          >{{scope.row.iqcCode}}</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="来料检验单名称" width="120px" align="center" prop="iqcName" :show-overflow-tooltip="true"/>
       <el-table-column label="供应商简称" width="100px" align="center" prop="vendorNick" :show-overflow-tooltip="true"/>
       <el-table-column label="供应商批次号" width="120px" align="center" prop="vendorBatch" />
@@ -157,14 +165,19 @@
           <span>{{ parseTime(scope.row.inspectDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="检测人员" align="center" prop="inspector" />
-      <el-table-column label="单据状态" align="center" prop="status" />
+      <el-table-column label="检测人员" align="center" prop="inspectorName" />
+      <el-table-column label="单据状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="100px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.status =='PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['mes:qc:iqc:edit']"
           >修改</el-button>
@@ -172,6 +185,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-if="scope.row.status =='PREPARE'"
             @click="handleDelete(scope.row)"
             v-hasPermi="['mes:qc:iqc:remove']"
           >删除</el-button>
@@ -201,7 +215,7 @@
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >               
               </el-switch>
             </el-form-item>
           </el-col>
@@ -309,9 +323,15 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-divider content-position="center">结果统计</el-divider>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-collapse accordion>
-          <el-collapse-item>
+          <el-collapse-item title="结果统计">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="致命缺陷率" prop="crRate">
@@ -347,19 +367,16 @@
               </el-col>
             </el-row>
           </el-collapse-item>
-        </el-collapse>        
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
+        </el-collapse>       
+        <el-divider v-if="form.iqcId !=null" content-position="center">检测项</el-divider> 
+        <el-card shadow="always" v-if="form.iqcId !=null" class="box-card">
+          <IqcLine ref=line :iqcId="form.iqcId" :optType="optType"></IqcLine>
+        </el-card>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
+        <el-button type="success" @click="handleFinish" v-if="form.status =='PREPARE' && optType !='view'  && form.iqcId !=null">完成</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -370,11 +387,12 @@
 import { listIqc, getIqc, delIqc, addIqc, updateIqc } from "@/api/mes/qc/iqc";
 import ItemSelect  from "@/components/itemSelect/single.vue";
 import VendorSelect from "@/components/vendorSelect/single.vue";
+import IqcLine from "./iqcline.vue";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Iqc",
-  dicts: ['mes_qc_result'],
-  components: {ItemSelect,VendorSelect},
+  dicts: ['mes_qc_result','mes_order_status'],
+  components: {ItemSelect,VendorSelect,IqcLine},
   data() {
     return {
       //自动生成编码
@@ -458,6 +476,12 @@ export default {
         quantityCheck: [
           { required: true, message: "本次检测数量不能为空", trigger: "blur" }
         ],
+        reciveDate:[
+          { required: true, message: "清选择来料日期", trigger: "blur" }
+        ],
+        inspectDate:[
+          { required: true, message: "清选择检验日期", trigger: "blur" }
+        ]
       }
     };
   },
@@ -511,7 +535,7 @@ export default {
         reciveDate: null,
         inspectDate: null,
         inspector: null,
-        status: "0",
+        status: "PREPARE",
         remark: null,
         attr1: null,
         attr2: null,
@@ -548,6 +572,17 @@ export default {
       this.title = "添加来料检验单";
       this.optType = 'add';
     },
+    //查看明细
+    handleView(row){
+      this.reset();
+      const iqcId = row.iqcId || this.ids;
+      getIqc(iqcId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看来料检验单信息";
+        this.optType = "view";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -566,19 +601,38 @@ export default {
           if (this.form.iqcId != null) {
             updateIqc(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              //this.open = false;
               this.getList();
             });
           } else {
             addIqc(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
+              //this.open = false;
+              this.form.iqcId=response.data;
               this.getList();
             });
           }
         }
       });
     },
+    //点击完成
+    handleFinish(){
+      let that = this;
+      if(this.form.checkResult == null){
+        this.$modal.msgError("请选择检测结果！");
+        return;
+      }
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.confirm('是否完成来料检验单编制？【完成后将不能更改】').then(function(){
+            that.form.status = 'CONFIRMED';
+            that.submitForm();
+            that.open = false;
+          });
+        }
+        });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const iqcIds = row.iqcId || this.ids;
diff --git a/src/views/mes/qc/iqc/iqcline.vue b/src/views/mes/qc/iqc/iqcline.vue
new file mode 100644
index 0000000..6932b04
--- /dev/null
+++ b/src/views/mes/qc/iqc/iqcline.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="iqclineList" @selection-change="handleSelectionChange">      
+      <el-table-column label="检测项名称" width="100px" align="center" prop="indexName" />
+      <el-table-column label="检测项类型" width="100px" align="center" prop="indexType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="检测工具" align="center" prop="qcTool" />
+      <el-table-column label="检测要求" align="center" prop="checkMethod" />
+      <el-table-column label="标准值" align="center" prop="standerVal" />
+      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="误差上限" align="center" prop="thresholdMax" />
+      <el-table-column label="误差下限" align="center" prop="thresholdMin" />
+      <el-table-column label="致命缺陷数量" align="center" prop="crQuantity" />
+      <el-table-column label="严重缺陷数量" align="center" prop="majQuantity" />
+      <el-table-column label="轻微缺陷数量" align="center" prop="minQuantity" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" v-if="optType !='view'" 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="['mes:qc:iqcline:edit']"
+          >缺陷记录</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 { listIqcline, getIqcline, delIqcline, addIqcline, updateIqcline } from "@/api/mes/qc/iqcline";
+
+export default {
+  name: "IqcLine",
+  dicts: ['mes_index_type'],
+  props:{
+      iqcId: null,
+      optType: null,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 来料检验单行表格数据
+      iqclineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        iqcId: this.iqcId,
+        indexId: null,
+        indexCode: null,
+        indexName: null,
+        indexType: null,
+        qcTool: null,
+        checkMethod: null,
+        standerVal: null,
+        unitOfMeasure: null,
+        thresholdMax: null,
+        thresholdMin: null,
+        crQuantity: null,
+        majQuantity: null,
+        minQuantity: null,
+      },
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询来料检验单行列表 */
+    getList() {
+      this.loading = true;
+      listIqcline(this.queryParams).then(response => {
+        this.iqclineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: null,
+        iqcId: this.iqcId,
+        indexId: null,
+        indexCode: null,
+        indexName: null,
+        indexType: null,
+        qcTool: null,
+        checkMethod: null,
+        standerVal: null,
+        unitOfMeasure: null,
+        thresholdMax: null,
+        thresholdMin: null,
+        crQuantity: null,
+        majQuantity: null,
+        minQuantity: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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.lineId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+  }
+};
+</script>