diff --git a/build/utils.js b/build/utils.js index e534fb0..bc98c13 100644 --- a/build/utils.js +++ b/build/utils.js @@ -47,7 +47,8 @@ exports.cssLoaders = function (options) { if (options.extract) { return ExtractTextPlugin.extract({ use: loaders, - fallback: 'vue-style-loader' + fallback: 'vue-style-loader', + publicPath: '../../' }) } else { return ['vue-style-loader'].concat(loaders) diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js index 78d2e79..c6bbc67 100644 --- a/src/api/qc/qc.js +++ b/src/api/qc/qc.js @@ -181,3 +181,4 @@ export const getFQCItemObjectList = data => createAPI(`/pms/qc/getFQCItemObjectL export const getIPQCItemObjectList = data => createAPI(`/pms/qc/getIPQCItemObjectList`,'post',data) export const getInspectionStandards = data => createAPI(`/pms/qc/getInspectionStandards`,'post',data) export const saveInspectionStandard = data => createAPI(`/pms/qc/saveInspectionStandard`,'post',data) +export const dataAcquisitionByItem = data => createAPI(`/pms/qc/dataAcquisitionByItem`,'post',data) diff --git a/src/main.js b/src/main.js index 2f4667f..72f9591 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,7 @@ import dayjs from 'dayjs'; import '@/element-ui' // api: https://github.com/ElemeFE/element import '@/icons' // api: http://www.iconfont.cn/ import '@/element-ui-theme' +import 'element-ui/lib/theme-chalk/icon.css' import '@/assets/scss/index.scss' import httpRequest from '@/utils/httpRequest' // api: https://github.com/axios/axios diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index a84ebd4..b8d04f4 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -390,7 +390,8 @@ - 上传文件 + 工作文件 + 明细导入 @@ -429,10 +430,11 @@ prop="" header-align="center" align="center" - min-width="60" + min-width="90" label="操作"> + + + 上传文件 + + - + @@ -923,6 +930,7 @@ dataAcquisition, // 数据采集 getResponsibleOperatorList, // 获取责任人列表 getFAIItemObjectList, // 查询项目设备 + dataAcquisitionByItem, // 根据项目数据采集 } from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -2403,6 +2411,35 @@ }) }, + // 根据项目数据采集 + dataAcquisitionByItem (row) { + this.loadFlag = true + let tempDate = { + site: row.site, + buNo: row.buNo, + inspectionNo: row.inspectionNo, + itemNo: row.itemNo, + flag: 'fai' + } + dataAcquisitionByItem(tempDate).then(({data}) => { + if (data.code === 0) { + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) + } else { + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 + }) + } + this.loadFlag = false + }) + }, + // 获取用户角色 getUserRoleList () { getUserRoleList().then(({data}) => { diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index b7855e9..409f052 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -375,7 +375,8 @@ - 上传文件 + 工作文件 + 明细导入 @@ -414,10 +415,11 @@ prop="" header-align="center" align="center" - min-width="60" + min-width="90" label="操作"> + + + 上传文件 + + - + @@ -900,6 +907,7 @@ dataAcquisition, // 数据采集 getResponsibleOperatorList, // 获取责任人列表 getFQCItemObjectList, // 查询项目设备 + dataAcquisitionByItem, // 根据项目数据采集 } from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -2378,6 +2386,35 @@ }) }, + // 根据项目数据采集 + dataAcquisitionByItem (row) { + this.loadFlag = true + let tempDate = { + site: row.site, + buNo: row.buNo, + inspectionNo: row.inspectionNo, + itemNo: row.itemNo, + flag: 'fqc' + } + dataAcquisitionByItem(tempDate).then(({data}) => { + if (data.code === 0) { + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) + } else { + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 + }) + } + this.loadFlag = false + }) + }, + // 获取用户角色 getUserRoleList () { getUserRoleList().then(({data}) => { diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index a39dd7b..baab091 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -388,7 +388,8 @@ - 上传文件 + 工作文件 + 明细导入 @@ -427,10 +428,11 @@ prop="" header-align="center" align="center" - min-width="60" + min-width="90" label="操作"> - + 添加 删除 批量新增 @@ -544,10 +546,16 @@ - + + + + @@ -735,6 +743,11 @@ + + + 上传文件 + + - + @@ -920,6 +933,7 @@ dataAcquisition, // 数据采集 getResponsibleOperatorList, // 获取责任人列表 getIPQCItemObjectList, // 查询项目设备 + dataAcquisitionByItem, // 根据项目数据采集 } from "@/api/qc/qc.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' @@ -2432,6 +2446,35 @@ }) }, + // 根据项目数据采集 + dataAcquisitionByItem (row) { + this.loadFlag = true + let tempDate = { + site: row.site, + buNo: row.buNo, + inspectionNo: row.inspectionNo, + itemNo: row.itemNo, + flag: 'ipqc' + } + dataAcquisitionByItem(tempDate).then(({data}) => { + if (data.code === 0) { + this.changeMyString(data.rows) + this.$message({ + message: '数据采集成功', + type: 'success', + duration: 1500 + }) + } else { + this.$message({ + message: data.msg, + type: 'warning', + duration: 1500 + }) + } + this.loadFlag = false + }) + }, + // 获取用户角色 getUserRoleList () { getUserRoleList().then(({data}) => { @@ -3607,9 +3650,12 @@ handleAddBtn (td) { checkIPQCIsSubmit(td).then(({data}) => { if (data.flag !== 1) { - let obj = {} - obj.subDetailValue = "" - obj.samplingLocation = "" + let obj = { + subDetailValue: '', + samplingLocation: '', + samplingLocationB: '', + subDetailValueB: '' + } this.tableData.push(obj) } else { this.$alert("记录已提交！", '错误', { @@ -3635,10 +3681,12 @@ // 批量新增行 batchHandleAddModal () { for (let i = 0; i < this.batchAddData.samplingNumber; i++) { - let obj = {} - obj.samplingLocation = this.batchAddData.samplingLocation - obj.samplingLocationB = this.batchAddData.samplingLocationB - obj.subDetailValue = "" + let obj = { + samplingLocation: this.batchAddData.samplingLocation, + samplingLocationB: this.batchAddData.samplingLocationB, + subDetailValue: '', + subDetailValueB: '' + } this.tableData.push(obj) } this.batchHandleAddModalFlag = false @@ -3663,6 +3711,12 @@ this.$refs[a3].focus() }) }, + nextFocus4 (index) { + let a3 = `${index + 1}` + `d` + this.$nextTick(() => { + this.$refs[a3].focus() + }) + }, focusNextInput (index, type) { let aaa = '' if (this.detailList.length - 1 === index) { diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 1e7ac59..6f1f508 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -260,7 +260,8 @@ - 上传文件 + 工作文件 + 明细导入 @@ -299,10 +300,11 @@ prop="" header-align="center" align="center" - min-width="60" + min-width="90" label="操作">