2024.1.17 质量——检验——任务：任务生成日期→送检日期 + 查询条件（送检日期）

src/views/modules/qc/FAIResultEntry.vue

@@ -59,6 +59,11 @@
           </el-option>
         </el-select>
       </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>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="'检验时间'">
         <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
@@ -876,6 +881,8 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          startDate2: '',
+          endDate2: '',
           partNo: '',
           partDesc: '',
           cinvSourceCode: '',
@@ -1040,7 +1047,7 @@
             columnProp: 'taskDate',
             headerAlign: "center",
             align: "center",
-            columnLabel: '任务生成日期',
+            columnLabel: '送检日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1414,6 +1421,24 @@
           unqualifiedQty: ''
         },
         detailColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2ItemNo',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301007,

src/views/modules/qc/FQCResultEntry.vue

@@ -59,6 +59,11 @@
           </el-option>
         </el-select>
       </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>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="'检验时间：'">
         <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime"
                         value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期">
@@ -878,6 +883,8 @@
           startDate: '',
           endDate: '',
           partNo: '',
+          startDate2: '',
+          endDate2: '',
           partDesc: '',
           cinvSourceCode: '',
           sku: '',
@@ -1039,7 +1046,7 @@
             columnProp: 'taskDate',
             headerAlign: "center",
             align: "center",
-            columnLabel: '任务生成日期',
+            columnLabel: '送检日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1413,6 +1420,24 @@
           unqualifiedQty: ''
         },
         detailColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2ItemNo',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301015,

src/views/modules/qc/IPQCResultEntry.vue

@@ -68,6 +68,11 @@
           </el-option>
         </el-select>
       </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>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="'检验时间：'">
         <el-date-picker style="width: 170px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始日期"></el-date-picker>
         -
@@ -897,6 +902,8 @@
           operationDesc: '',
           startDate: '',
           endDate: '',
+          startDate2: '',
+          endDate2: '',
           inspectionTypeNo: '',
           partNo: '',
           partDesc: '',
@@ -1084,7 +1091,7 @@
             columnProp: 'taskDate',
             headerAlign: "center",
             align: "center",
-            columnLabel: '任务生成日期',
+            columnLabel: '送检日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1458,6 +1465,24 @@
           unqualifiedQty: ''
         },
         detailColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2ItemNo',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301014,

src/views/modules/qc/IQCResultEntry.vue

@@ -59,6 +59,11 @@
           </el-option>
         </el-select>
       </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>
+        -
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="'检验时间'">
         <el-date-picker style="width: 160px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
@@ -524,6 +529,8 @@
           isQualified: '',
           startDate: '',
           endDate: '',
+          startDate2: '',
+          endDate2: '',
           partNo:'',
           partDesc:'',
           cinvSourceCode:'',
@@ -631,7 +638,7 @@
             columnProp: 'taskDate',
             headerAlign: "center",
             align: "center",
-            columnLabel: '任务生成日期',
+            columnLabel: '送检日期',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -966,6 +973,24 @@
           },
         ],
         detailColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ItemNo',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '检验项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 301006,