From ebd1f144ea913a00c49ce6281d72159ac28ca8e8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 24 Oct 2024 17:53:46 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-24=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/part/partInformation.vue    |  2 +-
 src/views/modules/part/routingManagement.vue  |  4 ++--
 .../modules/report/FAI_detail_report.vue      | 24 ++++++++++++++++++-
 src/views/modules/report/FAI_report.vue       | 18 ++++++++++++++
 .../modules/report/FQC_detail_report.vue      | 24 ++++++++++++++++++-
 src/views/modules/report/FQC_report.vue       | 18 ++++++++++++++
 .../modules/report/IPQC_detail_report.vue     | 24 ++++++++++++++++++-
 src/views/modules/report/IPQC_report.vue      | 18 ++++++++++++++
 .../modules/report/IQC_detail_report.vue      |  7 ++++--
 9 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 2769585..8de967f 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -237,7 +237,7 @@
                 <el-input v-model="modalData.otherGroup3" @blur="productGroupId3Blur(213)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.otherGroupName3" disabled style="width: 330px"></el-input>
               </el-form-item>
-              <el-form-item prop="codeNo" :rules="rules.codeNo">
+              <el-form-item>
                 <span style="cursor: pointer" slot="label" @click="getBaseList(219)"><a herf="#">属性模板</a></span>
                 <el-input v-model="modalData.codeNo" @blur="modelBlur(219)" style="width: 128px"></el-input>
                 <el-input v-model="modalData.codeDesc" disabled style="width: 330px"></el-input>
diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index ad37f16..57eb7f1 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -396,10 +396,10 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item :label="'机器处理时间'">
-          <el-input-number :controls="false" :step="0" :precision="2" v-model="componentData.machCycleTime" @change="changeMachCycleTime" style="width: 221px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :precision="4" v-model="componentData.machCycleTime" @change="changeMachCycleTime" style="width: 221px"></el-input-number>
         </el-form-item>
         <el-form-item :label="'人工处理时间'">
-          <el-input-number :controls="false" :step="0" :precision="2" v-model="componentData.laborCycleTime" @change="changeLaborCycleTime" style="width: 221px"></el-input-number>
+          <el-input-number :controls="false" :step="0" :precision="4" v-model="componentData.laborCycleTime" @change="changeLaborCycleTime" style="width: 221px"></el-input-number>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
diff --git a/src/views/modules/report/FAI_detail_report.vue b/src/views/modules/report/FAI_detail_report.vue
index 36969d5..3a25997 100644
--- a/src/views/modules/report/FAI_detail_report.vue
+++ b/src/views/modules/report/FAI_detail_report.vue
@@ -43,6 +43,9 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'检验项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目检验结论'">
         <el-select v-model="searchData.itemResult" clearable style="width: 80px">
           <el-option label="合格" value="Y"></el-option>
@@ -184,7 +187,8 @@ export default {
           operatorName: '',
           responsiblePersonName: '',
           itemResult: '',
-          downloadType: 'fai'
+          downloadType: 'fai',
+          itemNo: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -247,6 +251,24 @@ export default {
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001006,
+            serialNumber: '107001006Table1BatchRollNo',
+            tableId: "107001006Table1",
+            tableName: "FAI明细报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001006,
diff --git a/src/views/modules/report/FAI_report.vue b/src/views/modules/report/FAI_report.vue
index c0ac5b0..d55ffe7 100644
--- a/src/views/modules/report/FAI_report.vue
+++ b/src/views/modules/report/FAI_report.vue
@@ -335,6 +335,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001005,
+            serialNumber: '107001005Table1BatchRollNo',
+            tableId: "107001005Table1",
+            tableName: "FAI报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001005,
diff --git a/src/views/modules/report/FQC_detail_report.vue b/src/views/modules/report/FQC_detail_report.vue
index aa8d2f3..aa659de 100644
--- a/src/views/modules/report/FQC_detail_report.vue
+++ b/src/views/modules/report/FQC_detail_report.vue
@@ -43,6 +43,9 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'检验项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目检验结论'">
         <el-select v-model="searchData.itemResult" clearable style="width: 80px">
           <el-option label="合格" value="Y"></el-option>
@@ -184,7 +187,8 @@ export default {
           operatorName: '',
           responsiblePersonName: '',
           itemResult: '',
-          downloadType: 'fqc'
+          downloadType: 'fqc',
+          itemNo: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -247,6 +251,24 @@ export default {
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001008,
+            serialNumber: '107001008Table1BatchRollNo',
+            tableId: "107001008Table1",
+            tableName: "FQC明细报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001008,
diff --git a/src/views/modules/report/FQC_report.vue b/src/views/modules/report/FQC_report.vue
index 75aaf04..e4c80d0 100644
--- a/src/views/modules/report/FQC_report.vue
+++ b/src/views/modules/report/FQC_report.vue
@@ -335,6 +335,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001007,
+            serialNumber: '107001007Table1BatchRollNo',
+            tableId: "107001007Table1",
+            tableName: "FQC报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001007,
diff --git a/src/views/modules/report/IPQC_detail_report.vue b/src/views/modules/report/IPQC_detail_report.vue
index 669483b..7fc9c95 100644
--- a/src/views/modules/report/IPQC_detail_report.vue
+++ b/src/views/modules/report/IPQC_detail_report.vue
@@ -43,6 +43,9 @@
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'检验项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目检验结论'">
         <el-select v-model="searchData.itemResult" clearable style="width: 80px">
           <el-option label="合格" value="Y"></el-option>
@@ -193,7 +196,8 @@ export default {
           operatorName: '',
           responsiblePersonName: '',
           itemResult: '',
-          downloadType: 'ipqc'
+          downloadType: 'ipqc',
+          itemNo: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -256,6 +260,24 @@ export default {
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001004,
+            serialNumber: '107001004Table1BatchRollNo',
+            tableId: "107001004Table1",
+            tableName: "IPQC明细报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001004,
diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue
index 025a850..2f68700 100644
--- a/src/views/modules/report/IPQC_report.vue
+++ b/src/views/modules/report/IPQC_report.vue
@@ -340,6 +340,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001003,
+            serialNumber: '107001003Table1BatchRollNo',
+            tableId: "107001003Table1",
+            tableName: "IPQC报表",
+            columnProp: 'batchRollNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '老卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001003,
diff --git a/src/views/modules/report/IQC_detail_report.vue b/src/views/modules/report/IQC_detail_report.vue
index acecda1..fcecd19 100644
--- a/src/views/modules/report/IQC_detail_report.vue
+++ b/src/views/modules/report/IQC_detail_report.vue
@@ -41,11 +41,11 @@
       <el-form-item :label="'PN'">
         <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'供应商'">
         <el-input v-model="searchData.supplierDesc" clearable style="width: 150px"></el-input>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'质检员'">
         <el-input v-model="searchData.inspectorName" clearable style="width: 100px"></el-input>
       </el-form-item>
@@ -64,6 +64,9 @@
           <el-option label="免检" value="免检"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'检验项目编码'">
+        <el-input v-model="searchData.itemNo" clearable style="width: 100px"></el-input>
+      </el-form-item>
       <el-form-item :label="'项目检验结论'">
         <el-select v-model="searchData.itemResult" clearable style="width: 80px">
           <el-option label="合格" value="Y"></el-option>