|
|
|
|
@ -4,24 +4,6 @@
|
|
|
|
|
<div class="JNPF-common-page-header">
|
|
|
|
|
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
|
|
|
|
|
<div class="options">
|
|
|
|
|
<el-dropdown class="dropdown" placement="bottom">
|
|
|
|
|
<el-button style="width:70px">
|
|
|
|
|
更 多<i class="el-icon-arrow-down el-icon--right"></i>
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
|
|
<template v-if="dataForm.id">
|
|
|
|
|
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
|
|
|
|
|
{{ '上一条' }}
|
|
|
|
|
</el-dropdown-item>
|
|
|
|
|
<el-dropdown-item @click.native="next" :disabled='nextDis'>
|
|
|
|
|
{{ '下一条' }}
|
|
|
|
|
</el-dropdown-item>
|
|
|
|
|
</template>
|
|
|
|
|
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
|
|
|
|
|
:loading="continueBtnLoading" :disabled='btnLoading'>
|
|
|
|
|
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
|
|
|
|
|
</el-dropdown-menu>
|
|
|
|
|
</el-dropdown>
|
|
|
|
|
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
|
|
|
|
|
:disabled='continueBtnLoading'> 保
|
|
|
|
|
存</el-button>
|
|
|
|
|
@ -37,10 +19,9 @@
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="生产日期" prop="manufactureTime">
|
|
|
|
|
<JnpfDatePicker v-model="dataForm.manufactureTime"
|
|
|
|
|
@change="changeData('manufactureTime', -1)"
|
|
|
|
|
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
|
|
|
|
|
placeholder="请选择生产日期" clearable :style='{ "width": "100%" }' type="date"
|
|
|
|
|
format="yyyy-MM-dd">
|
|
|
|
|
@change="changeData('manufactureTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
|
|
|
|
|
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择生产日期" clearable
|
|
|
|
|
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
|
|
|
|
|
</JnpfDatePicker>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -49,7 +30,7 @@
|
|
|
|
|
<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_code' field='deviceCode'
|
|
|
|
|
popupType="dialog" relationField='device_name' field='deviceCode'
|
|
|
|
|
interfaceId="590497496266971845" :pageSize="20"
|
|
|
|
|
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
@ -58,31 +39,27 @@
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="设备名称" prop="deviceName">
|
|
|
|
|
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
|
|
|
|
|
placeholder="选择设备后自动带入" disabled clearable :style='{ "width": "100%" }'>
|
|
|
|
|
placeholder="请输入设备名称" clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="顺序号" prop="sort">
|
|
|
|
|
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
|
|
|
|
|
placeholder="顺序号" :min="1" :step="1">
|
|
|
|
|
</JnpfInputNumber>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="班次" prop="post">
|
|
|
|
|
<JnpfSelect v-model="dataForm.post" @change="changeData('post', -1)" placeholder="请选择班次"
|
|
|
|
|
clearable :style='{ "width": "100%" }' :options="postOptions" :props="postProps">
|
|
|
|
|
</JnpfSelect>
|
|
|
|
|
<JnpfPopupSelect v-model="dataForm.post" @change="changeData('post', -1)"
|
|
|
|
|
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.post"
|
|
|
|
|
placeholder="请选择班次" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
|
|
|
|
|
popupType="dialog" relationField='classes_name' field='post'
|
|
|
|
|
interfaceId="595237502952944325" :pageSize="20" :columnOptions="postcolumnOptions"
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="开始时间" prop="startTime">
|
|
|
|
|
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
|
|
|
|
|
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
|
|
|
|
|
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择开始时间" clearable
|
|
|
|
|
:style='{ "width": "100%" }' format="HH:mm">
|
|
|
|
|
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
|
|
|
|
|
placeholder="请选择开始时间" clearable :style='{ "width": "100%" }' format="HH:mm">
|
|
|
|
|
</JnpfTimePicker>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -90,17 +67,20 @@
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="结束时间" prop="endTime">
|
|
|
|
|
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
|
|
|
|
|
:startTime="time(false, 1, 1, '', 'HH:mm', '')"
|
|
|
|
|
:endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable
|
|
|
|
|
:style='{ "width": "100%" }' format="HH:mm">
|
|
|
|
|
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')"
|
|
|
|
|
placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm">
|
|
|
|
|
</JnpfTimePicker>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="产品编码" prop="productCode">
|
|
|
|
|
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode', -1)"
|
|
|
|
|
placeholder="请输入产品编码" clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
<JnpfPopupSelect v-model="dataForm.productCode" @change="changeData('productCode', -1)"
|
|
|
|
|
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.productCode"
|
|
|
|
|
placeholder="请选择产品编码" hasPage propsValue="material_id" popupWidth="800px"
|
|
|
|
|
popupTitle="选择数据" popupType="dialog" relationField='material_name'
|
|
|
|
|
field='productCode' interfaceId="593079067666820933" :pageSize="20"
|
|
|
|
|
:columnOptions="productCodecolumnOptions" clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
@ -119,9 +99,8 @@
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="计量单位" prop="measurementUnit">
|
|
|
|
|
<JnpfInput v-model="dataForm.measurementUnit"
|
|
|
|
|
@change="changeData('measurementUnit', -1)" placeholder="请输入计量单位" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit', -1)"
|
|
|
|
|
placeholder="请输入计量单位" clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
@ -132,6 +111,13 @@
|
|
|
|
|
</JnpfInputNumber>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<jnpf-form-tip-item label="顺序号" prop="sort">
|
|
|
|
|
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort', -1)"
|
|
|
|
|
placeholder="顺序号" :min="1" :step="1">
|
|
|
|
|
</JnpfInputNumber>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- 表单结束 -->
|
|
|
|
|
</template>
|
|
|
|
|
</el-form>
|
|
|
|
|
@ -187,9 +173,9 @@ export default {
|
|
|
|
|
deviceCode: undefined,
|
|
|
|
|
deviceName: undefined,
|
|
|
|
|
sort: 1,
|
|
|
|
|
post: "1",
|
|
|
|
|
post: undefined,
|
|
|
|
|
startTime: undefined,
|
|
|
|
|
endTime: undefined,
|
|
|
|
|
endTime: "15:55",
|
|
|
|
|
productCode: undefined,
|
|
|
|
|
productName: undefined,
|
|
|
|
|
models: undefined,
|
|
|
|
|
@ -214,10 +200,17 @@ export default {
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
deviceName: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请输入设备名称',
|
|
|
|
|
trigger: 'blur'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
post: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请至少选择一个',
|
|
|
|
|
message: '请选择班次',
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
@ -231,15 +224,15 @@ export default {
|
|
|
|
|
endTime: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择结束时间',
|
|
|
|
|
message: '请至少选择一个',
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
productCode: [
|
|
|
|
|
{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请输入产品编码',
|
|
|
|
|
trigger: 'blur'
|
|
|
|
|
message: '请选择产品编码',
|
|
|
|
|
trigger: 'change'
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
models: [
|
|
|
|
|
@ -265,8 +258,8 @@ export default {
|
|
|
|
|
],
|
|
|
|
|
},
|
|
|
|
|
deviceCodecolumnOptions: [{ "label": "设备编码", "value": "device_code" }, { "label": "设备名称", "value": "device_name" }, { "label": "设备类型", "value": "device_desc" },],
|
|
|
|
|
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }, { "fullName": "淡季白班", "id": "3" }, { "fullName": "淡季晚班", "id": "4" }],
|
|
|
|
|
postProps: { "label": "fullName", "value": "id" },
|
|
|
|
|
postcolumnOptions: [{ "label": "班次名称", "value": "classes_name" }, { "label": "开始时间", "value": "start_time" }, { "label": "结束时间", "value": "end_time" }, { "label": "班次时长", "value": "classes_duration" },],
|
|
|
|
|
productCodecolumnOptions: [{ "label": "产品编码", "value": "material_id" }, { "label": "产品名称", "value": "material_name" }, { "label": "规格型号", "value": "model" }, { "label": "计量单位", "value": "unit_measurement" }, { "label": "安全库存", "value": "safety_stock" },],
|
|
|
|
|
childIndex: -1,
|
|
|
|
|
isEdit: false,
|
|
|
|
|
interfaceRes: {
|
|
|
|
|
@ -335,12 +328,40 @@ export default {
|
|
|
|
|
this.$emit('refreshDataList', true)
|
|
|
|
|
},
|
|
|
|
|
changeData(model, index) {
|
|
|
|
|
if (model == 'post' && this.dataForm.post != undefined) {
|
|
|
|
|
request({
|
|
|
|
|
url: '/api/example/YysClasses/getInfoById/' + this.dataForm.post,
|
|
|
|
|
method: 'get'
|
|
|
|
|
}).then(res => {
|
|
|
|
|
let _data = res.data;
|
|
|
|
|
let _dataForm = { ...this.dataForm }
|
|
|
|
|
_dataForm.startTime = _data.startTime
|
|
|
|
|
_dataForm.endTime = _data.endTime
|
|
|
|
|
this.dataForm = { ..._dataForm };
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
let _dataForm = { ...this.dataForm }
|
|
|
|
|
_dataForm.deviceName = res.msg
|
|
|
|
|
this.dataForm = { ..._dataForm };
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
if (model == 'productCode' && this.dataForm.productCode != undefined) {
|
|
|
|
|
request({
|
|
|
|
|
url: '/api/example/YysMaterialInformation/getInfoByCode/' + this.dataForm.productCode,
|
|
|
|
|
method: 'get'
|
|
|
|
|
}).then(res => {
|
|
|
|
|
let _data = res.data;
|
|
|
|
|
let _dataForm = { ...this.dataForm }
|
|
|
|
|
_dataForm.productName = _data.materialName
|
|
|
|
|
_dataForm.models = _data.model
|
|
|
|
|
_dataForm.measurementUnit = _data.unitMeasurement
|
|
|
|
|
_dataForm.currentInventory = _data.safetyStock
|
|
|
|
|
this.dataForm = { ..._dataForm };
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
this.isEdit = false
|
|
|
|
|
|
jiyufei
2 months ago