添加报表和规格型号

src/api/qc/qc_report.js

@@ -10,6 +10,10 @@ export const getFAIReport = data => createAPI('/pms/qcReport/getFAIReport','post
 export const getFQCReport = data => createAPI('/pms/qcReport/getFQCReport','post',data)
 // PQC报表查询
 export const getPQCReport = data => createAPI('/pms/qcReport/getPQCReport','post',data)
+// SQC报表查询
+export const getSQCReport = data => createAPI('/pms/qcReport/getSQCReport','post',data)
+// OQC报表查询
+export const getOQCReport = data => createAPI('/pms/qcReport/getOQCReport','post',data)
 
 
 // IQC报表明细查询
@@ -22,6 +26,10 @@ export const getFAIDetailReport = data => createAPI('/pms/qcReport/getFAIDetailR
 export const getFQCDetailReport = data => createAPI('/pms/qcReport/getFQCDetailReport','post',data)
 // PQC报表明细查询
 export const getPQCDetailReport = data => createAPI('/pms/qcReport/getPQCDetailReport','post',data)
+// SQC报表明细查询
+export const getSQCDetailReport = data => createAPI('/pms/qcReport/getSQCDetailReport','post',data)
+// OQC报表明细查询
+export const getOQCDetailReport = data => createAPI('/pms/qcReport/getOQCDetailReport','post',data)
 
 // 导出
 export const downloadQcDetailRecord = data => createAPI('/pms/qcReport/downloadQcDetailRecord','post',data, 'download')

src/views/modules/qc/FAIResultEntry.vue

@@ -1205,6 +1205,24 @@ export default {
           fixed: '',
           columnWidth: 120,
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301007,
+          serialNumber: '301007Table1Spec',
+          tableId: "301007Table1",
+          tableName: "FQC检验记录表",
+          columnProp: 'spec',
+          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: 301007,

src/views/modules/qc/FQCResultEntry.vue

@@ -1175,6 +1175,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table1Spec',
+            tableId: "301015Table1",
+            tableName: "FQC检验记录表",
+            columnProp: 'spec',
+            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: 301015,

src/views/modules/qc/IPQCResultEntry.vue

@@ -91,7 +91,7 @@
         <el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
         <el-button v-if="!authCancelCheck" type="primary" @click="cancelApproval">取消审核</el-button>
         <el-button v-if="!authDelete" type="primary" @click="deleteModal">删除</el-button>
-        <el-button v-if="!authOverLoad" type="primary" @click="overLoadModal">任务重载</el-button>
+        <el-button v-if="!authOverLoad" type="primary" :loading="overLoadLoading" @click="overLoadModal">任务重载</el-button>
         <el-button type="primary" @click="printList">打印</el-button>
         <download-excel
           :fields="fields()"
@@ -1201,6 +1201,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1Spec',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'spec',
+            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: 301014,
@@ -2401,6 +2419,7 @@
         authCancelCheck: false,
         authDelete: false,
         authOverLoad: false,
+        overLoadLoading: false,
         authDetail: false,
         authFile: false,
         menuId: this.$route.meta.menuId,
@@ -3546,23 +3565,49 @@
           this.$message.warning('请勾选要重载的检验单！')
           return
         }
-        this.$confirm(`确认重载选中的检验单?`, '提示', {
+        if (!this.IPQCSelections.every(val => val.state === '待检验' || val.state === '未开始')) {
+          this.$message.warning('检验单必须为待检验或未开始状态！')
+          return
+        }
+        this.$confirm(`是否重载该 ` + this.IPQCSelections.length + ` 条检验单?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          ipqcRecordOverLoad({ submitList: this.IPQCSelections }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message.success('操作成功')
-              this.getDataList()
-              this.IPQCSelections = []
-            } else {
-              this.$message.warning(data.msg || '操作失败')
-            }
+          const submitList = this.IPQCSelections.map(item => ({
+            ...item,
+            inspectionTypeNo: item.inspectionTypeNo || '101'
+          }))
+          this.overLoadModal2({
+            site: '',
+            submitList
           })
         }).catch(() => {})
       },
 
+      overLoadModal2 (tempData) {
+        this.overLoadLoading = true
+        ipqcRecordOverLoad(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.IPQCSelections = []
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+          this.overLoadLoading = false
+        }).catch(() => {
+          this.overLoadLoading = false
+        })
+      },
+
       Transfer (type) {
         if (type === '2') {
           if (this.detailData.inspectionResult === '' || this.detailData.inspectionResult == null) {

src/views/modules/qc/IQCResultEntry.vue

@@ -1101,6 +1101,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1Spec',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'spec',
+            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: 301006,

src/views/modules/qc/OQCResultEntry.vue

@@ -994,38 +994,38 @@
           {
             userId: this.$store.state.user.name,
             functionId: 301017,
-            serialNumber: '301017Table1PartDesc',
+            serialNumber: '301017Table1Spec',
             tableId: "301017Table1",
             tableName: "OQC检验记录表",
-            columnProp: 'partDesc',
+            columnProp: 'spec',
             headerAlign: "center",
             align: "left",
-            columnLabel: '物料名称',
+            columnLabel: '规格型号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 200,
+            columnWidth: 120,
           },
           {
             userId: this.$store.state.user.name,
             functionId: 301017,
-            serialNumber: '301017Table1Spec',
+            serialNumber: '301017Table1PartDesc',
             tableId: "301017Table1",
             tableName: "OQC检验记录表",
-            columnProp: 'spec',
+            columnProp: 'partDesc',
             headerAlign: "center",
             align: "left",
-            columnLabel: '规格型号',
+            columnLabel: '物料名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 120,
+            columnWidth: 200,
           },
           {
             userId: this.$store.state.user.name,

src/views/modules/qc/SQCResultEntry.vue

@@ -906,6 +906,24 @@
             fixed: '',
             columnWidth: 120,
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table1Spec',
+            tableId: "301015Table1",
+            tableName: "SQC检验记录表",
+            columnProp: 'spec',
+            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: 301015,

src/views/modules/qc/qcPartAttribute.vue

@@ -889,8 +889,11 @@
         <el-form-item label="物料名称">
           <el-input v-model="partDetailData.partDesc" clearable style="width: 137px"></el-input>
         </el-form-item>
-        <el-form-item label="SKU">
+        <!-- <el-form-item label="SKU">
           <el-input v-model="partDetailData.sku" clearable style="width: 100px"></el-input>
+        </el-form-item> -->
+        <el-form-item label="规格型号">
+          <el-input v-model="partDetailData.spec" clearable style="width: 100px"></el-input>
         </el-form-item>
         <el-form-item label="PN">
           <el-input v-model="partDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
@@ -918,6 +921,12 @@
           align="center"
           label="物料名称">
         </el-table-column>
+        <el-table-column
+          prop="spec"
+          header-align="center"
+          align="center"
+          label="规格型号">
+        </el-table-column>
         <el-table-column
           prop="sku"
           header-align="center"
@@ -1915,6 +1924,7 @@
           partDesc: '',
           seqNo: '',
           sku: '',
+          spec:'',
           cinvSourceCode:'',
         },
         authSearch: false,
@@ -1983,7 +1993,7 @@
       searchPartInfo () {
         
         this.partDetailData.site = this.modalData.site
-        if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
+        if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.spec && !this.partDetailData.cinvSourceCode) {
           this.partInfoList = []
           this.partDisableFlag = true
         }else {