2024-08-09

功能优化

src/views/common/login-token.vue

@@ -110,6 +110,7 @@
                 site: this.urlParam.site,
                 buNo: this.urlParam.buNo,
                 docNo: this.urlParam.docNo,
+                itemResult: this.urlParam.itemResult,
                 type: "tokenLogin",
               }
             })

src/views/modules/qc/FAIResultEntry.vue

@@ -593,7 +593,7 @@
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
           <el-table-column type="selection" align="center" width="50"></el-table-column>
-          <el-table-column label="序号" align="center" prop="rowI" width="50"></el-table-column>
+          <el-table-column label="序号" align="center" prop="num" width="50"></el-table-column>
           <el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150">
             <template slot-scope="{row}">
               <el-input v-if="templateTableData[row.xh-1].isSubmit==='Y'" v-model="templateTableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input>
@@ -985,13 +985,13 @@
       detailList: {
         deep: true,
         handler: function (newV, oldV) {
-          let num = 0
+          let num2 = 0
           for (let i = 0; i < this.detailList.length; i++) {
             if (this.detailList[i].itemResult === 'N') {
-              num++
+              num2++
             }
           }
-          this.detailData.unqualifiedQty = num
+          this.detailData.unqualifiedQty = num2
         }
       },
     },
@@ -3679,7 +3679,7 @@
       //表格的新增
       rowClassName ({ row, rowIndex }) {
         row.xh = rowIndex + 1
-        row.rowI = this.tableData.indexOf(row) + 1
+        row.num = this.tableData.indexOf(row) + 1
       },
 
       //单选框选中数据

src/views/modules/qc/FQCResultEntry.vue

@@ -521,7 +521,7 @@
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
           <el-table-column type="selection" align="center" width="50"></el-table-column>
-          <el-table-column label="序号" align="center" prop="rowI" width="50"></el-table-column>
+          <el-table-column label="序号" align="center" prop="num" width="50"></el-table-column>
           <el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150">
             <template slot-scope="{row}">
               <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input>
@@ -961,13 +961,13 @@
       detailList: {
         deep: true,
         handler: function (newV, oldV) {
-          let num = 0
+          let num2 = 0
           for (let i = 0; i < this.detailList.length; i++) {
             if (this.detailList[i].itemResult === 'N') {
-              num++
+              num2++
             }
           }
-          this.detailData.unqualifiedQty = num
+          this.detailData.unqualifiedQty = num2
         }
       },
     },
@@ -3653,7 +3653,7 @@
       //表格的新增
       rowClassName ({ row, rowIndex }) {
         row.xh = rowIndex + 1
-        row.rowI = this.tableData.indexOf(row) + 1
+        row.num = this.tableData.indexOf(row) + 1
       },
 
       //单选框选中数据

src/views/modules/qc/IPQCResultEntry.vue

@@ -535,7 +535,7 @@
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
           <el-table-column type="selection" align="center" width="50"></el-table-column>
-          <el-table-column label="序号" align="center" prop="rowI" width="50"></el-table-column>
+          <el-table-column label="序号" align="center" prop="num" width="50"></el-table-column>
           <el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150">
             <template slot-scope="{row}">
               <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input>
@@ -988,13 +988,13 @@
       detailList: {
         deep: true,
         handler: function (newV, oldV) {
-          let num = 0
+          let num2 = 0
           for (let i = 0; i < this.detailList.length; i++) {
             if (this.detailList[i].itemResult === 'N') {
-              num++
+              num2++
             }
           }
-          this.detailData.unqualifiedQty = num
+          this.detailData.unqualifiedQty = num2
         }
       },
     },
@@ -3740,7 +3740,7 @@
       // 表格的新增
       rowClassName ({ row, rowIndex }) {
         row.xh = rowIndex + 1
-        row.rowI = this.tableData.indexOf(row) + 1
+        row.num = this.tableData.indexOf(row) + 1
       },
 
       // 单选框选中数据

src/views/modules/qc/IQCResultEntry.vue

@@ -466,7 +466,7 @@
           @selection-change="handleDetailSelectionChange"
           style="width: 100%;">
           <el-table-column type="selection" align="center" width="50"></el-table-column>
-          <el-table-column label="序号" align="center" prop="rowI" width="50"></el-table-column>
+          <el-table-column label="序号" align="center" prop="num" width="50"></el-table-column>
           <el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150">
             <template slot-scope="{row}">
               <el-input v-if="templateTableData[row.xh-1].isSubmit === 'Y'" v-model="templateTableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input>
@@ -704,13 +704,13 @@
       detailList: {
         deep: true,
         handler: function (newV, oldV) {
-          let num = 0
+          let num2 = 0
           for (let i = 0; i < this.detailList.length; i++) {
             if (this.detailList[i].itemResult === 'N') {
-              num++
+              num2++
             }
           }
-          this.detailData.unqualifiedQty = num
+          this.detailData.unqualifiedQty = num2
         }
       },
     },
@@ -2682,7 +2682,7 @@
       // 表格的新增
       rowClassName ({ row, rowIndex }) {
         row.xh = rowIndex + 1
-        row.rowI = this.tableData.indexOf(row) + 1
+        row.num = this.tableData.indexOf(row) + 1
       },
 
       // 单选框选中数据

src/views/modules/qc/sub_detail_upload.vue

@@ -98,6 +98,7 @@ export default {
           this.$refs.uploadFile.clearFiles()
           // 关闭窗口并刷新页面
           //this.closeDialog()
+          this.fileList = []
           this.visible = false
         } else {
           let message = data.msg.split(';')
@@ -106,7 +107,6 @@ export default {
             dangerouslyUseHTMLString: true
           })
         }
-        this.fileList = []
       })
     },
 

src/views/modules/report/FAI_report.vue

@@ -26,18 +26,29 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 307px"></el-input>
+      </el-form-item>
       <el-form-item :label="'SKU'">
-        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.sku" clearable style="width: 150px"></el-input>
       </el-form-item>
-      <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" 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-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -48,11 +59,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true"  label-position="top" :model="searchData" @keyup.enter.native="getDataList">
-      <el-form-item :label="'PN'">
-        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
@@ -72,6 +78,12 @@
       </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.operatorName" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'责任人'">
+        <el-input v-model="searchData.responsiblePersonName" clearable style="width: 150px"></el-input>
+      </el-form-item>
       <el-form-item :label="'送检日期'">
         <el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
@@ -243,6 +255,9 @@
           limit: 10,
           seqNo: '',
           states: [],
+          operatorName: '',
+          responsiblePersonName: '',
+          itemResult: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -704,6 +719,42 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001003,
+            serialNumber: '107001003Table1OperatorName',
+            tableId: "107001003Table1",
+            tableName: "FAI报表",
+            columnProp: 'operatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '协同人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001003,
+            serialNumber: '107001003Table1ResponsiblePersonName',
+            tableId: "107001003Table1",
+            tableName: "FAI报表",
+            columnProp: 'responsiblePersonName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '责任人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001003,
@@ -866,6 +917,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001003,
+            serialNumber: '107001003Table1ItemResultDesc',
+            tableId: "107001003Table1",
+            tableName: "FAI报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
@@ -944,6 +1013,7 @@
       if (this.$route.params.type === 'tokenLogin') {
         this.searchData.buNo = this.$route.params.buNo
         this.searchData.inspectionNo = this.$route.params.docNo
+        this.searchData.itemResult = this.$route.params.itemResult
       }
       this.getDataList()
     },

src/views/modules/report/FQC_report.vue

@@ -26,18 +26,29 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 307px"></el-input>
+      </el-form-item>
       <el-form-item :label="'SKU'">
-        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.sku" clearable style="width: 150px"></el-input>
       </el-form-item>
-      <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" 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-select v-model="searchData.inspectionResult" clearable style="width: 80px">
           <el-option label="合格" value="合格"></el-option>
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -48,11 +59,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
-      <el-form-item :label="'PN'">
-        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
@@ -72,6 +78,12 @@
       </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.operatorName" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'责任人'">
+        <el-input v-model="searchData.responsiblePersonName" clearable style="width: 150px"></el-input>
+      </el-form-item>
       <el-form-item :label="'送检日期'">
         <el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
@@ -243,6 +255,9 @@
           limit: 10,
           seqNo: '',
           states: [],
+          operatorName: '',
+          responsiblePersonName: '',
+          itemResult: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -704,6 +719,42 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001004,
+            serialNumber: '107001004Table1OperatorName',
+            tableId: "107001004Table1",
+            tableName: "FQC报表",
+            columnProp: 'operatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '协同人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001004,
+            serialNumber: '107001004Table1ResponsiblePersonName',
+            tableId: "107001004Table1",
+            tableName: "FQC报表",
+            columnProp: 'responsiblePersonName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '责任人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001004,
@@ -866,6 +917,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001004,
+            serialNumber: '107001004Table1ItemResultDesc',
+            tableId: "107001004Table1",
+            tableName: "FQC报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
@@ -944,6 +1013,7 @@
       if (this.$route.params.type === 'tokenLogin') {
         this.searchData.buNo = this.$route.params.buNo
         this.searchData.inspectionNo = this.$route.params.docNo
+        this.searchData.itemResult = this.$route.params.itemResult
       }
       this.getDataList()
     },

src/views/modules/report/IPQC_report.vue

@@ -26,11 +26,14 @@
       <el-form-item :label="'物料编码'">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料名称'">
+        <el-input v-model="searchData.partDesc" clearable style="width: 300px"></el-input>
+      </el-form-item>
       <el-form-item :label="'SKU'">
-        <el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.sku" clearable style="width: 150px"></el-input>
       </el-form-item>
-      <el-form-item :label="'物料名称'">
-        <el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
+      <el-form-item :label="'PN'">
+        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 150px"></el-input>
       </el-form-item>
       <el-form-item :label="'检验结论'">
         <el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
@@ -38,6 +41,14 @@
           <el-option label="不合格" value="不合格"></el-option>
         </el-select>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'检验类型'">
         <el-select v-model="searchData.inspectionTypeNo" clearable style="width: 100px">
           <el-option label="IPQC首检" value="首件检"></el-option>
@@ -56,11 +67,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
-      <el-form-item :label="'PN'">
-        <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item :label="'工单号'">
         <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
       </el-form-item>
@@ -80,6 +86,12 @@
       </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.operatorName" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'责任人'">
+        <el-input v-model="searchData.responsiblePersonName" clearable style="width: 150px"></el-input>
+      </el-form-item>
       <el-form-item :label="'送检日期'">
         <el-date-picker style="width: 160px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
@@ -248,6 +260,9 @@
           limit: 10,
           seqNo: '',
           states: [],
+          operatorName: '',
+          responsiblePersonName: '',
+          itemResult: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -709,6 +724,42 @@
             fixed: '',
             columnWidth: 170,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001002,
+            serialNumber: '107001002Table1OperatorName',
+            tableId: "107001002Table1",
+            tableName: "IPQC报表",
+            columnProp: 'operatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '协同人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001002,
+            serialNumber: '107001002Table1ResponsiblePersonName',
+            tableId: "107001002Table1",
+            tableName: "IPQC报表",
+            columnProp: 'responsiblePersonName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '责任人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001002,
@@ -871,6 +922,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001002,
+            serialNumber: '107001002Table1ItemResultDesc',
+            tableId: "107001002Table1",
+            tableName: "IPQC报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
@@ -967,6 +1036,7 @@
       if (this.$route.params.type === 'tokenLogin') {
         this.searchData.buNo = this.$route.params.buNo
         this.searchData.inspectionNo = this.$route.params.docNo
+        this.searchData.itemResult = this.$route.params.itemResult
       }
       this.getDataList()
     },

src/views/modules/report/IQC_report.vue

@@ -44,10 +44,10 @@
     </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: 200px"></el-input>
+        <el-input v-model="searchData.supplierDesc" clearable style="width: 150px"></el-input>
       </el-form-item>
       <el-form-item :label="'质检员'">
-        <el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
+        <el-input v-model="searchData.inspectorName" clearable style="width: 100px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.states" multiple style="width: 340px">
@@ -64,6 +64,12 @@
           <el-option label="免检" value="免检"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'项目检验结论'">
+        <el-select v-model="searchData.itemResult" clearable style="width: 80px">
+          <el-option label="合格" value="Y"></el-option>
+          <el-option label="不合格" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'处置措施'">
         <el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
           <el-option
@@ -93,6 +99,12 @@
       </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.operatorName" clearable style="width: 150px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'责任人'">
+        <el-input v-model="searchData.responsiblePersonName" clearable style="width: 150px"></el-input>
+      </el-form-item>
       <el-form-item :label="'送检日期'">
         <el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
@@ -271,7 +283,10 @@
           poItemNo: '',
           orderType: '',
           states: [],
-          submissionType: ''
+          submissionType: '',
+          operatorName: '',
+          responsiblePersonName: '',
+          itemResult: ''
         },
         pageIndex: 1,
         pageSize: 20,
@@ -769,6 +784,42 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001001,
+            serialNumber: '107001001Table1OperatorName',
+            tableId: "107001001Table1",
+            tableName: "IQC报表",
+            columnProp: 'operatorName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '协同人员',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001001,
+            serialNumber: '107001001Table1ResponsiblePersonName',
+            tableId: "107001001Table1",
+            tableName: "IQC报表",
+            columnProp: 'responsiblePersonName',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '责任人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 107001001,
@@ -931,6 +982,24 @@
             fixed: '',
             columnWidth: 100,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 107001001,
+            serialNumber: '107001001Table1ItemResultDesc',
+            tableId: "107001001Table1",
+            tableName: "IQC报表",
+            columnProp: 'itemResultDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '项目检验结论',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
         ],
         SubDetailColumnList: [
           {
@@ -1010,6 +1079,7 @@
       if (this.$route.params.type === 'tokenLogin') {
         this.searchData.buNo = this.$route.params.buNo
         this.searchData.inspectionNo = this.$route.params.docNo
+        this.searchData.itemResult = this.$route.params.itemResult
       }
       this.getDataList()
     },