|
|
|
@ -155,10 +155,14 @@ |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y'" prop="orderNo" :rules="rules.seqNoType"> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo == '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType"> |
|
|
|
<span slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span> |
|
|
|
<el-input v-model="modalData.seqNo" style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && this.modalData.rollNo != '' && this.modalData.rollNo != null" prop="orderNo" :rules="rules.seqNoType"> |
|
|
|
<span slot="label">派工单号</span> |
|
|
|
<el-input v-model="modalData.seqNo" disabled style="width: 221px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="orderNo" :rules="rules.seqNoType"> |
|
|
|
<span slot="label">派工单号</span> |
|
|
|
<el-input v-model="modalData.seqNo" disabled style="width: 221px"></el-input> |
|
|
|
@ -271,7 +275,7 @@ |
|
|
|
<el-input v-model="detailData.partDesc" readonly style="width: 200px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'送检数量'"> |
|
|
|
<el-input v-model="detailData.rollQty" readonly style="width: 80px"></el-input> |
|
|
|
<el-input v-model="detailData.rollQty" type="number" style="width: 80px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'抽样数量'"> |
|
|
|
<el-input v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input> |
|
|
|
@ -432,55 +436,6 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- <!– 工单清单 –>--> |
|
|
|
<!-- <el-dialog title="工单清单" :close-on-click-modal="false" v-drag :visible.sync="orderNoModelFlag" width="720px">--> |
|
|
|
<!-- <div class="rq">--> |
|
|
|
<!-- <el-form :inline="true" label-position="top" :model="orderNoData">--> |
|
|
|
<!-- <el-form-item :label="'工单号'">--> |
|
|
|
<!-- <el-input v-model="orderNoData.orderNo" clearable style="width: 120px"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item :label="' '">--> |
|
|
|
<!-- <el-button type="primary" @click="getOrderNoList2()">查询</el-button>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- </el-form>--> |
|
|
|
<!-- <el-table--> |
|
|
|
<!-- :height="300"--> |
|
|
|
<!-- :data="orderNoList"--> |
|
|
|
<!-- ref="orderNoTable"--> |
|
|
|
<!-- @row-click="orderNoClickRow"--> |
|
|
|
<!-- @selection-change="selectionOrderNoChangeHandle"--> |
|
|
|
<!-- border--> |
|
|
|
<!-- v-loading="dataListLoading"--> |
|
|
|
<!-- :row-class-name="orderNoRowClassName"--> |
|
|
|
<!-- style="width: 100%;">--> |
|
|
|
<!-- <el-table-column type="index" width="50" align="center">--> |
|
|
|
<!-- <template slot-scope="scope">--> |
|
|
|
<!-- <el-radio v-model="orderNoCurrent" :label="scope.row.index">{{''}}</el-radio>--> |
|
|
|
<!-- </template>--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<!-- <el-table-column--> |
|
|
|
<!-- prop="orderNo"--> |
|
|
|
<!-- header-align="center"--> |
|
|
|
<!-- align="center"--> |
|
|
|
<!-- label="工单号">--> |
|
|
|
<!-- </el-table-column>--> |
|
|
|
<!-- </el-table>--> |
|
|
|
<!--<!– <!– 分页–>–>--> |
|
|
|
<!--<!– <el-pagination–>--> |
|
|
|
<!--<!– @size-change="sizeChangeHandle2"–>--> |
|
|
|
<!--<!– @current-change="currentChangeHandle2"–>--> |
|
|
|
<!--<!– :current-page="pageIndex2"–>--> |
|
|
|
<!--<!– :page-sizes="[20, 50, 100, 200, 500]"–>--> |
|
|
|
<!--<!– :page-size="pageSize2"–>--> |
|
|
|
<!--<!– :total="totalPage2"–>--> |
|
|
|
<!--<!– layout="total, sizes, prev, pager, next, jumper">–>--> |
|
|
|
<!--<!– </el-pagination>–>--> |
|
|
|
<!-- </div>--> |
|
|
|
<!-- <el-footer style="height:40px;margin-top: 20px;text-align:center">--> |
|
|
|
<!-- <el-button type="primary" @click="confirmOrderNo()">确认</el-button>--> |
|
|
|
<!-- </el-footer>--> |
|
|
|
<!-- </el-dialog>--> |
|
|
|
|
|
|
|
<!-- 子明细信息 --> |
|
|
|
<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> |
|
|
|
@ -499,19 +454,19 @@ |
|
|
|
<el-table-column prop="samplingLocation" header-align="center" align="center" :required="true" label="抽样位置A" width="150"> |
|
|
|
<template slot-scope="{row}"> |
|
|
|
<el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].samplingLocation" readonly placeholder="请输入抽样位置A"></el-input> |
|
|
|
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocation" placeholder="请输入抽样位置A"></el-input> |
|
|
|
<el-input :ref="`${row.xh-1}` + `a`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocation" @keyup.enter.native="nextFocus1(row.xh-1)" placeholder="请输入抽样位置A"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="samplingLocationB" header-align="center" align="center" :required="true" label="抽样位置B" width="150"> |
|
|
|
<template slot-scope="{row}"> |
|
|
|
<el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].samplingLocationB" readonly placeholder="请输入抽样位置B"></el-input> |
|
|
|
<el-input v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocationB" placeholder="请输入抽样位置B"></el-input> |
|
|
|
<el-input :ref="`${row.xh-1}` + `b`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].samplingLocationB" @keyup.enter.native="nextFocus2(row.xh-1)" placeholder="请输入抽样位置B"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="subDetailValue" header-align="center" align="center" :required="true" label="实测值" width="150"> |
|
|
|
<template slot-scope="{row}"> |
|
|
|
<el-input v-if="tableData[row.xh-1].isSubmit=='Y'" v-model="tableData[row.xh-1].subDetailValue" readonly placeholder="请输入实测值"></el-input> |
|
|
|
<el-input :ref="`${row.xh-1}`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus(row.xh-1)" placeholder="请输入实测值"></el-input> |
|
|
|
<el-input :ref="`${row.xh-1}` + `c`" v-if="tableData[row.xh-1].isSubmit!='Y'" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
@ -717,9 +672,6 @@ |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 50, |
|
|
|
totalPage: 0, |
|
|
|
// pageIndex2: 1, |
|
|
|
// pageSize2: 20, |
|
|
|
// totalPage2: 0, |
|
|
|
height: 200, |
|
|
|
dataList: [], |
|
|
|
dataListLoading: false, |
|
|
|
@ -1097,6 +1049,7 @@ |
|
|
|
inspectorNo: '', |
|
|
|
inspectionRemark: '', |
|
|
|
samplingQty: '', |
|
|
|
rollQty: '', |
|
|
|
itemList:[], |
|
|
|
}, |
|
|
|
detailColumnList: [ |
|
|
|
@ -1406,15 +1359,6 @@ |
|
|
|
typeOptions: [], |
|
|
|
disposalMeasuresOptions: [], |
|
|
|
timeout: null |
|
|
|
// orderNoData:{ |
|
|
|
// limit: 10, |
|
|
|
// page: 1, |
|
|
|
// site: this.$store.state.user.site, |
|
|
|
// orderNo: '' |
|
|
|
// }, |
|
|
|
// orderNoModelFlag: false, |
|
|
|
// orderNoList: [], |
|
|
|
// orderNoCurrent: -1 |
|
|
|
} |
|
|
|
}, |
|
|
|
mounted () { |
|
|
|
@ -1430,6 +1374,7 @@ |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
|
|
|
|
// input 模糊搜索 |
|
|
|
querySearchAsync (queryString, cb) { |
|
|
|
clearTimeout(this.timeout) |
|
|
|
let results = [] |
|
|
|
@ -1463,7 +1408,7 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
//点击出现搜索后点击的每一项 |
|
|
|
// 点击出现搜索后点击的每一项 |
|
|
|
handleSelect (item) { |
|
|
|
this.modalData.rollNo = item.value |
|
|
|
this.modalData.seqNo = item.seqNo |
|
|
|
@ -1952,18 +1897,6 @@ |
|
|
|
this.dataListSelections = val |
|
|
|
}, |
|
|
|
|
|
|
|
// // 每页数 |
|
|
|
// sizeChangeHandle2 (val) { |
|
|
|
// this.pageSize2 = val |
|
|
|
// this.pageIndex2 = 1 |
|
|
|
// this.getOrderNoList() |
|
|
|
// }, |
|
|
|
// // 当前页 |
|
|
|
// currentChangeHandle2 (val) { |
|
|
|
// this.pageIndex2 = val |
|
|
|
// this.getOrderNoList() |
|
|
|
// }, |
|
|
|
|
|
|
|
// 删除检验记录 |
|
|
|
deleteModal () { |
|
|
|
if(this.IPQCSelections.length === 0){ |
|
|
|
@ -2043,6 +1976,7 @@ |
|
|
|
this.saveInformationData.inspectorNo = this.detailData.inspectorNo |
|
|
|
this.saveInformationData.inspectionResult = this.detailData.inspectionResult |
|
|
|
this.saveInformationData.inspectionRemark = this.detailData.inspectionRemark |
|
|
|
this.saveInformationData.rollQty = this.detailData.rollQty |
|
|
|
this.saveInformationData.samplingQty = this.detailData.samplingQty |
|
|
|
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) |
|
|
|
saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => { |
|
|
|
@ -2223,10 +2157,22 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
// 回车事件 |
|
|
|
nextFocus(index) { |
|
|
|
let aaa = `${index + 1}` |
|
|
|
nextFocus1 (index) { |
|
|
|
let a1 = `${index + 1}` + `a` |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs[a1].focus() |
|
|
|
}) |
|
|
|
}, |
|
|
|
nextFocus2 (index) { |
|
|
|
let a2 = `${index + 1}` + `b` |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs[a2].focus() |
|
|
|
}) |
|
|
|
}, |
|
|
|
nextFocus3 (index) { |
|
|
|
let a3 = `${index + 1}` + `c` |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs[aaa].focus() |
|
|
|
this.$refs[a3].focus() |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|