diff --git a/src/api/mes/qc/pending.js b/src/api/mes/qc/pending.js
new file mode 100644
index 0000000..5fefefc
--- /dev/null
+++ b/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
+  })
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 087afb9..009114d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -211,14 +211,43 @@ export const dynamicRoutes = [
     permissions: ["tool:gen:edit"],
     children: [
       {
-        path: "index/:tableId(\\d+)",
-        component: () => import("@/views/tool/gen/editTable"),
-        name: "GenEdit",
-        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
-      },
-    ],
+        path: 'index/:tableId(\\d+)',
+        component: () => import('@/views/tool/gen/editTable'),
+        name: 'GenEdit',
+        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'}
+      }
+    ]
+  }
+]
 
 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
diff --git a/src/views/mes/cal/plan/shift.vue b/src/views/mes/cal/plan/shift.vue
index c81211d..3fd05a3 100644
--- a/src/views/mes/cal/plan/shift.vue
+++ b/src/views/mes/cal/plan/shift.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:cal:shift:add']"
+          v-hasPermi="['mes:cal:calplan:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:cal:shift:edit']"
+          v-hasPermi="['mes:cal:calplan:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:cal:shift:remove']"
+          v-hasPermi="['mes:cal:calplan:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -52,14 +52,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:cal:shift:edit']"
+            v-hasPermi="['mes:cal:calplan:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:cal:shift:remove']"
+            v-hasPermi="['mes:cal:calplan:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/checkplan/machinery.vue b/src/views/mes/dv/checkplan/machinery.vue
index 4dde239..c3ae145 100644
--- a/src/views/mes/dv/checkplan/machinery.vue
+++ b/src/views/mes/dv/checkplan/machinery.vue
@@ -9,7 +9,7 @@
           size="mini"
           v-if="optType !='view'"
           @click="handleAdd"
-          v-hasPermi="['mes:dv:checkmachinery:add']"
+          v-hasPermi="['mes:dv:checkplan:add']"
         >新增</el-button>
       </el-col>     
       <el-col :span="1.5">
@@ -21,7 +21,7 @@
           v-if="optType !='view'"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:dv:checkmachinery:remove']"
+          v-hasPermi="['mes:dv:checkplan:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -42,7 +42,7 @@
             icon="el-icon-delete"
             v-if="optType !='view'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:dv:checkmachinery:remove']"
+            v-hasPermi="['mes:dv:checkplan:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/checkplan/subject.vue b/src/views/mes/dv/checkplan/subject.vue
index 143a140..39921c5 100644
--- a/src/views/mes/dv/checkplan/subject.vue
+++ b/src/views/mes/dv/checkplan/subject.vue
@@ -9,7 +9,7 @@
           size="mini"
           @click="handleAdd"
           v-if="optType !='view'"
-          v-hasPermi="['mes:dv:checksubject:add']"
+          v-hasPermi="['mes:dv:checkplan:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -21,7 +21,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-if="optType !='view'"
-          v-hasPermi="['mes:dv:checksubject:remove']"
+          v-hasPermi="['mes:dv:checkplan:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -43,7 +43,7 @@
             icon="el-icon-delete"
             v-if="optType !='view'"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:dv:checksubject:remove']"
+            v-hasPermi="['mes:dv:checkplan:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/dv/machinerytype/index.vue b/src/views/mes/dv/machinerytype/index.vue
index 3b865ce..9db8201 100644
--- a/src/views/mes/dv/machinerytype/index.vue
+++ b/src/views/mes/dv/machinerytype/index.vue
@@ -25,20 +25,6 @@
       </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="['mes:dv:machinerytype:add']"
-        >新增</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table
       v-loading="loading"
       :data="machinerytypeList"
diff --git a/src/views/mes/md/client/index.vue b/src/views/mes/md/client/index.vue
index 47fabec..bf00ab1 100644
--- a/src/views/mes/md/client/index.vue
+++ b/src/views/mes/md/client/index.vue
@@ -78,7 +78,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:md:client:add']"
+          v-hasPermi="['mes:md:client:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -89,7 +89,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:md:client:edit']"
+          v-hasPermi="['mes:md:client:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -100,7 +100,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:md:client:remove']"
+          v-hasPermi="['mes:md:client:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -110,7 +110,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['md:md:client:export']"
+          v-hasPermi="['mes:md:client:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -149,14 +149,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:md:client:edit']"
+            v-hasPermi="['mes:md:client:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:md:client:remove']"
+            v-hasPermi="['mes:md:client:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/mditem/components/itembom.vue b/src/views/mes/md/mditem/components/itembom.vue
index cce08df..6402928 100644
--- a/src/views/mes/md/mditem/components/itembom.vue
+++ b/src/views/mes/md/mditem/components/itembom.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:md:bom:add']"
+          v-hasPermi="['mes:md:mditem:add']"
         >新增</el-button>
         <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
       </el-col>
@@ -20,7 +20,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:md:bom:remove']"
+          v-hasPermi="['mes:md:mditem:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -41,14 +41,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:md:bom:edit']"
+            v-hasPermi="['mes:md:mditem:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:md:bom:remove']"
+            v-hasPermi="['mes:md:mditem:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/mditem/components/sop.vue b/src/views/mes/md/mditem/components/sop.vue
index 120a3f1..ed48944 100644
--- a/src/views/mes/md/mditem/components/sop.vue
+++ b/src/views/mes/md/mditem/components/sop.vue
@@ -8,7 +8,7 @@
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAdd"
-                v-hasPermi="['mes:md:sop:add']"
+                v-hasPermi="['mes:md:mditem:add']"
                 >新增</el-button>
             </el-col>
         </el-row>
diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index cb0b27e..3866b9c 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -60,7 +60,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"
-              v-hasPermi="['mes:md:item:add']"
+              v-hasPermi="['mes:md:mditem:add']"
             >新增</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -71,7 +71,7 @@
               size="mini"
               :disabled="single"
               @click="handleUpdate"
-              v-hasPermi="['mes:md:item:edit']"
+              v-hasPermi="['mes:md:mditem:edit']"
             >修改</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -82,7 +82,7 @@
               size="mini"
               :disabled="multiple"
               @click="handleDelete"
-              v-hasPermi="['mes:md:item:remove']"
+              v-hasPermi="['mes:md:mditem:remove']"
             >删除</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -92,7 +92,7 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-hasPermi="['mes:md:item:import']"
+              v-hasPermi="['mes:md:mditem:import']"
             >导入</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -102,7 +102,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
-              v-hasPermi="['mes:md:item:export']"
+              v-hasPermi="['mes:md:mditem:export']"
             >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -158,14 +158,14 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['mes:md:item:edit']"
+                v-hasPermi="['mes:md:mditem:edit']"
               >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
-                v-hasPermi="['mes:md:item:remove']"
+                v-hasPermi="['mes:md:mditem:remove']"
               >删除</el-button>              
             </template>
           </el-table-column>
diff --git a/src/views/mes/md/unitmeasure/index.vue b/src/views/mes/md/unitmeasure/index.vue
index 86b8702..7dcdde3 100644
--- a/src/views/mes/md/unitmeasure/index.vue
+++ b/src/views/mes/md/unitmeasure/index.vue
@@ -31,7 +31,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:unitmeasure:add']"
+          v-hasPermi="['mes:md:unitmeasure:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:unitmeasure:edit']"
+          v-hasPermi="['mes:md:unitmeasure:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:unitmeasure:remove']"
+          v-hasPermi="['mes:md:unitmeasure:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +63,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['mes:unitmeasure:export']"
+          v-hasPermi="['mes:md:unitmeasure:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -92,14 +92,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:unitmeasure:edit']"
+            v-hasPermi="['mes:md:unitmeasure:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:unitmeasure:remove']"
+            v-hasPermi="['mes:md:unitmeasure:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/vendor/index.vue b/src/views/mes/md/vendor/index.vue
index 81740d8..4fafb6f 100644
--- a/src/views/mes/md/vendor/index.vue
+++ b/src/views/mes/md/vendor/index.vue
@@ -78,7 +78,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:vendor:add']"
+          v-hasPermi="['mes:md:vendor:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -89,7 +89,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:vendor:edit']"
+          v-hasPermi="['mes:md:vendor:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -100,7 +100,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:vendor:remove']"
+          v-hasPermi="['mes:md:vendor:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -110,7 +110,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['md:vendor:export']"
+          v-hasPermi="['mes:md:vendor:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -149,14 +149,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:vendor:edit']"
+            v-hasPermi="['mes:md:vendor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:vendor:remove']"
+            v-hasPermi="['mes:md:vendor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue
index 5acc706..15d2f4f 100644
--- a/src/views/mes/md/workshop/index.vue
+++ b/src/views/mes/md/workshop/index.vue
@@ -31,7 +31,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['md:workshop:add']"
+          v-hasPermi="['mes:md:workshop:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['md:workshop:edit']"
+          v-hasPermi="['mes:md:workshop:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['md:workshop:remove']"
+          v-hasPermi="['mes:md:workshop:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -86,14 +86,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['md:workshop:edit']"
+            v-hasPermi="['mes:md:workshop:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:workshop:remove']"
+            v-hasPermi="['mes:md:workshop:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/workstation/components/machine.vue b/src/views/mes/md/workstation/components/machine.vue
index 1369240..6d12b70 100644
--- a/src/views/mes/md/workstation/components/machine.vue
+++ b/src/views/mes/md/workstation/components/machine.vue
@@ -10,7 +10,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['md:workstationmachine:remove']"
+            v-hasPermi="['mes:md:workstation:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/workstation/components/tool.vue b/src/views/mes/md/workstation/components/tool.vue
index 0ce5a0b..8e2680e 100644
--- a/src/views/mes/md/workstation/components/tool.vue
+++ b/src/views/mes/md/workstation/components/tool.vue
@@ -10,14 +10,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:md:workstationtool:edit']"
+            v-hasPermi="['mes:md:workstation:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:md:workstationtool:remove']"
+            v-hasPermi="['mes:md:workstation:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/md/workstation/components/worker.vue b/src/views/mes/md/workstation/components/worker.vue
index e99f446..d1fd8b3 100644
--- a/src/views/mes/md/workstation/components/worker.vue
+++ b/src/views/mes/md/workstation/components/worker.vue
@@ -10,14 +10,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:md:workstationworker:edit']"
+            v-hasPermi="['mes:md:workstation:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:md:workstationworker:remove']"
+            v-hasPermi="['mes:md:workstation:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/process/content.vue b/src/views/mes/pro/process/content.vue
index aa6feea..59866be 100644
--- a/src/views/mes/pro/process/content.vue
+++ b/src/views/mes/pro/process/content.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:pro:processcontent:add']"
+          v-hasPermi="['mes:pro:process:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:pro:processcontent:edit']"
+          v-hasPermi="['mes:pro:process:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:pro:processcontent:remove']"
+          v-hasPermi="['mes:pro:process:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -40,7 +40,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['mes:pro:processcontent:export']"
+          v-hasPermi="['mes:pro:process:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -60,14 +60,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:processcontent:edit']"
+            v-hasPermi="['mes:pro:process:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:processcontent:remove']"
+            v-hasPermi="['mes:pro:process:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index d973059..ecc9649 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -102,14 +102,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['pro:process:edit']"
+            v-hasPermi="['mes:pro:process:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['pro:process:remove']"
+            v-hasPermi="['mes:pro:process:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/mes/pro/proroute/index.vue
index 67b14a8..bc08c9a 100644
--- a/src/views/mes/pro/proroute/index.vue
+++ b/src/views/mes/pro/proroute/index.vue
@@ -103,14 +103,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['pro:proroute:edit']"
+            v-hasPermi="['mes:pro:proroute:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['pro:proroute:remove']"
+            v-hasPermi="['mes:pro:proroute:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index f4c8926..0b01430 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -31,7 +31,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:pro:routeproduct:add']"
+          v-hasPermi="['mes:pro:proroute:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:pro:routeproduct:edit']"
+          v-hasPermi="['mes:pro:proroute:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:pro:routeproduct:remove']"
+          v-hasPermi="['mes:pro:proroute:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +63,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['mes:pro:routeproduct:export']"
+          v-hasPermi="['mes:pro:proroute:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -83,7 +83,6 @@
       <el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
       <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-      </el-table-column>
       <el-table-column label="操作" align="center" v-if="optType !='view'" width="100px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -91,14 +90,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:routeproduct:edit']"
+            v-hasPermi="['mes:pro:proroute:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:routeproduct:remove']"
+            v-hasPermi="['mes:pro:proroute:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/mes/pro/proroute/routeprocess.vue
index 94e4608..41ecf43 100644
--- a/src/views/mes/pro/proroute/routeprocess.vue
+++ b/src/views/mes/pro/proroute/routeprocess.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['pro:routeprocess:add']"
+          v-hasPermi="['mes:pro:proroute:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['pro:routeprocess:edit']"
+          v-hasPermi="['mes:pro:proroute:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['pro:routeprocess:remove']"
+          v-hasPermi="['mes:pro:proroute:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -71,14 +71,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:routeprocess:edit']"
+            v-hasPermi="['mes:pro:proroute:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:pro:routeprocess:remove']"
+            v-hasPermi="['mes:pro:proroute:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/proroute/routeproductbom.vue b/src/views/mes/pro/proroute/routeproductbom.vue
index 8dc2164..9bd2c23 100644
--- a/src/views/mes/pro/proroute/routeproductbom.vue
+++ b/src/views/mes/pro/proroute/routeproductbom.vue
@@ -39,14 +39,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['pro:proroute:edit']"
+            v-hasPermi="['mes:pro:proroute:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['pro:proroute:remove']"
+            v-hasPermi="['mes:pro:proroute:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/schedule/ganttedit.vue b/src/views/mes/pro/schedule/ganttedit.vue
index c884a1b..97cdbda 100644
--- a/src/views/mes/pro/schedule/ganttedit.vue
+++ b/src/views/mes/pro/schedule/ganttedit.vue
@@ -9,7 +9,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleUpdate"
-          v-hasPermi="['mes:pro:schedule:edit']"
+          v-hasPermi="['mes:pro:protask:edit']"
         >保存</el-button>
       </el-col>
       <el-col :span="1.5">
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index 4651dda..e2f2c4a 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['pro:protask:add']"
+          v-hasPermi="['mes:pro:protask:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['pro:protask:edit']"
+          v-hasPermi="['mes:pro:protask:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['pro:protask:remove']"
+          v-hasPermi="['mes:pro:protask:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -40,7 +40,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['pro:protask:export']"
+          v-hasPermi="['mes:pro:protask:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -77,14 +77,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['pro:protask:edit']"
+            v-hasPermi="['mes:pro:protask:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['pro:protask:remove']"
+            v-hasPermi="['mes:pro:protask:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/pro/workorder/bom/bom.vue b/src/views/mes/pro/workorder/bom/bom.vue
index a6eafd6..42399f1 100644
--- a/src/views/mes/pro/workorder/bom/bom.vue
+++ b/src/views/mes/pro/workorder/bom/bom.vue
@@ -8,7 +8,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['mes:pro:workorderbom:export']"
+          v-hasPermi="['mes:pro:workorder:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar @queryTable="getList"></right-toolbar>
@@ -34,7 +34,7 @@
             icon="el-icon-edit"
             v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:pro:workorderbom:edit']"
+            v-hasPermi="['mes:pro:workorder:edit']"
           >修改</el-button>
 
           <el-button
diff --git a/src/views/mes/qc/pendinginspect/index.vue b/src/views/mes/qc/pendinginspect/index.vue
new file mode 100644
index 0000000..41ce265
--- /dev/null
+++ b/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>
+  
\ No newline at end of file
diff --git a/src/views/mes/qc/pendinginspect/iqc.vue b/src/views/mes/qc/pendinginspect/iqc.vue
new file mode 100644
index 0000000..9dc9b36
--- /dev/null
+++ b/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.iqcId !=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.reset();
+    },
+    methods: {
+      // 取消按钮
+      cancel() {
+        const obj = { path: "/mes/qc/pendinginspect" };
+        this.$tab.closeOpenPage(obj);
+      },
+      // 表单重置
+      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: this.$route.params.recordTime,
+          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 = 'FINISHED';
+              that.submitForm();
+              that.cancel();
+            });
+          }
+          });
+      },
+      //自动生成编码
+      handleAutoGenChange(autoGenFlag){
+        if(autoGenFlag){
+          genCode('QC_IQC_CODE').then(response =>{
+            this.form.iqcCode = response;
+          });
+        }else{
+          this.form.iqcCode = null;
+        }
+      },
+    }
+}
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/mes/qc/pendinginspect/oqc.vue b/src/views/mes/qc/pendinginspect/oqc.vue
new file mode 100644
index 0000000..4b0203d
--- /dev/null
+++ b/src/views/mes/qc/pendinginspect/oqc.vue
@@ -0,0 +1,330 @@
+<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="oqcCode">
+              <el-input v-model="form.oqcCode" 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="oqcName">
+              <el-input v-model="form.oqcName" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>          
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="产品编码" prop="itemCode">
+              <el-input v-if="form.oqcId ==null " readonly v-model="form.itemCode" placeholder="请选择产品" >
+                <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
+              </el-input>
+              <!--如果已经保存过，则产品不允许再修改，需要修改就删除重做-->
+              <el-input v-else v-model="form.itemCode"/>                
+              <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="产品名称" prop="itemName">
+              <el-input readonly="readonly" v-model="form.itemName"></el-input>            
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="单位" prop="unitOfMeasure">
+              <el-input readonly="readonly" v-model="form.unitOfMeasure"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="规格型号" prop="specification">
+              <el-input readonly="readonly" v-model="form.specification" type="textarea" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="客户编号" prop="clientCode">
+              <el-input v-model="form.clientCode" readonly placeholder="请输选择客户" >
+                <el-button slot="append" @click="handleSelectClient" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+            <ClientSelect ref="clientSelect" @onSelected="onClientSelected" > </ClientSelect>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="客户名称" prop="clientName">
+              <el-input readonly="readonly" v-model="form.clientName"  />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="批次号" prop="batchCode">
+              <el-input v-model="form.batchCode" placeholder="请输入批次号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="发货数量" prop="quantityOut">
+              <el-input-number :min="1" v-model="form.quantityOut" placeholder="请输入发货数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="检测数量" prop="quantityCheck">
+              <el-input-number :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" readonly="readonly" v-model="form.quantityUnqualified" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="出货日期" prop="outDate">
+              <el-date-picker clearable
+                v-model="form.outDate"
+                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="crQuantity">
+                  <el-input readonly="readonly" v-model="form.crQuantity" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="严重缺陷数量" prop="majQuantity">
+                  <el-input readonly="readonly" v-model="form.majQuantity" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="轻微缺陷数量" prop="minQuantity">
+                  <el-input readonly="readonly" v-model="form.minQuantity" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="致命缺陷率" prop="crQuantity">
+                  <el-input readonly="readonly" v-model="form.crRate" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="严重缺陷率" prop="majRate">
+                  <el-input readonly="readonly" v-model="form.majRate" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="轻微缺陷率" prop="minRate">
+                  <el-input readonly="readonly" v-model="form.minRate" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+        </el-collapse>        
+      </el-form>
+      <el-divider v-if="form.oqcId !=null" content-position="center">检测项</el-divider> 
+      <el-card shadow="always" v-if="form.oqcId !=null" class="box-card">
+          <Oqcline ref=line :oqcId="form.oqcId" :optType="optType"></Oqcline>
+      </el-card>
+    </div>
+</template>
+<script>
+import {genCode} from "@/api/system/autocode/rule";
+import Oqcline from "../oqc/line.vue";
+export default {
+  name: "Oqc",
+  dicts: ['mes_order_status','mes_qc_result'],
+  components: {
+    Oqcline
+  },
+  data(){
+    return {
+        //自动生成编码
+        autoGenFlag:false,
+        optType: undefined,
+        // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        oqcCode: [
+          { required: true, message: "出货检验单编号不能为空", trigger: "blur" }
+        ],
+        clientCode: [
+          { required: true, message: "客户不能为空", trigger: "blur" }
+        ],       
+        itemCode: [
+          { required: true, message: "产品不能为空", trigger: "blur" }
+        ],
+        quantityOut: [
+          { required: true, message: "发货数量不能为空", trigger: "blur" }
+        ],
+        quantityCheck: [
+          { required: true, message: "本次检测数量不能为空", trigger: "blur" }
+        ],
+        outDate: [
+          { required: true, message: "请选择出货日期", trigger: "blur" }
+        ],
+        inspectDate: [
+          { required: true, message: "请选择检测日期", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    // 取消按钮
+    cancel() {
+
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        oqcId: null,
+        oqcCode: null,
+        oqcName: null,
+        templateId: null,
+        clientId: null,
+        clientCode: null,
+        clientName: null,
+        batchCode: null,
+        itemId: null,
+        itemCode: null,
+        itemName: null,
+        specification: null,
+        unitOfMeasure: null,
+        quantityMinCheck: null,
+        quantityMaxUnqualified: null,
+        quantityOut: null,
+        quantityCheck: null,
+        quantityUnqualified: null,
+        quantityQuanlified: null,
+        crRate: null,
+        majRate: null,
+        minRate: null,
+        crQuantity: null,
+        majQuantity: null,
+        minQuantity: null,
+        checkResult: null,
+        outDate: 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.oqcId != null) {
+            updateOqc(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+            });
+          } else {
+            addOqc(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+            });
+          }
+        }
+      });
+    },
+    //点击完成
+    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 = 'FINISHED';
+            that.submitForm();
+            that.cancel();
+          });
+        }
+        });
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        genCode('OQC_CODE').then(response =>{
+          this.form.oqcCode = response;
+        });
+      }else{
+        this.form.oqcCode = null;
+      }
+    },
+  }
+
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/qc/pendinginspect/pqc.vue b/src/views/mes/qc/pendinginspect/pqc.vue
new file mode 100644
index 0000000..aa96f6d
--- /dev/null
+++ b/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 = 'FINISHED';
+                            that.submitForm();
+                            that.cancel();
+                        });
+                    }
+                });
+        },
+        //自动生成编码
+        handleAutoGenChange(autoGenFlag){
+            if(autoGenFlag){
+                genCode('IPQC_CODE').then(response =>{
+                this.form.ipqcCode = response;
+                });
+            }else{
+                this.form.ipqcCode = null;
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/wm/area/index.vue b/src/views/mes/wm/area/index.vue
index 71cc1e1..39a6282 100644
--- a/src/views/mes/wm/area/index.vue
+++ b/src/views/mes/wm/area/index.vue
@@ -135,14 +135,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:area:edit']"
+            v-hasPermi="['mes:wm:area:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:area:remove']"
+            v-hasPermi="['mes:wm:area:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/itemconsume/index.vue b/src/views/mes/wm/itemconsume/index.vue
index f5ea526..b143c3b 100644
--- a/src/views/mes/wm/itemconsume/index.vue
+++ b/src/views/mes/wm/itemconsume/index.vue
@@ -129,7 +129,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:itemconsume:add']"
+          v-hasPermi="['mes:wm:itemconsume:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -140,7 +140,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:itemconsume:edit']"
+          v-hasPermi="['mes:wm:itemconsume:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -151,7 +151,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:itemconsume:remove']"
+          v-hasPermi="['mes:wm:itemconsume:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -161,7 +161,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:itemconsume:export']"
+          v-hasPermi="['mes:wm:itemconsume:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -200,14 +200,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:itemconsume:edit']"
+            v-hasPermi="['mes:wm:itemconsume:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:itemconsume:remove']"
+            v-hasPermi="['mes:wm:itemconsume:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/itemconsume/line.vue b/src/views/mes/wm/itemconsume/line.vue
index 0017c5e..5ab3bfc 100644
--- a/src/views/mes/wm/itemconsume/line.vue
+++ b/src/views/mes/wm/itemconsume/line.vue
@@ -151,7 +151,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:itemconsumeline:add']"
+          v-hasPermi="['mes:wm:itemconsume:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -162,7 +162,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:itemconsumeline:edit']"
+          v-hasPermi="['mes:wm:itemconsume:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -173,7 +173,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:itemconsumeline:remove']"
+          v-hasPermi="['mes:wm:itemconsume:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -183,7 +183,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:itemconsumeline:export']"
+          v-hasPermi="['mes:wm:itemconsume:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -218,14 +218,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:itemconsumeline:edit']"
+            v-hasPermi="['mes:wm:itemconsume:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:itemconsumeline:remove']"
+            v-hasPermi="['mes:wm:itemconsume:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
index de6f6f5..4b20b1e 100644
--- a/src/views/mes/wm/itemrecpt/line.vue
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:wm:itemrecptline:add']"
+          v-hasPermi="['mes:wm:itemrecpt:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:wm:itemrecptline:remove']"
+          v-hasPermi="['mes:wm:itemrecpt:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -54,14 +54,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:itemrecptline:edit']"
+            v-hasPermi="['mes:wm:itemrecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:itemrecptline:remove']"
+            v-hasPermi="['mes:wm:itemrecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productproduce/index.vue b/src/views/mes/wm/productproduce/index.vue
index 664318c..873a34a 100644
--- a/src/views/mes/wm/productproduce/index.vue
+++ b/src/views/mes/wm/productproduce/index.vue
@@ -129,7 +129,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:productproduce:add']"
+          v-hasPermi="['mes:wm:productproduce:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -140,7 +140,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:productproduce:edit']"
+          v-hasPermi="['mes:wm:productproduce:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -151,7 +151,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:productproduce:remove']"
+          v-hasPermi="['mes:wm:productproduce:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -161,7 +161,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:productproduce:export']"
+          v-hasPermi="['mes:wm:productproduce:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -200,14 +200,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:productproduce:edit']"
+            v-hasPermi="['mes:wm:productproduce:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:productproduce:remove']"
+            v-hasPermi="['mes:wm:productproduce:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productproduce/line.vue b/src/views/mes/wm/productproduce/line.vue
index 2f404bd..66532ec 100644
--- a/src/views/mes/wm/productproduce/line.vue
+++ b/src/views/mes/wm/productproduce/line.vue
@@ -143,7 +143,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:productproduceline:add']"
+          v-hasPermi="['mes:wm:productproduce:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -154,7 +154,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:productproduceline:edit']"
+          v-hasPermi="['mes:wm:productproduce:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -165,7 +165,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:productproduceline:remove']"
+          v-hasPermi="['mes:wm:productproduce:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -175,7 +175,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:productproduceline:export']"
+          v-hasPermi="['mes:wm:productproduce:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -209,14 +209,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['wm:productproduceline:edit']"
+            v-hasPermi="['mes:wm:productproduce:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['wm:productproduceline:remove']"
+            v-hasPermi="['mes:wm:productproduce:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productrecpt/index.vue b/src/views/mes/wm/productrecpt/index.vue
index d73cddb..04eb9f3 100644
--- a/src/views/mes/wm/productrecpt/index.vue
+++ b/src/views/mes/wm/productrecpt/index.vue
@@ -47,7 +47,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:productrecpt:add']"
+          v-hasPermi="['mes:wm:productrecpt:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -58,7 +58,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['wm:productrecpt:edit']"
+          v-hasPermi="['mes:wm:productrecpt:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -69,7 +69,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['wm:productrecpt:remove']"
+          v-hasPermi="['mes:wm:productrecpt:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -79,7 +79,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['wm:productrecpt:export']"
+          v-hasPermi="['mes:wm:productrecpt:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/mes/wm/productrecpt/line.vue b/src/views/mes/wm/productrecpt/line.vue
index 6232b40..61110d9 100644
--- a/src/views/mes/wm/productrecpt/line.vue
+++ b/src/views/mes/wm/productrecpt/line.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['wm:productrecptline:add']"
+          v-hasPermi="['mes:wm:productrecpt:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -57,7 +57,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-if="optType != 'view'"
-            v-hasPermi="['wm:productrecptline:edit']"
+            v-hasPermi="['mes:wm:productrecpt:edit']"
           >修改</el-button>
           <el-button
             size="mini"
@@ -65,7 +65,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="optType != 'view'"
-            v-hasPermi="['wm:productrecptline:remove']"
+            v-hasPermi="['mes:wm:productrecpt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/productsalse/line.vue b/src/views/mes/wm/productsalse/line.vue
index adeb0ff..b43549f 100644
--- a/src/views/mes/wm/productsalse/line.vue
+++ b/src/views/mes/wm/productsalse/line.vue
@@ -8,7 +8,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:wm:productsalseline:add']"
+          v-hasPermi="['mes:wm:productsalse:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -19,7 +19,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:wm:productsalseline:edit']"
+          v-hasPermi="['mes:wm:productsalse:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -30,7 +30,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:wm:productsalseline:remove']"
+          v-hasPermi="['mes:wm:productsalse:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -62,7 +62,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="optType != 'view'"
-            v-hasPermi="['mes:wm:productsalseline:remove']"
+            v-hasPermi="['mes:wm:productsalse:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/rtsalse/index.vue b/src/views/mes/wm/rtsalse/index.vue
index 003fa00..22081ed 100644
--- a/src/views/mes/wm/rtsalse/index.vue
+++ b/src/views/mes/wm/rtsalse/index.vue
@@ -141,7 +141,7 @@
             icon="el-icon-video-play"
             @click="handleExecute(scope.row)"
             v-if="scope.row.status == 'PREPARE'"
-            v-hasPermi="['mes:wm:productsalse:edit']"
+            v-hasPermi="['mes:wm:rtsalse:edit']"
           >执行退货</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/transfer/line.vue b/src/views/mes/wm/transfer/line.vue
index 2a2132a..7da205b 100644
--- a/src/views/mes/wm/transfer/line.vue
+++ b/src/views/mes/wm/transfer/line.vue
@@ -9,7 +9,7 @@
           size="mini"
           @click="handleAdd"
           v-if="optType != 'view'"
-          v-hasPermi="['mes:wm:transferline:add']"
+          v-hasPermi="['mes:wm:transfer:add']"
         >新增</el-button>
       </el-col>
    
@@ -22,7 +22,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-if="optType != 'view'"
-          v-hasPermi="['mes:wm:transferline:remove']"
+          v-hasPermi="['mes:wm:transfer:remove']"
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -52,14 +52,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wm:transferline:edit']"
+            v-hasPermi="['mes:wm:transfer:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wm:transferline:remove']"
+            v-hasPermi="['mes:wm:transfer:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index 59d4bbb..217ad7b 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/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>
diff --git a/src/views/mes/wm/wmstock/index.vue b/src/views/mes/wm/wmstock/index.vue
index 6335191..a2544e6 100644
--- a/src/views/mes/wm/wmstock/index.vue
+++ b/src/views/mes/wm/wmstock/index.vue
@@ -97,7 +97,7 @@
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
-            v-hasPermi="['wm:wmstock:export']"
+            v-hasPermi="['mes:wm:wmstock:export']"
           >导出</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index ab5e72f..1dbad4b 100644
--- a/src/views/system/user/authRole.vue
+++ b/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);
     },
   },