master
zengchenxi 3 months ago
parent b7948ea5fd
commit 53a3420d9e

@ -48,10 +48,11 @@
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_name' field='deviceCode'
popupType="dialog" relationField='device_code' field='deviceCode'
interfaceId="590497496266971845" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
@ -319,6 +320,14 @@ export default {
this.$emit('refreshDataList', true)
},
changeData(model, index) {
if (model == 'deviceCode' && this.dataForm.deviceCode != undefined) {
request({
url: '/api/example/YysDevice/queryNameByCode/' + this.dataForm.deviceCode,
method: 'get'
}).then(res => {
this.dataForm.deviceName = res.msg;
});
}
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -12,9 +5,8 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="生产日期">
<JnpfDateRangePicker v-model="query.manufactureTime"
format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" >
<JnpfDateRangePicker v-model="query.manufactureTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
@ -71,78 +63,40 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="manufactureTime"
label="生产日期" align="left"
>
:span-method="arraySpanMethod"border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column>
<el-table-column
prop="deviceCode"
label="设备编码" align="left"
>
<el-table-column prop="deviceCode" label="设备编码" align="center">
</el-table-column>
<el-table-column
prop="deviceName"
label="设备名称" align="left"
>
<el-table-column prop="deviceName" label="设备名称" align="center">
</el-table-column>
<el-table-column
prop="sort"
label="顺序号" align="left"
>
<el-table-column prop="sort" label="顺序号" align="center">
<template slot-scope="scope" v-if="scope.row.sort">
<JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="班次" prop="post" algin="left"
>
<el-table-column label="班次" prop="post" algin="center">
<template slot-scope="scope">
{{ scope.row.post }}
</template>
</el-table-column>
<el-table-column
prop="startTime"
label="开始时间" align="left"
>
<el-table-column prop="startTime" label="开始时间" align="center">
</el-table-column>
<el-table-column
prop="endTime"
label="结束时间" align="left"
>
<el-table-column prop="endTime" label="结束时间" align="center">
</el-table-column>
<el-table-column
prop="productCode"
label="产品编码" align="left"
>
<el-table-column prop="productCode" label="产品编码" align="center">
</el-table-column>
<el-table-column
prop="productName"
label="产品名称" align="left"
>
<el-table-column prop="productName" label="产品名称" align="center">
</el-table-column>
<el-table-column
prop="model"
label="规格型号" align="left"
>
<el-table-column prop="model" label="规格型号" align="center">
</el-table-column>
<el-table-column
prop="duty"
label="当班领用" align="left"
>
<el-table-column prop="duty" label="当班领用" align="center">
</el-table-column>
<el-table-column
prop="classBalance"
label="本班结存" align="left"
>
<el-table-column prop="classBalance" label="本班结存" align="center">
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button>
<!-- <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
@ -152,7 +106,8 @@
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />

Loading…
Cancel
Save