yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():前端组件样式修改，后端逻辑优化;

Browse Source
master
jiyufei 3 months ago
parent ab86d9b39e
commit 21248cd4c0
4 changed files with 582 additions and 641 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java
View File

File diff suppressed because one or more lines are too long

47
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue
Unescape View File

@ -3,8 +3,7 @@
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
@ -13,80 +12,64 @@
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="生产日期"
prop="manufactureTime" >
<jnpf-form-tip-item label="生产日期" prop="manufactureTime">
<p>{{ dataForm.manufactureTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<p>{{ dataForm.deviceCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="顺序号"
prop="sort" >
<JnpfNumber v-model="dataForm.sort"
placeholder="顺序号" disabled
:min="1" :step="1" >
<jnpf-form-tip-item label="顺序号" prop="sort">
<JnpfNumber v-model="dataForm.sort" placeholder="顺序号" disabled :min="1" :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="班次"
prop="post" >
<jnpf-form-tip-item label="班次" prop="post">
<p>{{ dataForm.post }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="开始时间"
prop="startTime" >
<jnpf-form-tip-item label="开始时间" prop="startTime">
<p>{{ dataForm.startTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<jnpf-form-tip-item label="结束时间" prop="endTime">
<p>{{ dataForm.endTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品编码"
prop="productCode" >
<jnpf-form-tip-item label="产品编码" prop="productCode">
<p>{{ dataForm.productCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="产品名称"
prop="productName" >
<jnpf-form-tip-item label="产品名称" prop="productName">
<p>{{ dataForm.productName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="规格型号"
prop="models" >
<jnpf-form-tip-item label="规格型号" prop="models">
<p>{{ dataForm.models }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计量单位"
prop="measurementUnit" >
<jnpf-form-tip-item label="计量单位" prop="measurementUnit">
<p>{{ dataForm.measurementUnit }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="计量数量"
prop="planNumber" >
<JnpfNumber v-model="dataForm.planNumber"
placeholder="请输入计量数量" disabled
:step="1" >
<jnpf-form-tip-item label="计量数量" prop="planNumber">
<JnpfNumber v-model="dataForm.planNumber" placeholder="请输入计量数量" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>

22
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue
Unescape View File

@ -37,9 +37,10 @@
<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>
@ -79,8 +80,9 @@
<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>
@ -88,8 +90,9 @@
<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>
@ -116,8 +119,9 @@
</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>

86
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue
Unescape View File

@ -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,91 +63,53 @@
</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">
<el-table-column prop="manufactureTime" label="生产日期" align="left">
</el-table-column>
<el-table-column
prop="deviceCode"
label="设备编码" align="left"
>
<el-table-column prop="deviceCode" label="设备编码" align="left">
</el-table-column>
<el-table-column
prop="deviceName"
label="设备名称" align="left"
>
<el-table-column prop="deviceName" label="设备名称" align="left">
</el-table-column>
<el-table-column
prop="sort"
label="顺序号" align="left"
>
<el-table-column prop="sort" label="顺序号" align="left">
<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="left">
<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="left">
</el-table-column>
<el-table-column
prop="endTime"
label="结束时间" align="left"
>
<el-table-column prop="endTime" label="结束时间" align="left">
</el-table-column>
<el-table-column
prop="productCode"
label="产品编码" align="left"
>
<el-table-column prop="productCode" label="产品编码" align="left">
</el-table-column>
<el-table-column
prop="productName"
label="产品名称" align="left"
>
<el-table-column prop="productName" label="产品名称" align="left">
</el-table-column>
<el-table-column
prop="models"
label="规格型号" align="left"
>
<el-table-column prop="models" label="规格型号" align="left">
</el-table-column>
<el-table-column
prop="measurementUnit"
label="计量单位" align="left"
>
<el-table-column prop="measurementUnit" label="计量单位" align="left">
</el-table-column>
<el-table-column
prop="planNumber"
label="计量数量" align="left"
>
<el-table-column prop="planNumber" label="计量数量" align="left">
<template slot-scope="scope" v-if="scope.row.planNumber">
<JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
</template>
</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>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</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" />

Write Preview
Loading…
Cancel
Save