质量管理待检任务

src/api/mes/qc/pending.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询待检验任务清单
+export function listPending(query) {
+  return request({
+    url: '/mes/qc/pending/list',
+    method: 'get',
+    params: query
+  })
+}
+

src/router/index.js

@@ -217,6 +217,35 @@ export const dynamicRoutes = [
         meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
       }
     ]
+  },
+  {
+    path: '/mes/qc/pendinginspect/add',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes:qc:pending'],
+    children: [
+      {
+        path: 'iqc',
+        component: () => import('@/views/mes/qc/iqc/iqc'),
+        name: 'iqcadd',
+        props: true,
+        meta: {title: '来料检验', activeMenu: '/mes/qc/pendinginspect/iqc'}
+      },
+      {
+        path: 'pqc',
+        component: () => import('@/views/mes/qc/pendinginspect/pqc'),
+        name: 'pqcadd',
+        props: true,
+        meta: {title: '过程检验', activeMenu: '/mes/qc/pendinginspect/pqc'}
+      },
+      {
+        path: 'oqc',
+        component: () => import('@/views/mes/qc/oqc/index'),
+        name: 'oqcadd',
+        props: true,
+        meta: {title: '出厂检验', activeMenu: '/mes/qc/pendinginspect/oqc'}
+      }
+    ]
   }
 ]
 

src/views/mes/qc/pendinginspect/index.vue

@@ -0,0 +1,176 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="单据编码" prop="sourceDocCode">
+          <el-input
+            v-model="queryParams.sourceDocCode"
+            placeholder="请输入单据编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="物资名称" prop="itemName">
+          <el-input
+            v-model="queryParams.itemName"
+            placeholder="请输入物资名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="检测类型" prop="qcType">
+          <el-select v-model="queryParams.qcType" placeholder="请选择检测类型" clearable>
+            <el-option
+              v-for="dict in dict.type.mes_index_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </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="pendingList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="单据编码" align="center" prop="sourceDocCode" />        
+        <el-table-column label="检测项型" align="center" prop="qcType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.mes_qc_type" :value="scope.row.qcType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="物资编码" align="center" prop="itemCode" />
+        <el-table-column label="物资名称" align="center" prop="itemName" />
+        <el-table-column label="待检数量" align="center" prop="quantityUncheck" />
+        <el-table-column label="位置" align="center" prop="address" />
+
+        <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="handleAddIQC(scope.row)"
+              v-if="scope.row.qcType == 'IQC'"
+              v-hasPermi="['mes:qc:qcindex:edit']"
+            >来料检验</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              v-if="scope.row.qcType == 'PQC'"
+              @click="handleAddPQC(scope.row)"
+              v-hasPermi="['mes:qc:qcindex:edit']"
+            >过程检验</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              v-if="scope.row.qcType == 'OQC'"
+              @click="handleAddOQC(scope.row)"
+              v-hasPermi="['mes:qc:qcindex: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 { listPending } from "@/api/mes/qc/pending";
+  export default {
+    name: "Qcpending",
+    dicts: ['mes_qc_type'],
+    data() {
+      return {
+        //自动生成编码
+        autoGenFlag:false,
+        optType: undefined,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 检测项表格数据
+        pendingList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          sourceDocCode: null,
+          itemName: null,
+          qcType: null          
+        },
+        // 表单参数
+        form: {}
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询待检测任务列表 */
+      getList() {
+        this.loading = true;
+        listPending(this.queryParams).then(response => {
+          this.pendingList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+     
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.indexId)
+        this.single = selection.length!==1
+        this.multiple = !selection.length
+      },
+      
+      // 生成来料检验单
+      handleAddIQC(row){        
+        this.$router.push({name: 'iqcadd', params: row});
+      },
+      /** 生成过程检验单 */
+      handleAddPQC(row) {        
+        this.$router.push({name: 'pqcadd', params: row});
+      },
+      /** 生成出货检验单 */      
+      handleAddOQC(row) {
+        this.$router.push({name: 'oqcadd', params: row});
+      },
+    }
+  };
+  </script>
+  

src/views/mes/qc/pendinginspect/iqc.vue

@@ -0,0 +1,341 @@
+<template>
+    <div class="app-container">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验单编号" prop="iqcCode">
+              <el-input v-model="form.iqcCode" placeholder="请输入来料检验单编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'" >               
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item label="检验单名称" prop="iqcName">
+              <el-input v-model="form.iqcName" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="3" align="middle">
+              <el-image fit="contain" v-if="form.checkResult == 'ACCEPT'" :src="acceptImg" />
+              <el-image fit="contain" v-else-if="form.checkResult == 'REJECT'" :src="rejectImg" />
+              <el-image fit="contain" v-else :src="prepareImg" />
+          </el-col>
+        </el-row>
+        <el-divider content-position="center">物料与供应商</el-divider>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="产品物料编码" prop="itemCode">
+              <el-input v-if="form.iqcId ==null " v-model="form.itemCode" readonly placeholder="请选择物料" >
+                <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
+              </el-input>
+              <!--如果已经保存过，则产品不允许再修改，需要修改就删除重做-->
+              <el-input v-else v-model="form.itemCode">                
+              </el-input>
+            </el-form-item>
+            <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="产品物料名称" prop="itemName">
+              <el-input v-model="form.itemName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位" prop="unitOfMeasure">
+              <el-input v-model="form.unitOfMeasure" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="供应商编码" prop="vendorCode">
+              <el-input v-model="form.vendorCode" readonly placeholder="请选择供应商" >
+                <el-button slot="append" @click="handleSelectVendor" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+            <VendorSelect ref="vendorSelect" @onSelected="onVendorSelected" />
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供应商简称" prop="vendorNick">
+              <el-input v-model="form.vendorNick" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="供应商批次号" prop="vendorBatch">
+              <el-input v-model="form.vendorBatch" placeholder="请输入供应商批次号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="center">检测情况</el-divider>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="本次接收数量" prop="quantityRecived">
+              <el-input-number :min="1" v-model="form.quantityRecived" placeholder="请输入本次接收数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="本次检测数量" prop="quantityCheck">
+              <el-input :min="1" v-model="form.quantityCheck" placeholder="请输入本次检测数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="不合格数量" prop="quantityUnqualified">
+              <el-input-number :min="0" v-model="form.quantityUnqualified" placeholder="请输入不合格数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+            <el-row>
+          <el-col :span="8">
+            <el-form-item label="来料日期" prop="reciveDate">
+              <el-date-picker clearable
+                v-model="form.reciveDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择来料日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测日期" prop="inspectDate">
+              <el-date-picker clearable
+                v-model="form.inspectDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择检测日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测结果" prop="checkResult">
+              <el-select v-model="form.checkResult" placeholder="请选择检测结果">
+                <el-option
+                  v-for="dict in dict.type.mes_qc_result"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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 title="结果统计">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="致命缺陷率" prop="crRate">
+                  <el-input v-model="form.crRate" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="严重缺陷率" prop="majRate">
+                  <el-input v-model="form.majRate" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="轻微缺陷率" prop="minRate">
+                  <el-input v-model="form.minRate" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="致命缺陷数量" prop="crQuantity">
+                  <el-input v-model="form.crQuantity" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="严重缺陷数量" prop="majQuantity">
+                  <el-input v-model="form.majQuantity" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="轻微缺陷数量" prop="minQuantity">
+                  <el-input v-model="form.minQuantity" readonly="readonly" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+        </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>
+      <el-form label-width="100px">
+      <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+        <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.ipqcId !=null">完成</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </el-form-item>
+    </el-form>
+    </div>
+</template>
+
+<script>
+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 "../iqc/iqcline.vue";
+import {genCode} from "@/api/system/autocode/rule"
+export default {
+    name: "pendingIqc",
+    components: {ItemSelect,VendorSelect,IqcLine},
+    dicts: ['mes_ipqc_type','mes_qc_result','mes_order_status'],
+    data(){
+        return {
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                ipqcCode: [
+                { required: true, message: "请输入或生产检验单编号", trigger: "blur" }
+                ],
+                ipqcType: [
+                { required: true, message: "请选择检验类型", trigger: "change" }
+                ],
+
+                workorderCode: [
+                { required: true, message: "请选择生产工单", trigger: "blur" }
+                ],
+
+                workstationCode: [
+                { required: true, message: "请选择工作站", trigger: "blur" }
+                ],
+            
+                quantityCheck: [
+                { required: true, message: "检测数量不能为空", trigger: "blur" }
+                ],
+
+                quantityUnqualified: [
+                { required: true, message: "不合格品数量不能为空", trigger: "blur" }
+                ],
+
+                quantityQualified: [
+                { required: true, message: "合格品数量不能为空", trigger: "blur" }
+                ]
+
+            }
+        }
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          iqcId: null,
+          iqcCode: null,
+          iqcName: null,
+          templateId: null,
+          sourceDocId: this.$route.params.sourceDocId,
+          sourceDocType: this.$route.params.sourceDocType,
+          sourceDocCode: this.$route.params.sourceDocCode,
+          sourceLineId: this.$route.params.sourceLineId,
+          vendorId: this.$route.params.vendorClientId,
+          vendorCode: this.$route.params.vendorClientCode,
+          vendorName: this.$route.params.vendorClientName,
+          vendorNick: this.$route.params.vendorClientNick,
+          vendorBatch: this.$route.params.batchCode,
+          itemId: this.$route.params.itemId,
+          itemCode: this.$route.params.itemCode,
+          itemName: this.$route.params.itemName,
+          specification: this.$route.params.specification,
+          unitOfMeasure: this.$route.params.unitOfMeasure,
+          quantityMinCheck: null,
+          quantityMaxUnqualified: null,
+          quantityRecived: this.$route.params.quantityUncheck,
+          quantityCheck: null,
+          quantityUnqualified: null,
+          crRate: null,
+          majRate: null,
+          minRate: null,
+          crQuantity: null,
+          majQuantity: null,
+          minQuantity: null,
+          checkResult: null,
+          reciveDate: null,
+          inspectDate: null,
+          inspector: null,
+          status: "PREPARE",
+          remark: null,
+          attr1: null,
+          attr2: null,
+          attr3: null,
+          attr4: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null
+        };
+        this.autoGenFlag = false;
+        this.resetForm("form");
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.iqcId != null) {
+              updateIqc(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+              });
+            } else {
+              addIqc(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.form.iqcId=response.data;
+              });
+            }
+          }
+        });
+      },
+      //点击完成
+      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;
+            });
+          }
+          });
+      },
+      //自动生成编码
+      handleAutoGenChange(autoGenFlag){
+        if(autoGenFlag){
+          genCode('QC_IQC_CODE').then(response =>{
+            this.form.iqcCode = response;
+          });
+        }else{
+          this.form.iqcCode = null;
+        }
+      },
+    }
+}
+
+
+</script>

src/views/mes/qc/pendinginspect/pqc.vue

@@ -0,0 +1,373 @@
+<template>
+    <div class="app-container">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验单编号" prop="ipqcCode">
+              <el-input v-model="form.ipqcCode" placeholder="请输入检验单编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item  label-width="80">
+              <el-switch v-model="autoGenFlag"
+                  active-color="#13ce66"
+                  active-text="自动生成"
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+              </el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检验单名称" prop="ipqcName">
+              <el-input v-model="form.ipqcName" placeholder="请输入检验单名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检验类型" prop="ipqcType">
+              <el-select v-model="form.ipqcType" placeholder="请选择检验类型">
+                <el-option
+                  v-for="dict in dict.type.mes_ipqc_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工单编码" prop="workorderCode">
+              <el-input v-if="form.ipqcId == null" v-model="form.workorderCode" placeholder="请选择生产工单" >
+              </el-input>
+              <!--保存过则不允许修改工单，需要修改则删除重做-->
+              <el-input v-else v-model="form.workorderCode" >              
+              </el-input>
+            </el-form-item>              
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工单名称" prop="workorderName">
+              <el-input v-model="form.workorderName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="工作站编号" prop="workstationCode">
+              <el-input v-model="form.workstationCode" placeholder="请输入工作站编号" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工作站名称" prop="workstationName">
+              <el-input v-model="form.workstationName" readonly="readonly"  />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测数量" prop="quantityCheck">
+              <el-input v-model="form.quantityCheck" placeholder="请输入检测数量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="8">
+            <el-form-item label="产品编码" prop="itemCode">
+                <el-input v-model="form.itemCode" placeholder="请输入产品编码" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="产品名称" prop="itemName">
+                <el-input v-model="form.itemName" placeholder="请输入产品名称" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="单位" prop="unitOfMeasure">
+                <el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="24">
+            <el-form-item label="规格型号" prop="specification">
+                <el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="8">
+            <el-form-item label="工序编码" prop="processCode">
+                <el-input v-model="form.processCode" placeholder="请输入工序编码" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="工序名称" prop="processName">
+                <el-input v-model="form.processName" placeholder="请输入工序名称" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="任务编号" prop="taskCode">
+                <el-input v-model="form.taskCode" placeholder="请输入任务编号" />
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="8">
+            <el-form-item label="任务名称" prop="taskName">
+                <el-input v-model="form.taskCode" placeholder="请输入任务编号" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="不合格数" prop="quantityUnqualified">
+                <el-input v-model="form.quantityUnqualified" placeholder="请输入不合格数" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="合格品数量" prop="quantityQualified">
+                <el-input v-model="form.quantityQualified" placeholder="请输入合格品数量" />
+            </el-form-item>
+            </el-col>
+        </el-row>        
+        <el-row>
+            <el-col :span="8">
+            <el-form-item label="致命缺陷数量" prop="crQuantity">
+                <el-input v-model="form.crQuantity" placeholder="请输入致命缺陷数量" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="严重缺陷数量" prop="majQuantity">
+                <el-input v-model="form.majQuantity" placeholder="请输入严重缺陷数量" />
+            </el-form-item>
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="轻微缺陷数量" prop="minQuantity">
+                <el-input v-model="form.minQuantity" placeholder="请输入轻微缺陷数量" />
+            </el-form-item>
+            </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="检测日期" prop="inspectDate">
+              <el-date-picker clearable
+                v-model="form.inspectDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择检测日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测结果" prop="checkResult">
+              <el-select v-model="form.checkResult" placeholder="请选择检验结果">
+                <el-option
+                  v-for="dict in dict.type.mes_qc_result"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测人员" prop="inspector">
+              <el-input v-model="form.inspector" placeholder="请输入检测人员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form>
+      <el-divider v-if="form.ipqcId !=null" content-position="center">检测项</el-divider> 
+      <el-card shadow="always" v-if="form.ipqcId !=null" class="box-card">
+          <Ipqcline ref=line :ipqcId="form.ipqcId" :optType="optType"></Ipqcline>
+      </el-card>
+      <el-form label-width="100px">
+        <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
+            <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.ipqcId !=null">完成</el-button>
+            <el-button @click="cancel">取 消</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+</template>
+<script>
+import { listIpqc, getIpqc, delIpqc, addIpqc, updateIpqc } from "@/api/mes/qc/ipqc";
+import {genCode} from "@/api/system/autocode/rule"
+import WorkorderSelect from "@/components/workorderSelect/single.vue"
+import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
+import Ipqcline from "../ipqc/line.vue"
+export default {
+    name: "IpqcAdd",
+    components: {WorkorderSelect,WorkstationSelect,Ipqcline},
+    dicts: ['mes_ipqc_type','mes_qc_result','mes_order_status'],
+    props: {
+        workOrderId: null,
+        workOrderCode: null,
+        workOrderName: null,
+        workstationId: null,
+        workstationCode: null,
+        workstationName: null,
+        taskId: null,
+        taskCode: null,
+        taskName: null,
+        itemId: null,
+        itemCode: null,
+        itemName: null,        
+        quantityCheck: null
+    },
+    data() {
+        return {
+            autoGenFlag: false,
+            optType: 'add',
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                ipqcCode: [
+                { required: true, message: "请输入或生产检验单编号", trigger: "blur" }
+                ],
+                ipqcType: [
+                { required: true, message: "请选择检验类型", trigger: "change" }
+                ],
+
+                workorderCode: [
+                { required: true, message: "请选择生产工单", trigger: "blur" }
+                ],
+
+                workstationCode: [
+                { required: true, message: "请选择工作站", trigger: "blur" }
+                ],
+            
+                quantityCheck: [
+                { required: true, message: "检测数量不能为空", trigger: "blur" }
+                ],
+
+                quantityUnqualified: [
+                { required: true, message: "不合格品数量不能为空", trigger: "blur" }
+                ],
+
+                quantityQualified: [
+                { required: true, message: "合格品数量不能为空", trigger: "blur" }
+                ]
+
+            }
+        }
+    },
+    created() {
+        this.reset();
+    },
+    methods: {
+        // 取消按钮
+        cancel() {
+            const obj = { path: "/mes/qc/pendinginspect" };
+            this.$tab.closeOpenPage(obj);
+        },
+        // 表单重置
+        reset() {
+            debugger;
+            this.form = {
+                ipqcId: null,
+                ipqcCode: null,
+                ipqcName: null,
+                ipqcType: null,
+                templateId: null,
+                sourceDocId: this.$route.params.sourceDocId,
+                sourceDocType: this.$route.params.sourceDocType,
+                sourceDocCode: this.$route.params.sourceDocCode,
+                sourceLineId: this.$route.params.sourceLineId,
+                workorderId: this.$route.params.workOrderId,
+                workorderCode: this.$route.params.workOrderCode,
+                workorderName: this.$route.params.workOrderName,
+                taskId: this.$route.params.taskId,
+                taskCode: this.$route.params.taskCode,
+                taskName: this.$route.params.taskName,
+                workstationId: this.$route.params.workstationId,
+                workstationCode: this.$route.params.workstationCode,
+                workstationName: this.$route.params.workstationName,
+                processId: null,
+                processCode: null,
+                processName: null,
+                itemId: this.$route.params.itemId,
+                itemCode: this.$route.params.itemCode,
+                itemName: this.$route.params.itemName,
+                specification: this.$route.params.specification,
+                unitOfMeasure: this.$route.params.unitOfMeasure,
+                quantityCheck: this.$route.params.quantityUncheck,
+                quantityUnqualified: null,
+                quantityQualified: null,
+                crRate: null,
+                majRate: null,
+                minRate: null,
+                crQuantity: null,
+                majQuantity: null,
+                minQuantity: null,
+                checkResult: null,
+                inspectDate: new Date(),
+                inspector: null,
+                status: "PREPARE",
+                remark: null,
+                attr1: null,
+                attr2: null,
+                attr3: null,
+                attr4: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null
+            };
+            this.autoGenFlag = false;
+            this.resetForm("form");
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    if (this.form.ipqcId != null) {
+                        updateIpqc(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                        });
+                    } else {
+                        addIpqc(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.form.ipqcId = response.data; //将返回的ID保存
+                        });
+                    }
+                }
+            });
+        },
+        //点击完成
+        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.cancel();
+                        });
+                    }
+                });
+        },
+        //自动生成编码
+        handleAutoGenChange(autoGenFlag){
+            if(autoGenFlag){
+                genCode('IPQC_CODE').then(response =>{
+                this.form.ipqcCode = response;
+                });
+            }else{
+                this.form.ipqcCode = null;
+            }
+        }
+    }
+}
+</script>

src/views/mes/wm/warehouse/index.vue

@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:warehouse:remove']"
+          v-hasPermi="['mes:wm:warehouse:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/system/user/authRole.vue

@@ -109,7 +109,7 @@ export default {
     },
     /** 关闭按钮 */
     close() {
-      const obj = { path: "/system/user" };
+      const obj = { path: "/user/user" };
       this.$tab.closeOpenPage(obj);
     },
   },