1、首页改版（增加合格率）2、增加质检操作页面（未完成）

ZRAdmin-vue-main/src/views/Business/QaInspectRecord/index.vue

@@ -15,10 +15,6 @@
           <el-input v-model="queryParams.deliverNo" placeholder="请输入" class="z-el-input" clearable
             @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="质检记录单号" prop="inspectNo">
-          <el-input v-model="queryParams.inspectNo" placeholder="请输入" class="z-el-input" clearable
-            @keyup.enter="handleQuery" />
-        </el-form-item>
         <el-form-item label="生产令号" prop="bomNo">
           <el-input v-model="queryParams.bomNo" placeholder="请输入" class="z-el-input" clearable
             @keyup.enter="handleQuery" />
@@ -57,6 +53,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+      </el-row>
+      <el-row>
+        <!-- <el-form-item label="创建人">
+          <el-input v-model="queryParams.roleName" placeholder="请输入" class="z-el-input" clearable
+            @keyup.enter="handleQuery" />
+        </el-form-item> -->
         <el-form-item label="质检结果" prop="result">
           <el-select v-model="queryParams.result" placeholder="请选择" clearable style="width:120px" @change="handleQuery">
             <el-option v-for="dict in options.qaResultOptions" :key="dict.dictValue" :label="dict.dictLabel"
@@ -65,15 +67,19 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-row>
-      <el-row>
-        <!-- <el-form-item label="创建人">
-          <el-input v-model="queryParams.roleName" placeholder="请输入" class="z-el-input" clearable
-            @keyup.enter="handleQuery" />
-        </el-form-item> -->
+        <el-form-item label="入库结果" prop="instoreResult">
+          <el-select v-model="queryParams.instoreResult" placeholder="请选择" clearable style="width:120px"
+            @change="handleQuery">
+            <el-option v-for="dict in options.operationResultOptions" :key="dict.dictValue" :label="dict.dictLabel"
+              :value="dict.dictValue">
+              <dict-tag :options="options.operationResultOptions" :value="dict.dictValue" />
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="创建时间">
           <el-date-picker v-model="queryCreateTime" style="width: 400px" type="datetimerange" range-separator="-"
             @change="handleQuery" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
+
         </el-form-item>
         <el-form-item>
           <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -119,7 +125,7 @@
       <el-table-column prop="inspectId" label="ID" align="center" v-if="columns.showColumn('inspectId')" />
       <el-table-column prop="inspectNo" label="质检记录单号" align="center" :show-overflow-tooltip="true" width="120"
         v-if="columns.showColumn('inspectNo')" />
-      <el-table-column prop="deliverNo" label="交验单号" align="center" :show-overflow-tooltip="true"
+      <el-table-column prop="deliverNo" label="交验单号" align="center" :show-overflow-tooltip="true" width="150"
         v-if="columns.showColumn('deliverNo')" />
       <el-table-column prop="bomNo" label="生产令号" align="center" :show-overflow-tooltip="true"
         v-if="columns.showColumn('bomNo')" />
@@ -147,7 +153,7 @@
       <el-table-column prop="bnSnCode" label="BN / SN码" align="center" :show-overflow-tooltip="true"
         v-if="columns.showColumn('bnSnCode')" />
       <el-table-column prop="qty" label="交验单数量" align="center" v-if="columns.showColumn('qty')" />
-      <el-table-column prop="checkQty" label="合格数量" align="center" v-if="columns.showColumn('checkQty')" />
+      <el-table-column prop="checkQty" label="质检数量" align="center" v-if="columns.showColumn('checkQty')" />
       <el-table-column prop="inspectedBy" label="质检人" align="center" :show-overflow-tooltip="true"
         v-if="columns.showColumn('inspectedBy')" />
       <el-table-column prop="inspectTime" label="质检时间" align="center" :show-overflow-tooltip="true"
@@ -158,6 +164,12 @@
           <dict-tag :options="options.qaResultOptions" :value="scope.row.result" />
         </template>
       </el-table-column>
+      <el-table-column prop="instoreResult" label="入库结果" align="center" :show-overflow-tooltip="true"
+        v-if="columns.showColumn('instoreResult')">
+        <template #default="scope">
+          <dict-tag :options="options.operationResultOptions" :value="scope.row.instoreResult" />
+        </template>
+      </el-table-column>
       <el-table-column prop="createBy" label="创建人" align="center" v-if="columns.showColumn('createBy')" />
       <el-table-column prop="createTime" label="创建时间" align="center" width="160"
         v-if="columns.showColumn('createTime')" />
@@ -257,8 +269,8 @@
           </el-col>
 
           <el-col :lg="12">
-            <el-form-item label="合格数量" prop="checkQty">
-              <el-input v-model="form.checkQty" placeholder="请输入合格数量" />
+            <el-form-item label="质检数量" prop="checkQty">
+              <el-input v-model="form.checkQty" placeholder="请输入质检数量" />
             </el-form-item>
           </el-col>
 
@@ -346,7 +358,7 @@ const queryParams = reactive({
 })
 const columns = ref([
   { visible: false, prop: 'inspectId', label: 'ID' },
-  { visible: true, prop: 'inspectNo', label: '质检记录单号' },
+  { visible: false, prop: 'inspectNo', label: '质检记录单号' },
   { visible: true, prop: 'deliverNo', label: '交验单号' },
   { visible: true, prop: 'bomNo', label: '生产令号' },
   { visible: false, prop: 'rowNo', label: '交验单行项目' },
@@ -356,11 +368,12 @@ const columns = ref([
   { visible: true, prop: 'materialSpec', label: '规格型号/图号' },
   { visible: true, prop: 'keyFlag', label: '关键件' },
   { visible: true, prop: 'bnSnCode', label: 'BN/SN码' },
-  { visible: false, prop: 'qty', label: '交验单数量' },
-  { visible: true, prop: 'checkQty', label: '合格数量' },
+  { visible: true, prop: 'qty', label: '交验单数量' },
+  { visible: true, prop: 'checkQty', label: '质检数量' },
   { visible: false, prop: 'inspectedBy', label: '质检人' },
   { visible: false, prop: 'inspectTime', label: '质检时间' },
   { visible: true, prop: 'result', label: '质检结果' },
+  { visible: true, prop: 'instoreResult', label: '入库结果' },
   { visible: true, prop: 'createBy', label: '创建人' },
   { visible: true, prop: 'createTime', label: '创建时间' },
   { visible: false, prop: 'updateBy', label: '更新人' },
@@ -441,7 +454,7 @@ const state = reactive({
     keyFlag: [{ required: true, message: "关键件标识不能为空", trigger: "blur" }],
     bnSnCode: [{ required: true, message: "BN/SN码不能为空", trigger: "blur" }],
     qty: [{ required: true, message: "交验单数量不能为空", trigger: "blur", type: "number" }],
-    checkQty: [{ required: true, message: "合格数量不能为空", trigger: "blur", type: "number" }],
+    checkQty: [{ required: true, message: "质检数量不能为空", trigger: "blur", type: "number" }],
     result: [{ required: true, message: "质检结果不能为空", trigger: "blur" }],
   },
   options: {
@@ -473,9 +486,9 @@ function cancel() {
 // 重置表单
 function reset() {
   form.value = {
-    inspectId: undefined,
-    inspectNo: undefined,
+    id: undefined,
     deliverNo: undefined,
+    checkName: undefined,
     bomNo: undefined,
     rowNo: undefined,
     category: undefined,
@@ -485,10 +498,11 @@ function reset() {
     keyFlag: undefined,
     bnSnCode: undefined,
     qty: undefined,
+    spotCheckQty: undefined,
     checkQty: undefined,
-    inspectedBy: undefined,
-    inspectTime: undefined,
-    result: undefined,
+    checkResult: undefined,
+    instoreQty: undefined,
+    instoreResult: undefined,
     createBy: undefined,
     createTime: undefined,
     updateBy: undefined,
@@ -497,7 +511,6 @@ function reset() {
   };
   proxy.resetForm("formRef")
 }
-
 // 添加按钮操作
 function handleAdd() {
   reset();