|
|
|
@ -525,40 +525,50 @@ |
|
|
|
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteBtn(subDetailData)">删除</el-button> |
|
|
|
<el-button type="primary" icon="el-icon-more" size="mini" @click="batchHandleAdd(subDetailData)">批量新增</el-button> |
|
|
|
<div class="rq "> |
|
|
|
<el-table |
|
|
|
:height="400" |
|
|
|
:data="tableData" |
|
|
|
border |
|
|
|
:row-class-name="rowClassName" |
|
|
|
@selection-change="handleDetailSelectionChange" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column type="selection" align="center" width="50"></el-table-column> |
|
|
|
<el-table-column label="序号" align="center" prop="xh" width="50"></el-table-column> |
|
|
|
<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-else :ref="`${row.xh-1}` + `a`" 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-else :ref="`${row.xh-1}` + `b`" 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="实测值A" 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="请输入实测值A"></el-input> |
|
|
|
<el-input v-else :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值A"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="subDetailValueB" 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].subDetailValueB" readonly placeholder="请输入实测值B"></el-input> |
|
|
|
<el-input v-else :ref="`${row.xh-1}` + `d`" v-model="tableData[row.xh-1].subDetailValueB" @keyup.enter.native="nextFocus4(row.xh-1)" placeholder="请输入实测值B"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
<el-table |
|
|
|
:height="400" |
|
|
|
:data="tableData" |
|
|
|
border |
|
|
|
:row-class-name="rowClassName" |
|
|
|
@selection-change="handleDetailSelectionChange" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column type="selection" align="center" width="50"></el-table-column> |
|
|
|
<el-table-column label="序号" align="center" prop="xh" width="50"></el-table-column> |
|
|
|
<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-else :ref="`${row.xh-1}` + `a`" 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-else :ref="`${row.xh-1}` + `b`" 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="实测值A" 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="请输入实测值A"></el-input> |
|
|
|
<el-input v-else :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].subDetailValue" @keyup.enter.native="nextFocus3(row.xh-1)" placeholder="请输入实测值A"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="subDetailValueB" 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].subDetailValueB" readonly placeholder="请输入实测值B"></el-input> |
|
|
|
<el-input v-else :ref="`${row.xh-1}` + `d`" v-model="tableData[row.xh-1].subDetailValueB" @keyup.enter.native="nextFocus4(row.xh-1)" placeholder="请输入实测值B"></el-input> |
|
|
|
</template> |
|
|
|
</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: 10px;text-align:center"> |
|
|
|
<el-button v-if="detailData.submitFlag !== 'Y'" type="primary" @click="saveSubDetailResult">保存</el-button> |
|
|
|
@ -1022,6 +1032,9 @@ |
|
|
|
pageIndex: 1, |
|
|
|
pageSize: 20, |
|
|
|
totalPage: 0, |
|
|
|
pageIndex2: 1, |
|
|
|
pageSize2: 20, |
|
|
|
totalPage2: 0, |
|
|
|
height: 200, |
|
|
|
dataList: [], |
|
|
|
dataListSelections: [], |
|
|
|
@ -2078,7 +2091,9 @@ |
|
|
|
maxValue: '', |
|
|
|
minValue: '', |
|
|
|
valueTypeDb: '', |
|
|
|
subDetailValues:[] |
|
|
|
subDetailValues:[], |
|
|
|
page: 1, |
|
|
|
limit: 10, |
|
|
|
}, |
|
|
|
options: [], |
|
|
|
modalDisableFlag: false, |
|
|
|
@ -3348,6 +3363,19 @@ |
|
|
|
this.getDataList() |
|
|
|
}, |
|
|
|
|
|
|
|
// 子明细每页数 |
|
|
|
sizeChangeHandle2 (val) { |
|
|
|
this.pageSize2 = val |
|
|
|
this.pageIndex2 = 1 |
|
|
|
this.subDetailModal2() |
|
|
|
}, |
|
|
|
|
|
|
|
// 子明细当前页 |
|
|
|
currentChangeHandle2 (val) { |
|
|
|
this.pageIndex2 = val |
|
|
|
this.subDetailModal2() |
|
|
|
}, |
|
|
|
|
|
|
|
// 多选 |
|
|
|
selectionChangeHandle (val) { |
|
|
|
this.dataListSelections = val |
|
|
|
@ -3560,15 +3588,16 @@ |
|
|
|
|
|
|
|
// 子明细记录信息查询 |
|
|
|
subDetailModal (row) { |
|
|
|
// this.subDetailData.inspectionNo = row.inspectionNo |
|
|
|
// this.subDetailData.itemNo = row.itemNo |
|
|
|
// this.subDetailData.itemDesc = row.itemDesc |
|
|
|
// this.subDetailData.defaultValue = row.defaultValue |
|
|
|
// this.subDetailData.maxValue = row.maxValue |
|
|
|
// this.subDetailData.minValue = row.minValue |
|
|
|
this.subDetailData = row |
|
|
|
this.subDetailData.limit = this.pageSize2 |
|
|
|
this.subDetailData.page = this.pageIndex2 |
|
|
|
selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => { |
|
|
|
this.tableData = data.rows |
|
|
|
if (data.code === 0) { |
|
|
|
this.tableData = data.page.list |
|
|
|
this.pageIndex2 = data.page.currPage |
|
|
|
this.pageSize2 = data.page.pageSize |
|
|
|
this.totalPage2 = data.page.totalCount |
|
|
|
} |
|
|
|
}) |
|
|
|
this.batchAddData = { |
|
|
|
samplingLocation: '', |
|
|
|
@ -3578,6 +3607,20 @@ |
|
|
|
this.subDetailFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
// 子明细分页查询 |
|
|
|
subDetailModal2 () { |
|
|
|
this.subDetailData.limit = this.pageSize2 |
|
|
|
this.subDetailData.page = this.pageIndex2 |
|
|
|
selectIPQCSubDetailedRecord(this.subDetailData).then(({data}) => { |
|
|
|
if (data.code === 0) { |
|
|
|
this.tableData = data.page.list |
|
|
|
this.pageIndex2 = data.page.currPage |
|
|
|
this.pageSize2 = data.page.pageSize |
|
|
|
this.totalPage2 = data.page.totalCount |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 审核按钮 |
|
|
|
submitResult () { |
|
|
|
let tempData1 = '' // 记录不是待审核状态的单号 |
|
|
|
|