常熟吴彦祖 1 week ago
parent
commit
d0fe78a462
  1. 127
      src/views/modules/qc/IQCResultEntry.vue

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

@ -38,9 +38,9 @@
<!-- </el-form-item>-->
</el-form>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'供应商'">
<el-input v-model="searchData.supplierDesc" clearable style="width: 200px"></el-input>
</el-form-item>
<!-- <el-form-item :label="'供应商'">-->
<!-- <el-input v-model="searchData.supplierDesc" clearable style="width: 200px"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label="'质检员'">
<el-input v-model="searchData.inspectorName" clearable style="width: 120px"></el-input>
</el-form-item>
@ -52,44 +52,6 @@
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</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-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
v-for = "i in disposalMeasuresOptions"
:key = "i.id"
:label = "i.disposalMeasures"
:value = "i.disposalMeasures">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'采购类型'">
<el-select v-model="searchData.orderType" clearable style="width: 90px">
<el-option label="采购订单" value="采购订单"></el-option>
<el-option label="委外订单" value="委外订单"></el-option>
<!-- <el-option-->
<!-- v-for = "i in orderTypeList"-->
<!-- :key = "i.orderType"-->
<!-- :label = "i.orderType"-->
<!-- :value = "i.orderType">-->
<!-- </el-option>-->
</el-select>
</el-form-item>
<el-form-item :label="'送检类型'">
<el-select v-model="searchData.submissionType" clearable style="width: 90px">
<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>
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item :label="'送检日期'">
<el-date-picker style="width: 160px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
-
@ -100,7 +62,46 @@
-
<el-date-picker style="width: 160px" 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-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-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-->
<!-- v-for = "i in disposalMeasuresOptions"-->
<!-- :key = "i.id"-->
<!-- :label = "i.disposalMeasures"-->
<!-- :value = "i.disposalMeasures">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="'采购类型'">-->
<!-- <el-select v-model="searchData.orderType" clearable style="width: 90px">-->
<!-- <el-option label="采购订单" value="采购订单"></el-option>-->
<!-- <el-option label="委外订单" value="委外订单"></el-option>-->
<!--&lt;!&ndash; <el-option&ndash;&gt;-->
<!--&lt;!&ndash; v-for = "i in orderTypeList"&ndash;&gt;-->
<!--&lt;!&ndash; :key = "i.orderType"&ndash;&gt;-->
<!--&lt;!&ndash; :label = "i.orderType"&ndash;&gt;-->
<!--&lt;!&ndash; :value = "i.orderType">&ndash;&gt;-->
<!--&lt;!&ndash; </el-option>&ndash;&gt;-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="'送检类型'">-->
<!-- <el-select v-model="searchData.submissionType" clearable style="width: 90px">-->
<!-- <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>
<el-form :inline="true" label-position="top" :model="searchData" style="margin-top: 7px">
<el-form-item >
<el-button v-if="!authSearch" type="primary" :loading="searchLoading" @click="getDataList">查询</el-button>
<el-button v-if="!authCheck" type="primary" @click="submitResult">审核</el-button>
<el-button v-if="!authCancelCheck" type="primary" @click="cancelApproval">取消审核</el-button>
@ -1052,24 +1053,24 @@
fixed: '',
columnWidth: 100,
},
{
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: '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,
@ -2830,13 +2831,15 @@
//2025/9/8
this.detailData.passQty = row.passQty
this.detailData.notPassQty = row.notPassQty
this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.detailData.noBatchQualifiedQty = this.detailData.rollQty - row.batchQualifiedQty
//
if (row.state === '待检验'&&row.batchQualifiedQty===null) {
this.detailData.inspectionResult='合格'
this.detailData.batchQualifiedQty =this.detailData.rollQty
this.detailData.rollCount=this.detailData.rollQty
}else {
this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.detailData.noBatchQualifiedQty = this.detailData.rollQty - row.batchQualifiedQty
}
this.getInspectionFormData()
this.inspectorSearch()

Loading…
Cancel
Save