Commit 162f5993 authored by 刘洪铨's avatar 刘洪铨

需求修改

parent 20df6bcb
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<div>Completed Quantity</div> <div>Completed Quantity</div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.revisedQtyDue || '-' }}</span> <el-button type="text" @click="showSNInfo(scope.row)">{{ scope.row.revisedQtyDue || '-' }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" prop="jobName"> <el-table-column :show-overflow-tooltip="true" align="center" prop="jobName">
...@@ -1000,11 +1000,72 @@ ...@@ -1000,11 +1000,72 @@
</el-row> </el-row>
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" class="modelDialog" :title="'SN编码信息'" :visible.sync="QtyDialog" width="60%" :append-to-body="false">
<el-form ref="form1" :model="qtyParams" :inline="true">
<div style="text-align: center">
<el-form-item label="SN编码" prop="materSn">
<div slot="label">
<div class="labelName">SN编码</div>
<div class="labelName">SN</div>
</div>
<el-input
v-model="qtyParams.materSn"
placeholder="请输入SN编码"
clearable
:maxlength="30"
size="small"
style="width: 350px"
/>
</el-form-item>
<el-form-item>
<el-button class="redBtn" type="danger" size="small" @click="queryPosition">查询 Query</el-button>
<el-button class="resetBtn" size="small" @click="resetPosition">重置 Reset</el-button>
</el-form-item>
</div>
<div style="margin-left: 10px; font-size: 16px;">
SN编码信息列表
</div>
<el-row :gutter="20">
<el-col :span="24" :xs="24">
<el-table
ref="SNTable"
v-loading="SNModelLoading"
style="padding-right: 10px;padding-left: 10px;margin-top: 10px"
:data="SNTableList"
>
<el-table-column type="index" label="序号" width="50" />
<el-table-column align="center" prop="materSn" min-width="45%" :show-overflow-tooltip="true">
<template slot="header">
<div>SN编码</div>
<div>SN</div>
</template>
<template slot-scope="scope">
<span style="cursor: pointer; color: #D20A10;" @click="getRelationSnTable(scope.row)">{{ scope.row.materSn || '-' }}</span>
</template>
</el-table-column>
<el-table-column align="center" prop="createDate" min-width="45%" :show-overflow-tooltip="true">
<template slot="header">
<div>扫码时间</div>
<div />
</template>
</el-table-column>
</el-table>
<pagination
v-show="qtyTotal>0"
:total="qtyTotal"
:page.sync="qtyParams.page"
:limit.sync="qtyParams.rows"
@pagination="getSNTable"
/>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { formAssembling, queryBatch, queryDeviceAss, queryTestInfo, exportLineNo } from '@/api/assembling' import { formAssembling, queryBatch, queryDeviceAss, queryTestInfo, exportLineNo, getSnsVague } from '@/api/assembling'
import { getOrder, listOrderLine, listOrderMater, listStation } from '@/api/workOrder' import { getOrder, listOrderLine, listOrderMater, listStation } from '@/api/workOrder'
import { listRepairRecordDetails } from '@/api/repairRecord' import { listRepairRecordDetails } from '@/api/repairRecord'
import { getDicts } from '@/api/system/dict/data' import { getDicts } from '@/api/system/dict/data'
...@@ -1013,6 +1074,16 @@ export default { ...@@ -1013,6 +1074,16 @@ export default {
name: 'Assembling', name: 'Assembling',
data() { data() {
return { return {
QtyDialog: false, // sn编码模态框
SNTableList: [],
qtyParams: {
page: 1,
rows: 10,
materSn: '',
lineCode: '',
orderId: '',
type: 'package'
},
openBad: false, openBad: false,
openLoading: false, openLoading: false,
repairForm: { repairForm: {
...@@ -1152,6 +1223,32 @@ export default { ...@@ -1152,6 +1223,32 @@ export default {
} }
}, },
methods: { methods: {
showSNInfo(item) {
this.QtyDialog = true
this.qtyParams.page = 1
this.qtyParams.materSn = ''
this.qtyParams.orderId = ''
this.qtyParams.lineCode = ''
this.getSNTable()
},
getSNTable() {
this.SNModelLoading = true
getSnsVague(this.qtyParams).then(res => {
this.SNModelLoading = false
this.SNTableList = res.data.rows
this.qtyTotal = res.data.total
if (this.qtyParams.page !== 1 && this.SNTableList.length === 0) {
this.qtyParams.page = 1
this.SNModelLoading = true
this.qtyParams.orderId = this.orderId
getSnsVague(this.qtyParams).then(res => {
this.SNModelLoading = false
this.SNTableList = res.data.rows
this.qtyTotal = res.data.total
})
}
})
},
/** /**
* 装配线别号信息导出 * 装配线别号信息导出
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment