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

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

Browse Source
master
jiyufei 3 months ago
parent 0498b72172
commit 0fa9a54883
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-web/src/views/yys/yyscalendar/index.vue
Unescape View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="years" label="年月" align="center"> <el-table-column prop="years" label="年月" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="day" label="日期" align="center"> <el-table-column prop="day" label="日期" align="center">

2
jnpf-java-boot/jnpf-web/src/views/yys/yysclasses/index.vue
Unescape View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="classesName" label="班次名称" align="center"> <el-table-column prop="classesName" label="班次名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="开始时间" align="center"> <el-table-column prop="startTime" label="开始时间" align="center">

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

@ -63,36 +63,36 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="left"> <el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column> </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>
<el-table-column prop="deviceName" label="设备名称" align="left"> <el-table-column prop="deviceName" label="设备名称" align="center">
</el-table-column> </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"> <template slot-scope="scope" v-if="scope.row.sort">
<JnpfNumber v-model="scope.row.sort" :thousands="false" /> <JnpfNumber v-model="scope.row.sort" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班次" prop="post" algin="left"> <el-table-column label="班次" prop="post" algin="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.post }} {{ scope.row.post }}
</template> </template>
</el-table-column> </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>
<el-table-column prop="endTime" label="结束时间" align="left"> <el-table-column prop="endTime" label="结束时间" align="center">
</el-table-column> </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>
<el-table-column prop="productName" label="产品名称" align="left"> <el-table-column prop="productName" label="产品名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="models" label="规格型号" align="left"> <el-table-column prop="models" label="规格型号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="left"> <el-table-column prop="measurementUnit" label="计量单位" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="planNumber" label="计量数量" align="left"> <el-table-column prop="planNumber" label="计量数量" align="center">
<template slot-scope="scope" v-if="scope.row.planNumber"> <template slot-scope="scope" v-if="scope.row.planNumber">
<JnpfNumber v-model="scope.row.planNumber" :thousands="false" /> <JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
</template> </template>

4
jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue
Unescape View File

@ -52,7 +52,7 @@
</el-row> </el-row>
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center"> <el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center"> <el-table-column prop="productCode" label="产品编码" align="center">
@ -188,7 +188,7 @@ export default {
formatDeliveryTime(row, column) { formatDeliveryTime(row, column) {
const date = new Date(row.deliveryTime); const date = new Date(row.deliveryTime);
const year = date.getFullYear(); const year = date.getFullYear();
const month = date.getMonth() + 1; const month = date.getMonth() + 1;
const day = date.getDate(); const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`; return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}, },

4
jnpf-java-boot/jnpf-web/src/views/yys/yysdaywork/index.vue
Unescape View File

@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center"> <el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="deviceCode" label="设备编码" align="center"> <el-table-column prop="deviceCode" label="设备编码" align="center">
@ -104,7 +104,7 @@
<JnpfNumber v-model="scope.row.planNumber" :thousands="false" /> <JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产状态" prop="productionStatus" algin="center"> <el-table-column label="生产状态" prop="productionStatus" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.productionStatus }} {{ scope.row.productionStatus }}
</template> </template>

2
jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/index.vue
Unescape View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="deviceCode" label="设备编号" align="center"> <el-table-column prop="deviceCode" label="设备编号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="deviceName" label="设备名称" align="center"> <el-table-column prop="deviceName" label="设备名称" align="center">

2
jnpf-java-boot/jnpf-web/src/views/yys/yysgroup/index.vue
Unescape View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="groupName" label="班组名称" align="center"> <el-table-column prop="groupName" label="班组名称" align="center">
</el-table-column> </el-table-column>
<el-table-column label="班组类型" prop="groupType" align="center"> <el-table-column label="班组类型" prop="groupType" align="center">

2
jnpf-java-boot/jnpf-web/src/views/yys/yysmonthlyproduction/index.vue
Unescape View File

@ -49,7 +49,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="years" label="年月" align="center"> <el-table-column prop="years" label="年月" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="productId" label="产品编码" align="center"> <el-table-column prop="productId" label="产品编码" align="center">

2
jnpf-java-boot/jnpf-web/src/views/yys/yyspost/index.vue
Unescape View File

@ -48,7 +48,7 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"> :span-method="arraySpanMethod" border>
<el-table-column prop="postName" label="岗位名称" align="center"> <el-table-column prop="postName" label="岗位名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="postCode" label="岗位编码" align="center"> <el-table-column prop="postCode" label="岗位编码" align="center">

Write Preview
Loading…
Cancel
Save