Browse Source

2024.1.15 老编码

java8
yuejiayang 2 years ago
parent
commit
1f786adae4
  1. 2
      src/api/qc/qc.js
  2. 152
      src/views/modules/qc/FAIResultEntry.vue
  3. 151
      src/views/modules/qc/FQCResultEntry.vue
  4. 152
      src/views/modules/qc/IPQCResultEntry.vue
  5. 776
      src/views/modules/qc/IQCResultEntry.vue
  6. 164
      src/views/modules/qc/qcPartAttribute.vue

2
src/api/qc/qc.js

@ -158,6 +158,8 @@ export const imageDelete = data => createAPI(`/pms/qc/imageDelete`,'post',data)
export const iqcRecordOverLoad = data => createAPI(`/pms/qc/iqcRecordOverLoad`,'post',data) export const iqcRecordOverLoad = data => createAPI(`/pms/qc/iqcRecordOverLoad`,'post',data)
export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data) export const uploadSopFile = data => createAPI(`/pms/qc/upload`,'post',data)
export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data) export const getSiteAndBuByUserName = data => createAPI(`/pms/qc/getSiteAndBuByUserName`,'post',data)
export const searchSeqInfo = data => createAPI(`/pms/qc/searchSeqInfo`,'post',data)
export const searchPartInfo = data => createAPI(`/pms/qc/searchPartInfo`,'post',data)

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

@ -16,15 +16,23 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<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-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input> <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序'"> <el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input> <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.state" style="width: 120px"> <el-select v-model="searchData.state" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -33,8 +41,6 @@
<el-option label="已完成" value="已完成"></el-option> <el-option label="已完成" value="已完成"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" style="width: 120px"> <el-select v-model="searchData.inspectionResult" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -481,6 +487,62 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="派工单号">
<el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="PN">
<el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="400"
:data="seqInfoList"
@row-dblclick="getRowData1"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="工单号">
</el-table-column>
<el-table-column
prop="seqNo"
header-align="center"
align="center"
label="派工单号">
</el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 子明细信息 --> <!-- 子明细信息 -->
<el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="572px"> <el-dialog title="子明细信息" :close-on-click-modal="false" v-drag :visible.sync="subDetailFlag" width="572px">
<el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button> <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAddBtn(subDetailData)">添加</el-button>
@ -599,13 +661,16 @@
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="partData"> <el-form :inline="true" label-position="top" :model="partData">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'"> <el-form-item :label="'SKU'">
<el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
<el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="queryPartList()">查询</el-button> <el-button type="primary" @click="queryPartList()">查询</el-button>
@ -715,7 +780,8 @@
rollNoEnter, // rollNoEnter, //
queryPartList, // queryPartList, //
umSearch, // umSearch, //
getSiteAndBuByUserName
getSiteAndBuByUserName,
searchSeqInfo, //
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -784,6 +850,8 @@
endDate: '', endDate: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
disposalMeasures: '', disposalMeasures: '',
page: 1, page: 1,
limit: 10, limit: 10,
@ -810,7 +878,9 @@
seqNo: '', seqNo: '',
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
orderNo: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -1598,6 +1668,15 @@
fixed: false fixed: false
}, },
], ],
//
seqInfoList: [],
seqDetailFlag: false,
seqDetailData: {
orderNo: '',
seqNo: '',
sku: '',
partNo: '',
},
// //
tableData: [], tableData: [],
checkedDetail: [], checkedDetail: [],
@ -1749,7 +1828,8 @@
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: '',
}, },
partDetailList: [ partDetailList: [
{ {
@ -1788,6 +1868,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
], ],
partModelFlag: false, partModelFlag: false,
umList: [], umList: [],
@ -1832,6 +1924,7 @@
this.modalData.partDesc = '' this.modalData.partDesc = ''
this.modalData.spec = '' this.modalData.spec = ''
this.modalData.sku = '' this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = '' this.modalData.templateId = ''
this.modalData.templateName = '' this.modalData.templateName = ''
} }
@ -1909,6 +2002,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1995,8 +2089,8 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal)
this.searchSeqInfo()
this.seqDetailFlag = true
} }
if (val === 505) { if (val === 505) {
strVal = this.modalData.resourceDesc strVal = this.modalData.resourceDesc
@ -2080,6 +2174,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2097,6 +2192,7 @@
this.modalData.partDesc = this.partList[0].partDesc this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec this.modalData.spec = this.partList[0].spec
this.modalData.sku = this.partList[0].sku this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2130,6 +2226,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2269,6 +2366,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2305,7 +2403,7 @@
queryPartList () { queryPartList () {
this.partData.bu = this.modalData.bu this.partData.bu = this.modalData.bu
// //
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
this.partList = [] this.partList = []
this.partModelFlag = true this.partModelFlag = true
} else { } else {
@ -2329,18 +2427,30 @@
this.templateModelFlag = false this.templateModelFlag = false
}, },
//
getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.getOperationList()
this.seqDetailFlag = false
},
// //
getRowData2 (row) { getRowData2 (row) {
this.modalData.partNo = row.partNo this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.spec = row.spec this.modalData.spec = row.spec
this.partData = { this.partData = {
site: '', site: '',
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: '',
} }
this.partModelFlag = false this.partModelFlag = false
}, },
@ -3001,8 +3111,26 @@
} }
} }
}, },
searchSeqInfo () {
let tempData = {
site: this.$store.state.user.site,
seqNo: this.seqDetailData.seqNo,
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
cinvSourceCode: this.seqDetailData.cinvSourceCode,
}
searchSeqInfo(tempData).then(({data}) => {
if (data && data.code === 0) {
this.seqInfoList = data.rows
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
}
},
} }
</script> </script>

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

@ -16,15 +16,23 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<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-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input> <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序'"> <el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input> <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.state" style="width: 120px"> <el-select v-model="searchData.state" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -33,8 +41,6 @@
<el-option label="已完成" value="已完成"></el-option> <el-option label="已完成" value="已完成"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'检验结论'"> <el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" style="width: 120px"> <el-select v-model="searchData.inspectionResult" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -599,13 +605,16 @@
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="partData"> <el-form :inline="true" label-position="top" :model="partData">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'"> <el-form-item :label="'SKU'">
<el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
<el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="queryPartList()">查询</el-button> <el-button type="primary" @click="queryPartList()">查询</el-button>
@ -677,6 +686,62 @@
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="派工单号">
<el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="PN">
<el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="400"
:data="seqInfoList"
@row-dblclick="getRowData1"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="工单号">
</el-table-column>
<el-table-column
prop="seqNo"
header-align="center"
align="center"
label="派工单号">
</el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- chooseList模态框 --> <!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
@ -716,7 +781,8 @@
rollNoEnter, // rollNoEnter, //
queryPartList, // queryPartList, //
umSearch, // umSearch, //
getSiteAndBuByUserName
getSiteAndBuByUserName,
searchSeqInfo, //
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -785,6 +851,8 @@
endDate: '', endDate: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
disposalMeasures: '', disposalMeasures: '',
page: 1, page: 1,
limit: 10, limit: 10,
@ -1599,6 +1667,15 @@
fixed: false fixed: false
}, },
], ],
//
seqInfoList: [],
seqDetailFlag: false,
seqDetailData: {
orderNo: '',
seqNo: '',
sku: '',
partNo: '',
},
// //
tableData: [], tableData: [],
checkedDetail: [], checkedDetail: [],
@ -1750,7 +1827,8 @@
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: ''
}, },
partDetailList: [ partDetailList: [
{ {
@ -1789,6 +1867,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
], ],
partModelFlag: false, partModelFlag: false,
umList: [], umList: [],
@ -1833,6 +1923,7 @@
this.modalData.partDesc = '' this.modalData.partDesc = ''
this.modalData.spec = '' this.modalData.spec = ''
this.modalData.sku = '' this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = '' this.modalData.templateId = ''
this.modalData.templateName = '' this.modalData.templateName = ''
} }
@ -1910,6 +2001,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -1996,8 +2088,8 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal)
this.searchSeqInfo()
this.seqDetailFlag = true
} }
if (val === 505) { if (val === 505) {
strVal = this.modalData.resourceDesc strVal = this.modalData.resourceDesc
@ -2081,6 +2173,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2098,6 +2191,7 @@
this.modalData.partDesc = this.partList[0].partDesc this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec this.modalData.spec = this.partList[0].spec
this.modalData.sku = this.partList[0].sku this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2131,6 +2225,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2270,6 +2365,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2306,7 +2402,7 @@
queryPartList () { queryPartList () {
this.partData.bu = this.modalData.bu this.partData.bu = this.modalData.bu
// //
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
this.partList = [] this.partList = []
this.partModelFlag = true this.partModelFlag = true
} else { } else {
@ -2330,18 +2426,30 @@
this.templateModelFlag = false this.templateModelFlag = false
}, },
//
getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.getOperationList()
this.seqDetailFlag = false
},
// //
getRowData2 (row) { getRowData2 (row) {
this.modalData.partNo = row.partNo this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.spec = row.spec this.modalData.spec = row.spec
this.partData = { this.partData = {
site: '', site: '',
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: ''
} }
this.partModelFlag = false this.partModelFlag = false
}, },
@ -3012,7 +3120,26 @@
} }
} }
}, },
}
searchSeqInfo () {
let tempData = {
site: this.$store.state.user.site,
seqNo: this.seqDetailData.seqNo,
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
cinvSourceCode: this.seqDetailData.cinvSourceCode,
}
searchSeqInfo(tempData).then(({data}) => {
if (data && data.code === 0) {
this.seqInfoList = data.rows
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
} }
</script> </script>

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

@ -16,15 +16,23 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 221px"></el-input>
</el-form-item> </el-form-item>
<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-form-item :label="'工单号'">
<el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input> <el-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序'"> <el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input> <el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'状态'"> <el-form-item :label="'状态'">
<el-select v-model="searchData.state" style="width: 100px"> <el-select v-model="searchData.state" style="width: 100px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -40,8 +48,6 @@
<el-option label="不合格" value="不合格"></el-option> <el-option label="不合格" value="不合格"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'检验类型'"> <el-form-item :label="'检验类型'">
<el-select v-model="searchData.inspectionTypeNo" style="width: 120px"> <el-select v-model="searchData.inspectionTypeNo" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -538,6 +544,62 @@
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<!-- 派工单号 -->
<el-dialog title="派工单号" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="685px" height="273px">
<el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="工单号">
<el-input v-model="seqDetailData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="派工单号">
<el-input v-model="seqDetailData.seqNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="seqDetailData.sku" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="PN">
<el-input v-model="seqDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchSeqInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="400"
:data="seqInfoList"
@row-dblclick="getRowData1"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
prop="orderNo"
header-align="center"
align="center"
label="工单号">
</el-table-column>
<el-table-column
prop="seqNo"
header-align="center"
align="center"
label="派工单号">
</el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="seqDetailFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 批量新增子明细操作--> <!-- 批量新增子明细操作-->
<el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="510px"> <el-dialog title="批量新增" :close-on-click-modal="false" v-drag :visible.sync="batchHandleAddModalFlag" width="510px">
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
@ -615,13 +677,16 @@
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="partData"> <el-form :inline="true" label-position="top" :model="partData">
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="partData.partNo" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partNo" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
<el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'"> <el-form-item :label="'SKU'">
<el-input v-model="partData.sku" clearable style="width: 120px"></el-input>
<el-input v-model="partData.sku" clearable style="width: 79px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="partData.cinvSourceCode" clearable style="width: 79px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="queryPartList()">查询</el-button> <el-button type="primary" @click="queryPartList()">查询</el-button>
@ -730,7 +795,8 @@
rollNoEnter, // rollNoEnter, //
queryPartList, // queryPartList, //
umSearch, // umSearch, //
getSiteAndBuByUserName
getSiteAndBuByUserName,
searchSeqInfo, //
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -800,6 +866,8 @@
inspectionTypeNo: '', inspectionTypeNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
disposalMeasures: '', disposalMeasures: '',
page: 1, page: 1,
limit: 10, limit: 10,
@ -833,6 +901,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -1638,6 +1707,15 @@
fixed: false fixed: false
}, },
], ],
//
seqInfoList: [],
seqDetailFlag: false,
seqDetailData: {
orderNo: '',
seqNo: '',
sku: '',
partNo: '',
},
// //
tableData: [], tableData: [],
checkedDetail: [], checkedDetail: [],
@ -1753,7 +1831,8 @@
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: '',
}, },
templateList: [], templateList: [],
templateModelFlag: false, templateModelFlag: false,
@ -1832,6 +1911,18 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
}
], ],
checked: false, checked: false,
typeOptions: [], typeOptions: [],
@ -1880,6 +1971,7 @@
this.modalData.partDesc = '' this.modalData.partDesc = ''
this.modalData.spec = '' this.modalData.spec = ''
this.modalData.sku = '' this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = '' this.modalData.templateId = ''
this.modalData.templateName = '' this.modalData.templateName = ''
} }
@ -1957,6 +2049,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2170,8 +2263,8 @@
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 1052) { if (val === 1052) {
strVal = this.modalData.seqNo
this.$refs.baseList.init(val, strVal)
this.searchSeqInfo()
this.seqDetailFlag = true
} }
if (val === 505) { if (val === 505) {
strVal = this.modalData.resourceDesc strVal = this.modalData.resourceDesc
@ -2233,6 +2326,7 @@
this.modalData.partDesc = data.rows[0].partDesc this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2271,6 +2365,7 @@
this.modalData.partDesc = this.partList[0].partDesc this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec this.modalData.spec = this.partList[0].spec
this.modalData.sku = this.partList[0].sku this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2319,6 +2414,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2356,7 +2452,7 @@
queryPartList () { queryPartList () {
this.partData.bu = this.modalData.bu this.partData.bu = this.modalData.bu
// //
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '') {
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
this.partList = [] this.partList = []
this.partModelFlag = true this.partModelFlag = true
} else { } else {
@ -2380,18 +2476,31 @@
this.templateModelFlag = false this.templateModelFlag = false
}, },
//
getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.orderNo = row.orderNo
this.modalData.seqNo = row.seqNo
this.getOperationList()
this.seqDetailFlag = false
},
// //
getRowData2 (row) { getRowData2 (row) {
this.modalData.partNo = row.partNo this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku this.modalData.sku = row.sku
this.modalData.spec = row.spec this.modalData.spec = row.spec
this.modalData.cinvSourceCode = row.cinvSourceCode
this.partData = { this.partData = {
site: '', site: '',
bu: '', bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: ''
sku: '',
cinvSourceCode: '',
} }
this.partModelFlag = false this.partModelFlag = false
}, },
@ -2421,6 +2530,7 @@
batchRollNo: '', batchRollNo: '',
spec: '', spec: '',
sku: '', sku: '',
cinvSourceCode: '',
specialRequirements: '', specialRequirements: '',
templateId: '', templateId: '',
templateName: '', templateName: '',
@ -2658,6 +2768,7 @@
this.detailData.inspectionRemark = row.inspectionRemark this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku this.detailData.sku = row.sku
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.spec = row.spec this.detailData.spec = row.spec
this.detailData.umId = row.umId this.detailData.umId = row.umId
this.detailData.umName = row.umName this.detailData.umName = row.umName
@ -3064,7 +3175,24 @@
} }
} }
}, },
searchSeqInfo () {
let tempData = {
site: this.$store.state.user.site,
seqNo: this.seqDetailData.seqNo,
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
cinvSourceCode: this.seqDetailData.cinvSourceCode,
}
searchSeqInfo(tempData).then(({data}) => {
if (data && data.code === 0) {
this.seqInfoList = data.rows
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
} }
} }
</script> </script>

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

@ -16,9 +16,15 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 233px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 233px"></el-input>
</el-form-item> </el-form-item>
<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-form-item :label="'供应商'">
<el-input v-model="searchData.supplierDesc" clearable style="width: 221px"></el-input> <el-input v-model="searchData.supplierDesc" clearable style="width: 221px"></el-input>
</el-form-item> </el-form-item>
@ -520,6 +526,8 @@
endDate: '', endDate: '',
partNo:'', partNo:'',
partDesc:'', partDesc:'',
cinvSourceCode:'',
sku:'',
state: '待检验', state: '待检验',
inspectionResult: '', inspectionResult: '',
supplierDesc: '', supplierDesc: '',
@ -545,6 +553,7 @@
workOrderQuantity: '', workOrderQuantity: '',
reelNumber: '', reelNumber: '',
partNo: '', partNo: '',
cinvSourceCode:'',
rollingQuantity: '', rollingQuantity: '',
sampleQuantity: '', sampleQuantity: '',
detailCodeNo:'', detailCodeNo:'',
@ -557,369 +566,405 @@
isQualifiedChinese:'' isQualifiedChinese:''
}, },
// //
columnList1: [],
// columnList1: [
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1BuDesc',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'buDesc',
// headerAlign: "center",
// align: "center",
// columnLabel: 'BU',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 100,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1InspectionNo',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectionNo',
// 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,
// serialNumber: '301006Table1InspectionResult',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectionResult',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1TaskDate',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'taskDate',
// 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,
// serialNumber: '301006Table1InspectionCycle',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectionCycle',
// headerAlign: "center",
// align: "center",
// columnLabel: '(h)',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1RollNo',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'rollNo',
// 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,
// serialNumber: '301006Table1PartNo',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'partNo',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 100,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1PartDesc',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'partDesc',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1Umid',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'umId',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1RollQty',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'rollQty',
// headerAlign: "center",
// align: "right",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1RollCount',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'rollCount',
// headerAlign: "center",
// align: "right",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1SamplingQty',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'samplingQty',
// headerAlign: "center",
// align: "right",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1PoOrderNo',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'poOrderNo',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 130,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1PoItemNo',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'poItemNo',
// headerAlign: "center",
// align: "right",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 80,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1SupplierDesc',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'supplierDesc',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1InspectionRemark',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectionRemark',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1DisposalMeasures',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'disposalMeasures',
// 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,
// serialNumber: '301006Table1DisposalRemark',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'disposalRemark',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 150,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1InspectorDate',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectorDate',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 130,
// },
// {
// userId: this.$store.state.user.name,
// functionId: 301006,
// serialNumber: '301006Table1InspectorName',
// tableId: "301006Table1",
// tableName: "IQC",
// columnProp: 'inspectorName',
// headerAlign: "center",
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120,
// },
// ],
// columnList1: [],
columnList1: [
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1BuDesc',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'buDesc',
headerAlign: "center",
align: "center",
columnLabel: 'BU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1InspectionNo',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectionNo',
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,
serialNumber: '301006Table1InspectionResult',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectionResult',
headerAlign: "center",
align: "center",
columnLabel: '检验结论',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1TaskDate',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'taskDate',
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,
serialNumber: '301006Table1InspectionCycle',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectionCycle',
headerAlign: "center",
align: "center",
columnLabel: '检验周期(h)',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RollNo',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'rollNo',
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,
serialNumber: '301006Table1PartNo',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'partNo',
headerAlign: "center",
align: "center",
columnLabel: '物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1PartDesc',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1SKU',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1CinvSourceCode',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1Umid',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'umId',
headerAlign: "center",
align: "center",
columnLabel: '计量单位',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RollQty',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'rollQty',
headerAlign: "center",
align: "right",
columnLabel: '到货数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RollCount',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'rollCount',
headerAlign: "center",
align: "right",
columnLabel: '送检数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1SamplingQty',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'samplingQty',
headerAlign: "center",
align: "right",
columnLabel: '抽样数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1PoOrderNo',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'poOrderNo',
headerAlign: "center",
align: "center",
columnLabel: '单据号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1PoItemNo',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'poItemNo',
headerAlign: "center",
align: "right",
columnLabel: '单据行号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1SupplierDesc',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'supplierDesc',
headerAlign: "center",
align: "center",
columnLabel: '供应商',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1InspectionRemark',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
columnLabel: '质检备注',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1DisposalMeasures',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'disposalMeasures',
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,
serialNumber: '301006Table1DisposalRemark',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'disposalRemark',
headerAlign: "center",
align: "center",
columnLabel: '处置说明',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1InspectorDate',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectorDate',
headerAlign: "center",
align: "center",
columnLabel: '检验时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1InspectorName',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'inspectorName',
headerAlign: "center",
align: "center",
columnLabel: '质检员',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120,
},
],
detailColumnList: [ detailColumnList: [
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -1212,6 +1257,8 @@
inspectionNo: '', inspectionNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode:'',
sku:'',
rollQty: '', rollQty: '',
samplingQty: '', samplingQty: '',
unqualifiedQty: 0, unqualifiedQty: 0,
@ -1231,6 +1278,7 @@
saveInformationData: { saveInformationData: {
site: '', site: '',
buNo: '', buNo: '',
cinvSourceCode:'',
inspectionNo:'', inspectionNo:'',
disposalMeasures: '', disposalMeasures: '',
disposalRemark: '', disposalRemark: '',
@ -1576,6 +1624,8 @@
this.detailData.inspectionNo = row.inspectionNo this.detailData.inspectionNo = row.inspectionNo
this.detailData.partNo = row.partNo this.detailData.partNo = row.partNo
this.detailData.partDesc = row.partDesc this.detailData.partDesc = row.partDesc
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.rollQty = row.rollQty this.detailData.rollQty = row.rollQty
this.detailData.samplingQty = row.samplingQty this.detailData.samplingQty = row.samplingQty
this.detailData.unqualifiedQty = row.unqualifiedQty this.detailData.unqualifiedQty = row.unqualifiedQty

164
src/views/modules/qc/qcPartAttribute.vue

@ -13,9 +13,15 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<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-form-item :label="'类别名称'">
<el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -112,7 +118,7 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="partNo" :rules="rules.partNoType"> <el-form-item prop="partNo" :rules="rules.partNoType">
<span v-if="modalDisableFlag === false" slot="label" @click="getBaseList(507)"><a herf="#">物料编码:</a></span>
<span v-if="modalDisableFlag === false" slot="label" @click="searchPartInfo()"><a herf="#">物料编码:</a></span>
<span v-if="modalDisableFlag === true" slot="label">物料编码:</span> <span v-if="modalDisableFlag === true" slot="label">物料编码:</span>
<el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 120px"></el-input> <el-input v-model="modalData.partNo" :disabled="modalDisableFlag" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -588,6 +594,62 @@
</el-table> </el-table>
</el-dialog> </el-dialog>
<!-- 物料编码 -->
<el-dialog title="物料选择" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="partDisableFlag" width="685px" height="273px">
<el-form :inline="true" label-position="top" :model="partDetailData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料编码">
<el-input v-model="partDetailData.partNo" clearable style="width: 137px"></el-input>
</el-form-item>
<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-input v-model="partDetailData.sku" 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>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchPartInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item>
</el-form>
<el-table
:height="400"
:data="partInfoList"
@row-dblclick="getRowData1"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
prop="partNo"
header-align="center"
align="center"
label="物料编码">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="center"
label="物料名称">
</el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="partDisableFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传sop文件的modal --> <!-- 上传sop文件的modal -->
@ -613,7 +675,8 @@
getOperationDescList, // getOperationDescList, //
getManufacturerList, // getManufacturerList, //
getAllResourceList, // getAllResourceList, //
getSiteAndBuByUserName
getSiteAndBuByUserName,
searchPartInfo, //
} from "@/api/qc/qc.js" } from "@/api/qc/qc.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -645,6 +708,8 @@
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
attributeType: 'A', attributeType: 'A',
@ -657,6 +722,7 @@
totalPage: 0, totalPage: 0,
modalFlag: false, modalFlag: false,
modalDisableFlag: false, modalDisableFlag: false,
partDisableFlag: false,
modalData: { modalData: {
site: '', site: '',
bu: '', bu: '',
@ -665,6 +731,8 @@
partDesc: '', partDesc: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
cinvSourceCode: '',
sku: '',
umid: '', umid: '',
supplierNo: '', supplierNo: '',
supplierDesc: '', supplierDesc: '',
@ -680,6 +748,8 @@
partNo: '', partNo: '',
attributeNo: '', attributeNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
attributeType: 'A', attributeType: 'A',
inspectionTypeNo: '', inspectionTypeNo: '',
templateId: '', templateId: '',
@ -723,6 +793,24 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003Table1SKU',
tableId: "301003Table1",
tableName: "物料属性设置表",
columnWidth: 146,
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301003, functionId: 301003,
@ -741,6 +829,24 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003Table1CinvSourceCode',
tableId: "301003Table1",
tableName: "物料属性设置表",
columnWidth: 144,
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "left",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301003, functionId: 301003,
@ -889,6 +995,7 @@
detailModelFlag: false, detailModelFlag: false,
detailList: [], detailList: [],
dataList: [], dataList: [],
dataListLoading: false,
// //
columnDetailList: [ columnDetailList: [
{ {
@ -1176,7 +1283,14 @@
fixed: false fixed: false
}, },
], ],
userBuList: []
userBuList: [],
partInfoList: [],
partDetailData: {
partNo: '',
partDesc: '',
seqNo: '',
sku: '',
},
} }
}, },
@ -1213,6 +1327,25 @@
}) })
}, },
searchPartInfo () {
if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
this.partInfoList = []
this.partDisableFlag = true
}
else {
searchPartInfo(this.partDetailData).then(({data}) => {
if (data.code === 0) {
this.partInfoList = data.rows
this.partDisableFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
}
},
// //
inspectionTypeSearch () { inspectionTypeSearch () {
let tempData = { let tempData = {
@ -1240,10 +1373,10 @@
this.tagNo = val this.tagNo = val
this.$nextTick(() => { this.$nextTick(() => {
let strVal = '' let strVal = ''
if (val === 507) {
strVal = this.modalData.partNo
this.$refs.baseList.init(val, strVal)
}
// if (val === 507) {
// strVal = this.modalData.partNo
// this.$refs.baseList.init(val, strVal)
// }
if (val === 208) { if (val === 208) {
strVal = this.tempLevelRow.samplingLevelNo strVal = this.tempLevelRow.samplingLevelNo
this.$refs.baseList.init(val, strVal) this.$refs.baseList.init(val, strVal)
@ -1293,6 +1426,14 @@
}) })
}, },
getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc
this.partDisableFlag = false
},
// //
sizeChangeHandle (val) { sizeChangeHandle (val) {
this.pageSize = val this.pageSize = val
@ -2035,6 +2176,15 @@
} }
}) })
}, },
closeDialog () {
this.partDetailData = {
partNo: '',
partDesc: '',
seqNo: '',
sku: '',
}
this.partInfoList = []
},
} }
} }
</script> </script>
Loading…
Cancel
Save