Browse Source

2023-11-12 设备和质量修改

java8
杨奉源 2 years ago
parent
commit
06e34523b4
  1. 1
      src/api/qc/qc.js
  2. 59
      src/views/modules/qc/FAIResultEntry.vue
  3. 59
      src/views/modules/qc/FQCResultEntry.vue
  4. 52
      src/views/modules/qc/IPQCResultEntry.vue
  5. 43
      src/views/modules/qc/IQCResultEntry.vue
  6. 142
      src/views/modules/qc/sub_detail_upload.vue

1
src/api/qc/qc.js

@ -13,6 +13,7 @@ export const qcItemUpdate = data => createAPI(`/pms/qc/qcItemUpdate`,'post',data
export const qcItemDelete = data => createAPI(`/pms/qc/qcItemDelete`,'post',data) export const qcItemDelete = data => createAPI(`/pms/qc/qcItemDelete`,'post',data)
export const uploadExcel = data => createAPI(`/pms/qc/uploadExcel`,'post',data) export const uploadExcel = data => createAPI(`/pms/qc/uploadExcel`,'post',data)
export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data) export const getItemLists= data => createAPI(`/pms/qc/getItemLists`,'post',data)
export const subDetailUpload= data => createAPI(`/pms/qc/subDetailUpload`,'post',data)
// ===================================== 质检员信息 ===================================== // ===================================== 质检员信息 =====================================
export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data) export const inspectorSearch = data => createAPI(`/pms/qc/inspectorSearch`,'post',data)

59
src/views/modules/qc/FAIResultEntry.vue

@ -335,11 +335,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
</el-form-item> </el-form-item>
<el-form-item :label="' '"></el-form-item> <el-form-item :label="' '"></el-form-item>
</el-form> </el-form>
@ -376,6 +377,17 @@
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop=""
header-align="center"
align="right"
min-width="80"
label="实测值">
<template slot-scope="scope">
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="" prop=""
header-align="center" header-align="center"
@ -638,6 +650,8 @@
<!-- 上传文件的modal --> <!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile> <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
<!-- 子明细导入 -->
<subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
</div> </div>
</template> </template>
@ -658,7 +672,6 @@
saveFAIInspection, // FAI saveFAIInspection, // FAI
queryController, // queryController, //
queryTemplateList, // queryTemplateList, //
getPartInformation, //
getSpecialOperationList, // getSpecialOperationList, //
inspectionTypeSearch, // inspectionTypeSearch, //
disposalMeasuresSearch, // disposalMeasuresSearch, //
@ -666,23 +679,25 @@
rollNoEnter, // rollNoEnter, //
queryPartList, // queryPartList, //
umSearch // umSearch //
} from "@/api/qc/qc.js";
} from "@/api/qc/qc.js"
import { import {
getTableDefaultListLanguage, getTableDefaultListLanguage,
getTableUserListLanguage, getTableUserListLanguage,
} from "@/api/table.js" } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
import {deleteObjectFile} from '@/api/eam/eam.js';
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file";
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file";
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
import subDetailUpload from "./sub_detail_upload"
/*上传文件的組件*/ /*上传文件的組件*/
export default { export default {
components: { components: {
Chooselist, Chooselist,
qcFAIUploadFile, qcFAIUploadFile,
comQcItemImageUploadFile
comQcItemImageUploadFile,
subDetailUpload
}, },
data () { data () {
return { return {
@ -1222,6 +1237,7 @@
samplingQty: '', samplingQty: '',
rollQty: '', rollQty: '',
itemList:[], itemList:[],
unqualifiedQty: ''
}, },
detailColumnList: [ detailColumnList: [
{ {
@ -1674,6 +1690,21 @@
}, },
methods: { methods: {
//
subDetailUpload () {
let currentData = {
flag: 'FAI',
site: this.$store.state.user.site,
inspectionNo: this.detailData.inspectionNo
}
//
this.$nextTick(() => {
this.$refs.subDetailUpload.init(currentData)
})
},
// //
umSearch(){ umSearch(){
let tempData = { let tempData = {
@ -2344,7 +2375,6 @@
// } // }
} }
this.saveDetailInformation() this.saveDetailInformation()
this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}})
}, },
// //
@ -2357,11 +2387,18 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.rollQty = this.detailData.rollQty
this.saveInformationData.samplingQty = this.detailData.samplingQty this.saveInformationData.samplingQty = this.detailData.samplingQty
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveFAIDetailedRecord(this.saveInformationData).then(({data}) => { saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'

59
src/views/modules/qc/FQCResultEntry.vue

@ -250,7 +250,7 @@
</el-dialog> </el-dialog>
<!-- 检验单详情页 --> <!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1100px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input> <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
@ -333,11 +333,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
</el-form-item> </el-form-item>
<el-form-item :label="' '"></el-form-item> <el-form-item :label="' '"></el-form-item>
</el-form> </el-form>
@ -374,6 +375,17 @@
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop=""
header-align="center"
align="right"
min-width="80"
label="实测值">
<template slot-scope="scope">
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="" prop=""
header-align="center" header-align="center"
@ -636,6 +648,8 @@
<!-- 上传文件的modal --> <!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile> <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
<!-- 子明细导入 -->
<subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
</div> </div>
</template> </template>
@ -664,23 +678,25 @@
rollNoEnter, // rollNoEnter, //
queryPartList, // queryPartList, //
umSearch // umSearch //
} from "@/api/qc/qc.js";
} from "@/api/qc/qc.js"
import { import {
getTableDefaultListLanguage, getTableDefaultListLanguage,
getTableUserListLanguage, getTableUserListLanguage,
} from "@/api/table.js" } from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
import {deleteObjectFile} from '@/api/eam/eam.js';
import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
import {deleteObjectFile} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file";
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file";
import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
import subDetailUpload from "./sub_detail_upload"
/*上传文件的組件*/ /*上传文件的組件*/
export default { export default {
components: { components: {
Chooselist, Chooselist,
qcFAIUploadFile, qcFAIUploadFile,
comQcItemImageUploadFile
comQcItemImageUploadFile,
subDetailUpload
}, },
data () { data () {
return { return {
@ -1220,6 +1236,7 @@
samplingQty: '', samplingQty: '',
rollQty: '', rollQty: '',
itemList:[], itemList:[],
unqualifiedQty: ''
}, },
detailColumnList: [ detailColumnList: [
{ {
@ -1672,6 +1689,20 @@
}, },
methods: { methods: {
//
subDetailUpload () {
let currentData = {
flag: 'FQC',
site: this.$store.state.user.site,
inspectionNo: this.detailData.inspectionNo
}
//
this.$nextTick(() => {
this.$refs.subDetailUpload.init(currentData)
})
},
// //
umSearch(){ umSearch(){
let tempData = { let tempData = {
@ -2342,7 +2373,6 @@
// } // }
} }
this.saveDetailInformation() this.saveDetailInformation()
this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}})
}, },
// //
@ -2355,11 +2385,18 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.rollQty = this.detailData.rollQty
this.saveInformationData.samplingQty = this.detailData.samplingQty this.saveInformationData.samplingQty = this.detailData.samplingQty
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveFQCDetailedRecord(this.saveInformationData).then(({data}) => { saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'

52
src/views/modules/qc/IPQCResultEntry.vue

@ -271,7 +271,7 @@
</el-dialog> </el-dialog>
<!-- 检验单详情页 --> <!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1100px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList()">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input> <el-input v-model="detailData.partNo" readonly style="width: 100px"></el-input>
@ -354,11 +354,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 300px"></el-input>
<el-input v-if="detailData.submitFlag == 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
</el-form-item> </el-form-item>
<el-form-item :label="' '"></el-form-item> <el-form-item :label="' '"></el-form-item>
</el-form> </el-form>
@ -395,6 +396,17 @@
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop=""
header-align="center"
align="right"
min-width="80"
label="实测值">
<template slot-scope="scope">
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="" prop=""
header-align="center" header-align="center"
@ -654,6 +666,8 @@
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList()" v-drag></qcFAIUploadFile> <qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList()" v-drag></qcFAIUploadFile>
<!-- 上传文件的modal --> <!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile> <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
<!-- 子明细导入 -->
<subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
</div> </div>
</template> </template>
@ -674,7 +688,6 @@
saveOsInspection, // saveOsInspection, //
queryController, // queryController, //
queryTemplateList, // queryTemplateList, //
getPartInformation, //
getSpecialOperationList, // getSpecialOperationList, //
inspectionTypeSearch, // inspectionTypeSearch, //
disposalMeasuresSearch, // disposalMeasuresSearch, //
@ -693,12 +706,14 @@
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file" import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file" import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
import subDetailUpload from "./sub_detail_upload";
/*上传文件的組件*/ /*上传文件的組件*/
export default { export default {
components: { components: {
Chooselist, Chooselist,
qcFAIUploadFile, qcFAIUploadFile,
comQcItemImageUploadFile
comQcItemImageUploadFile,
subDetailUpload
}, },
data () { data () {
return { return {
@ -1264,6 +1279,7 @@
samplingQty: '', samplingQty: '',
rollQty: '', rollQty: '',
itemList:[], itemList:[],
unqualifiedQty: ''
}, },
detailColumnList: [ detailColumnList: [
{ {
@ -1724,6 +1740,20 @@
}, },
methods: { methods: {
//
subDetailUpload () {
let currentData = {
flag: 'IPQC',
site: this.$store.state.user.site,
inspectionNo: this.detailData.inspectionNo
};
//
this.$nextTick(() => {
this.$refs.subDetailUpload.init(currentData);
})
},
// //
umSearch(){ umSearch(){
let tempData = { let tempData = {
@ -2369,10 +2399,6 @@
this.$message.warning('请选择检验结论!') this.$message.warning('请选择检验结论!')
return return
} }
// if (this.detailData.inspectorNo === '' || this.detailData.inspectorNo == null) {
// this.$message.warning('')
// return
// }
for (let i = 0; i < this.detailList.length; i++) { for (let i = 0; i < this.detailList.length; i++) {
if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){ if(this.detailList[i].itemResult === '' || this.detailList[i].itemResult == null){
this.detailList[i].itemResult = 'Y' this.detailList[i].itemResult = 'Y'
@ -2394,7 +2420,6 @@
// } // }
} }
this.saveDetailInformation() this.saveDetailInformation()
this.$message({message: '操作成功', type: 'success', duration: 1500, onClose: () => {}})
}, },
// //
@ -2407,11 +2432,18 @@
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.rollQty = this.detailData.rollQty this.saveInformationData.rollQty = this.detailData.rollQty
this.saveInformationData.samplingQty = this.detailData.samplingQty this.saveInformationData.samplingQty = this.detailData.samplingQty
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.detailInformationFlag = false this.detailInformationFlag = false
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {}
})
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'

43
src/views/modules/qc/IQCResultEntry.vue

@ -128,7 +128,7 @@
</el-pagination> </el-pagination>
<!-- 检验单详情页 --> <!-- 检验单详情页 -->
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1000px">
<el-dialog title="检验明细清单" :close-on-click-modal="false" v-drag :visible.sync="detailInformationFlag" width="1200px">
<el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()"> <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input> <el-input v-model="detailData.partNo" disabled style="width: 100px"></el-input>
@ -205,11 +205,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 200px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal()">上传文件</el-button> <el-button type="primary" @click="addUploadFileModal()">上传文件</el-button>
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload()">子明细导入</el-button>
</el-form-item> </el-form-item>
<el-form-item :label="' '"></el-form-item> <el-form-item :label="' '"></el-form-item>
</el-form> </el-form>
@ -246,6 +247,17 @@
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop=""
header-align="center"
align="right"
min-width="80"
label="实测值">
<template slot-scope="scope">
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
<el-input :ref="`textValue${scope.$index}`" v-if="scope.row.valueTypeDb === 'N'" v-model="scope.row.numberValue" @keyup.enter.native="focusNextInput(scope.$index, 'textValue')" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
</template>
</el-table-column>
<el-table-column <el-table-column
prop="" prop=""
header-align="center" header-align="center"
@ -397,6 +409,8 @@
<!-- 上传文件的modal --> <!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile> <comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData()" v-drag></comQcItemImageUploadFile>
<!-- 子明细导入 -->
<subDetailUpload ref="subDetailUpload" @refreshPageTables="getDataList()" v-drag></subDetailUpload>
</div> </div>
</template> </template>
@ -424,12 +438,14 @@
import {deleteObjectFile} from '@/api/eam/eam.js' import {deleteObjectFile} from '@/api/eam/eam.js'
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import qcFAIUploadFile from "./qc_FAI_upload_file" import qcFAIUploadFile from "./qc_FAI_upload_file"
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file";
import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
import subDetailUpload from "./sub_detail_upload"
export default { export default {
components: { components: {
Chooselist, Chooselist,
qcFAIUploadFile, qcFAIUploadFile,
comQcItemImageUploadFile
comQcItemImageUploadFile,
subDetailUpload
}, },
data () { data () {
return { return {
@ -1115,6 +1131,7 @@
inspectorNo: '', inspectorNo: '',
inspectionRemark: '', inspectionRemark: '',
itemList:[], itemList:[],
unqualifiedQty: ''
}, },
// //
tableData: [], tableData: [],
@ -1157,6 +1174,21 @@
this.getTableUserColumn(this.$route.meta.menuId+'table2',2) this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
}, },
methods: { methods: {
//
subDetailUpload () {
let currentData = {
flag: 'IQC',
site: this.$store.state.user.site,
inspectionNo: this.detailData.inspectionNo
}
//
this.$nextTick(() => {
this.$refs.subDetailUpload.init(currentData)
})
},
// //
disposalMeasuresSearch(){ disposalMeasuresSearch(){
let tempData = { let tempData = {
@ -1394,6 +1426,7 @@
this.saveInformationData.inspectorNo = this.$store.state.user.name this.saveInformationData.inspectorNo = this.$store.state.user.name
this.saveInformationData.inspectionResult = this.detailData.inspectionResult this.saveInformationData.inspectionResult = this.detailData.inspectionResult
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark
this.saveInformationData.unqualifiedQty = this.detailData.unqualifiedQty
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

142
src/views/modules/qc/sub_detail_upload.vue

@ -0,0 +1,142 @@
<template>
<div class="customer-css">
<el-dialog :title="titleCon" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 520px;" class="customer-dialog">
<el-form :inline="true" label-position="top" label-width="80px">
<el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
<el-row>
<el-col :span="24">
<el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile" :limit="1" accept=".xlsx,.xls"
:before-upload="beforeUploadHandle" :on-change="onChange" :auto-upload="false" style="text-align: left;">
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
</el-upload>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveUploadFile()">保存</el-button>
<el-button type="primary" @click="closeDialog">关闭</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {
subDetailUpload, //
queryFileId, // ID
} from "@/api/qc/qc.js"
import { downLoadObjectFile } from '@/api/eam/eam_object_list.js'
import axios from 'axios'
import Vue from 'vue'
export default {
data() {
return {
titleCon: '文件导入',
visible: false,
fileList: [],
pageData: {
flag: '',
site: '',
inspectionNo: ''
},
}
},
methods: {
//
init(currentRow) {
//
this.pageData = JSON.parse(JSON.stringify(currentRow))
//
this.visible = true
},
//
beforeUploadHandle(file) {
let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase()
if (!(extName === '.xlsx' || extName === '.xls')) {
this.$message.error('数据导入失败,请选择正确的xlsx模板文件')
return false
}
},
/*选择上传文件时*/
onChange(file){
this.fileList.push(file)
},
/*关闭modal*/
closeDialog(){
this.fileList = []
//
this.$emit('refreshPageTables')
//
this.visible = false
},
/*保修当前的数据*/
saveUploadFile(){
/*判断文件是否上传*/
if(null == this.fileList || 0 === this.fileList.length){
this.$message.error("请先上传文件!")
return false
}
const formData = new FormData()
formData.append("file", this.fileList[0].raw)
formData.append("flag", this.pageData.flag)
formData.append("site", this.pageData.site)
formData.append("inspectionNo", this.pageData.inspectionNo)
subDetailUpload(formData).then(({data}) => {
if (data.code === 0) {
this.$message.success(data.msg)
//
this.$refs.uploadFile.clearFiles()
//
this.closeDialog()
}else {
this.$message.warning(data.msg)
}
})
},
//
async downloadFile() {
let file = {
id: 0,
fileName: ''
}
let tempData = {
orderRef1: 'qc',
orderRef2: 'subDetailUpload'
}
await queryFileId(tempData).then(({data}) => {
if (data && data.code === 0) {
file.id = data.data.id
file.fileName = data.data.fileName
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
await downLoadObjectFile(file).then(({data}) => {
//
const blob = new Blob([data], {type: "application/octet-stream"})
//
const fileName = file.fileName
// a
const linkNode = document.createElement('a')
// adownload
linkNode.download = fileName
linkNode.style.display = 'none'
// Blob URL
linkNode.href = URL.createObjectURL(blob)
document.body.appendChild(linkNode)
//
linkNode.click()
// URL
URL.revokeObjectURL(linkNode.href)
document.body.removeChild(linkNode)
})
},
}
}
</script>
<style scoped lang="scss">
</style>
Loading…
Cancel
Save