wilson
/
xz-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-20 功能优化

master
fengyuan_yang 2 years ago
parent
c4e07bba95
commit
8c44a517d3
10 changed files with 188 additions and 256 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      src/views/modules/qc/FQASResultEntry.vue
  2. 258
      src/views/modules/qc/IPQCResultEntry.vue
  3. 111
      src/views/modules/qc/IQCResultEntry.vue
  4. 3
      src/views/modules/qc/qcItem.vue
  5. 2
      src/views/modules/qc/qcMethod.vue
  6. 2
      src/views/modules/qc/qcSamplingInspectionLevel.vue
  7. 3
      src/views/modules/qc/qcSamplingInspectionPlan.vue
  8. 2
      src/views/modules/qc/qcSamplingInspectionQtyRank.vue
  9. 6
      src/views/modules/qc/qcTemplate.vue
  10. 3
      src/views/modules/qc/qc_FAI_upload_file.vue

54
src/views/modules/qc/FQASResultEntry.vue
View File

@ -27,10 +27,8 @@
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
<el-input v-model="searchData.partDesc" clearable style="width: 295px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'质检员'">
<el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
</el-form-item>
@ -42,6 +40,8 @@
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
@ -59,8 +59,6 @@
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'送检日期'">
<el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
-
@ -187,11 +185,8 @@
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<!-- <el-form-item :label="' '" style="margin-left: 38px">-->
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>-->
<!-- </el-form-item>-->
<el-form-item :label="' '" style="margin-left: 50px">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
@ -368,6 +363,11 @@
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-form :inline="true" label-position="top">
<el-form-item v-if="detailInformationFlag">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
</el-form-item>
</el-form>
<el-table
:height="350"
:data="fileContentList"
@ -526,7 +526,7 @@
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
<!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@ -698,6 +698,24 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301016,
serialNumber: '301016Table1OrderRefType',
tableId: "301016Table1",
tableName: "FQAS检验记录表",
columnProp: 'orderRefType',
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: 301016,
@ -796,7 +814,7 @@
tableName: "FQAS检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
@ -886,7 +904,7 @@
tableName: "FQAS检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '质检备注',
columnHidden: false,
columnImage: false,
@ -1830,7 +1848,8 @@
deleteFile (row) {
let tempData = {
site: row.orderRef1,
inspectionNo: row.orderRef2
inspectionNo: row.orderRef2,
buNo: row.orderRef4
}
this.$confirm('确定要删除此文件?', '提示', {
confirmButtonText: '确定',
@ -2173,15 +2192,6 @@
this.$message.warning('检验单号 ' + tempData2 + ' 的处置措施未选择！')
return
}
// this.submitData.site = row.site
// this.submitData.inspectionNo = row.inspectionNo
// this.submitData.inspectionResult = row.inspectionResult
// if (row.inspectionResult == '不合格' && (row.disposalMeasures == '' || row.disposalMeasures == null)){
// this.$alert('处置措施未选择！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
this.$confirm(`已确认单据信息无误，确定审核该 ` + this.FQASSelections.length + ` 条记录`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

258
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -26,17 +26,8 @@
<el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</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-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
<el-input v-model="searchData.partDesc" clearable style="width: 285px"></el-input>
</el-form-item>
<el-form-item :label="'检验类型'">
<el-select v-model="searchData.inspectionTypeNo" clearable style="width: 100px">
@ -46,6 +37,14 @@
<el-option label="IPQC末件检" value="104"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'检验结论'">
<el-select v-model="searchData.inspectionResult" clearable style="width: 80px">
<el-option label="合格" value="合格"></el-option>
<el-option label="不合格" value="不合格"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'处置措施'">
<el-select v-model="searchData.disposalMeasures" clearable style="width: 90px">
<el-option
@ -56,16 +55,11 @@
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<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-input v-model="searchData.orderNo" clearable style="width: 137px"></el-input>
</el-form-item>
<el-form-item :label="'派工单号'">
<el-input v-model="searchData.seqNo" clearable style="width: 167px"></el-input>
<el-input v-model="searchData.seqNo" clearable style="width: 173px"></el-input>
</el-form-item>
<el-form-item :label="'工序'">
<el-input v-model="searchData.operationDesc" clearable style="width: 108px"></el-input>
@ -245,16 +239,13 @@
<el-form-item v-else label="物料编码" prop="partNo" :rules="rules.partNoType">
<el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料类别">
<el-input v-model="modalData.spec" readonly style="width: 221px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="物料名称">
<el-input v-model="modalData.partDesc" readonly style="width: 456px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
@ -293,11 +284,6 @@
<input type="checkbox" id="specialTask" name="specialTask" v-model="checked" @click="changeSpecialTask"/> <label for="specialTask">无工单检验</label>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="老卷号">
<el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="特殊要求">
<el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
@ -318,12 +304,6 @@
<el-form-item :label="'物料类别'">
<el-input v-model="detailData.spec" readonly style="width: 200px"></el-input>
</el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="detailData.cinvSourceCode" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="detailData.sku" readonly style="width: 100px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input>
</el-form-item>
@ -336,15 +316,19 @@
<el-form-item :label="'单位'">
<el-input v-model="detailData.umName" readonly style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList">
<el-form-item :label="'不合格项目数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'合格数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'不合格数量'">
<el-input class="numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 80px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" @keyup.enter.native = "getDataList">
<el-form-item :label="'检验结论'">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionResult" disabled style="width: 100px" placeholder="请选择">
<el-option label="合格" value="合格"></el-option>
@ -356,8 +340,8 @@
</el-select>
</el-form-item>
<el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 303px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 303px"></el-input>
</el-form-item>
<el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
@ -388,7 +372,8 @@
<el-input v-model="detailData.responsiblePersonName" readonly style="width: 173px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" @click="getFileContentData(detailData)">工作文件</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>
@ -567,13 +552,12 @@
<el-form-item label="派工单号">
<el-input v-model="seqDetailData.seqNo" clearable style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="SKU">
<el-input v-model="seqDetailData.sku" clearable style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="状态">
<el-select v-model="seqDetailData.status" style="width: 100px" placeholder="请选择">
<el-option label="下达" value="下达"></el-option>
<el-option label="关闭" value="关闭"></el-option>
<el-option label="已计划" value="已计划"></el-option>
<el-option label="已下达" value="已下达"></el-option>
<el-option label="已取消" value="已取消"></el-option>
<el-option label="已关闭" value="已关闭"></el-option>
</el-select>
</el-form-item>
</el-form>
@ -695,12 +679,6 @@
<el-form-item :label="'物料名称'">
<el-input v-model="partData.partDesc" clearable style="width: 115px"></el-input>
</el-form-item>
<el-form-item :label="'SKU'">
<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 :label="' '">
<el-button type="primary" @click="queryPartList">查询</el-button>
</el-form-item>
@ -735,6 +713,11 @@
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-form :inline="true" label-position="top">
<el-form-item v-if="detailInformationFlag">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
</el-form-item>
</el-form>
<el-table
:height="350"
:data="fileContentList"
@ -833,7 +816,7 @@
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
<!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@ -893,6 +876,12 @@
subDetailUpload
},
watch: {
detailData: {
deep: true,
handler: function (newV, oldV) {
this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
}
},
detailList: {
deep: true,
handler: function (newV, oldV) {
@ -948,8 +937,6 @@
inspectionTypeNo: '',
partNo: '',
partDesc: '',
cinvSourceCode: '',
sku: '',
disposalMeasures: '',
page: 1,
limit: 10,
@ -981,10 +968,7 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
sku: '',
cinvSourceCode: '',
qtyrequired: '',
lotsize:'',
specialRequirements: '',
@ -1035,24 +1019,6 @@
fixed: '',
columnWidth: 120,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1BatchRollNo',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
columnProp: 'batchRollNo',
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: 301014,
@ -1269,42 +1235,6 @@
fixed: '',
columnWidth: 150,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table1cinvSourceCode',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
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: 301014,
serialNumber: '301014Table1Sku',
tableId: "301014Table1",
tableName: "IPQC检验记录表",
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: 301014,
@ -1313,7 +1243,7 @@
tableName: "IPQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
@ -1385,7 +1315,7 @@
tableName: "IPQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '质检备注',
columnHidden: false,
columnImage: false,
@ -1504,15 +1434,15 @@
inspectorName: '',
inspectionRemark: '',
submitFlag: '',
cinvSourceCode: '',
sku: '',
spec: '',
umId: '',
umName: '',
operator: '',
operatorName: '',
responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
passQty: '',
notPassQty: ''
},
detailInformationFlag: false,
detailList: [],
@ -1534,7 +1464,9 @@
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: []
subDetailList: [],
passQty: '',
notPassQty: ''
},
detailColumnList: [
{
@ -1846,14 +1778,12 @@
seqDetailData: {
orderNo: '',
seqNo: '',
sku: '',
cinvSourceCode:'',
partNo: '',
partDesc: '',
operationDesc: '',
qtyrequired: '',
lotsize: '',
status: '下达'
status: '已下达'
},
seqDetailColumnList: [
{
@ -1892,24 +1822,6 @@
sortLv: 0,
status: true,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
serialNumber: '301014Table3Sku',
tableId: "301014Table3",
tableName: "派工单号表",
fixed: '',
columnWidth: 80,
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
},
{
userId: this.$store.state.user.name,
functionId: 301014,
@ -2116,8 +2028,6 @@
bu: '',
partNo: '',
partDesc: '',
sku: '',
cinvSourceCode: '',
},
templateList: [],
templateModelFlag: false,
@ -2184,30 +2094,6 @@
status: true,
fixed: '',
},
{
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
}
],
checked: false,
typeOptions: [],
@ -2525,8 +2411,6 @@
this.modalData.partNo = ''
this.modalData.partDesc = ''
this.modalData.spec = ''
this.modalData.sku = ''
this.modalData.cinvSourceCode = ''
this.modalData.templateId = ''
this.modalData.templateName = ''
}
@ -2553,6 +2437,8 @@
}
if (type === 1) {
this.detailData.unqualifiedQty = val
} else if (type === 2) {
this.detailData.passQty = val
}
},
@ -2602,8 +2488,6 @@
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2776,7 +2660,8 @@
deleteFile (row) {
let tempData = {
site: row.orderRef1,
inspectionNo: row.orderRef2
inspectionNo: row.orderRef2,
buNo: row.orderRef4
}
this.$confirm('确定要删除此文件?', '提示', {
confirmButtonText: '确定',
@ -2858,7 +2743,6 @@
// getPartInformation(this.modalData).then(({data}) => {
// if (data && data.code === 0) {
// this.modalData.spec = data.rows[0].spec
// this.modalData.sku = data.rows[0].sku
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
@ -2879,8 +2763,6 @@
this.modalData.partNo = data.rows[0].partNo
this.modalData.partDesc = data.rows[0].partDesc
this.modalData.spec = data.rows[0].spec
this.modalData.sku = data.rows[0].sku
this.modalData.cinvSourceCode = data.rows[0].cinvSourceCode
this.modalData.operationDesc = data.rows[0].operationDesc
this.modalData.qtyrequired = data.rows[0].qtyrequired
this.modalData.lotsize = data.rows[0].lotsize
@ -2921,8 +2803,6 @@
this.modalData.partNo = this.partList[0].partNo
this.modalData.partDesc = this.partList[0].partDesc
this.modalData.spec = this.partList[0].spec
this.modalData.sku = this.partList[0].sku
this.modalData.cinvSourceCode = this.partList[0].cinvSourceCode
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -2968,10 +2848,7 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
templateId: '',
templateName: '',
@ -3010,7 +2887,7 @@
queryPartList () {
this.partData.bu = this.modalData.bu
// 查询所有物料
if (this.partData.partNo === '' && this.partData.partDesc === '' && this.partData.sku === '' && this.partData.cinvSourceCode === '') {
if (this.partData.partNo === '' && this.partData.partDesc === '') {
this.partList = []
this.partModelFlag = true
} else {
@ -3036,7 +2913,6 @@
// 选中派工单号
getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc
this.modalData.orderNo = row.orderNo
@ -3055,16 +2931,12 @@
getRowData2 (row) {
this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc
this.modalData.sku = row.sku
this.modalData.spec = row.spec
this.modalData.cinvSourceCode = row.cinvSourceCode
this.partData = {
site: '',
bu: '',
partNo: '',
partDesc: '',
sku: '',
cinvSourceCode: '',
}
this.partModelFlag = false
},
@ -3091,10 +2963,7 @@
resourceDesc: '',
rollQty: '',
seqNo: '',
batchRollNo: '',
spec: '',
sku: '',
cinvSourceCode: '',
specialRequirements: '',
templateId: '',
templateName: '',
@ -3312,6 +3181,8 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
// this.saveInformationData.subDetailList = this.acquisitionList
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
@ -3382,9 +3253,6 @@
this.detailData.inspectorNo = row.inspectorNo
this.detailData.inspectorName = row.inspectorName
this.detailData.inspectionRemark = row.inspectionRemark
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.spec = row.spec
this.detailData.umId = row.umId
this.detailData.umName = row.umName
@ -3392,6 +3260,8 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.passQty = row.passQty
this.detailData.notPassQty = row.notPassQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
@ -3802,13 +3672,12 @@
site: this.modalData.bu.at(0),
seqNo: this.seqDetailData.seqNo,
orderNo: this.seqDetailData.orderNo,
sku: this.seqDetailData.sku,
partDesc: this.seqDetailData.partDesc,
partNo: this.seqDetailData.partNo,
operationDesc: this.seqDetailData.operationDesc,
status: this.seqDetailData.status
}
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
this.seqInfoList = []
} else {
searchSeqInfo(tempData).then(({data}) => {
@ -3826,11 +3695,10 @@
this.seqDetailData = {
seqNo : '',
orderNo: '',
sku: '',
partNo: '',
partDesc: '',
operationDesc: '',
status: '下达'
status: '已下达'
}
this.seqInfoList = []
},

111
src/views/modules/qc/IQCResultEntry.vue
View File

@ -33,7 +33,7 @@
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 210px"></el-input>
<el-input v-model="searchData.partDesc" clearable style="width: 315px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
@ -81,14 +81,14 @@
</el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'送检日期'">
<el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
<el-date-picker style="width: 157px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
-
<el-date-picker style="width: 150px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
<el-date-picker style="width: 157px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item :label="'检验时间'">
<el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
<el-date-picker style="width: 156px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
-
<el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
<el-date-picker style="width: 156px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
</el-form-item>
<el-form-item :label="' '">
<el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@ -217,7 +217,7 @@
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>-->
<!-- </el-form-item>-->
<el-form-item :label="' '" style="margin-left: 25px">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-button type="primary" @click="getFileContentData(detailData)">工作文件</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top">
@ -394,6 +394,11 @@
<!-- 文件清单 -->
<el-dialog title="文件清单" :close-on-click-modal="false" v-drag :visible.sync="fileFlag" width="800px">
<el-form :inline="true" label-position="top">
<el-form-item v-if="detailInformationFlag">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
</el-form-item>
</el-form>
<el-table
:height="350"
:data="fileContentList"
@ -552,7 +557,7 @@
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 上传文件的modal -->
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="getDataList" v-drag></qcFAIUploadFile>
<qcFAIUploadFile ref="qcFAIUploadFile" @refreshPageTables="()=>{this.getFileContentData(this.detailData)}" v-drag></qcFAIUploadFile>
<!-- 上传文件的modal -->
<comQcItemImageUploadFile ref="comQcItemImageUploadFile" @refreshPageTables2="getInspectionFormData" v-drag></comQcItemImageUploadFile>
@ -832,7 +837,7 @@
tableName: "IQC检验记录表",
columnProp: 'partDesc',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '物料名称',
columnHidden: false,
columnImage: false,
@ -932,6 +937,78 @@
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RefInfo1',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'refInfo1',
headerAlign: "center",
align: "center",
columnLabel: '关联单号1',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RefInfo2',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'refInfo2',
headerAlign: "center",
align: "center",
columnLabel: '关联单号2',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RefInfo3',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'refInfo3',
headerAlign: "center",
align: "center",
columnLabel: '关联单号3',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1RefInfo4',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'refInfo4',
headerAlign: "center",
align: "center",
columnLabel: '关联单号4',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
@ -994,7 +1071,7 @@
tableName: "IQC检验记录表",
columnProp: 'inspectionRemark',
headerAlign: "center",
align: "center",
align: "left",
columnLabel: '质检备注',
columnHidden: false,
columnImage: false,
@ -1978,7 +2055,8 @@
deleteFile (row) {
let tempData = {
site: row.orderRef1,
inspectionNo: row.orderRef2
inspectionNo: row.orderRef2,
buNo: row.orderRef4
}
this.$confirm('确定要删除此文件?', '提示', {
confirmButtonText: '确定',
@ -2116,8 +2194,8 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.passQty = this.detailData.passQty
this.saveInformationData.notPassQty = this.detailData.notPassQty
this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
// this.saveInformationData.subDetailList = this.acquisitionList
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
@ -2335,15 +2413,6 @@
this.$message.warning('检验单号 ' + tempData2 + ' 的处置措施未选择！')
return
}
// this.submitData.site = row.site
// this.submitData.inspectionNo = row.inspectionNo
// this.submitData.inspectionResult = row.inspectionResult
// if (row.inspectionResult == '不合格' && (row.disposalMeasures == '' || row.disposalMeasures == null)){
// this.$alert('处置措施未选择！', '错误', {
// confirmButtonText: '确定'
// })
// return false
// }
this.$confirm(`已确认单据信息无误，确定审核该 ` + this.IQCSelections.length + ` 条记录`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

3
src/views/modules/qc/qcItem.vue
View File

@ -65,7 +65,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -236,7 +235,6 @@
:data="methodList"
@row-dblclick="getRowData"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in methodDetailList" :key="index"
@ -327,7 +325,6 @@
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
modalDisableFlag: false,
modalData: {

2
src/views/modules/qc/qcMethod.vue
View File

@ -62,7 +62,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -186,7 +185,6 @@
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
modalDisableFlag: false,
modalData: {

2
src/views/modules/qc/qcSamplingInspectionLevel.vue
View File

@ -59,7 +59,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -168,7 +167,6 @@
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
modalDisableFlag: false,
modalData: {

3
src/views/modules/qc/qcSamplingInspectionPlan.vue
View File

@ -59,7 +59,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -217,7 +216,6 @@
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
dataListSelections: [],
// 其它对象
modalFlag: false,
@ -627,7 +625,6 @@
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},

2
src/views/modules/qc/qcSamplingInspectionQtyRank.vue
View File

@ -58,7 +58,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -185,7 +184,6 @@
totalPage: 0,
height: 200,
dataList: [],
dataListLoading: false,
modalFlag: false,
modalDisableFlag: false,
modalData: {

6
src/views/modules/qc/qcTemplate.vue
View File

@ -66,7 +66,6 @@
:height="height"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList" :key="index"
@ -214,7 +213,6 @@
:height="400"
:data="detailList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnDetailList" :key="index"
@ -340,7 +338,6 @@
@row-click="itemClickRow1"
@selection-change="selectionItem1"
highlight-current-row
v-loading="dataListLoading"
style="width: 100%">
<el-table-column
type="selection"
@ -404,7 +401,6 @@
@row-click="itemClickRow2"
@selection-change="selectionItem2"
highlight-current-row
v-loading="dataListLoading"
style="width: 100%">
<el-table-column
type="selection"
@ -873,7 +869,6 @@
],
detailModelFlag: false,
detailList: [],
dataListLoading: false,
dataList: [],
// 展示列集
columnDetailList: [
@ -1124,7 +1119,6 @@
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},

3
src/views/modules/qc/qc_FAI_upload_file.vue
View File

@ -94,6 +94,7 @@ export default {
this.fileList = []
// 刷新报工的页面
this.$emit('refreshPageTables')
console.log(111)
//关闭当前的页面
this.visible = false
},
@ -123,6 +124,8 @@ export default {
this.$refs.uploadFile.clearFiles()
this.pageData.fileRemark = ''
this.fileList = []
// 刷新报工的页面
this.$emit('refreshPageTables')
} else {
this.$message.warning(data.msg)
}

Write Preview
Loading…
Cancel
Save