linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix erp

Browse Source
main
chenshuichuan 2 years ago
parent 5d42c99f20
commit 779898f608
11 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File

8
src/views/erp/stock/check/index.vue
Unescape Escape View File

@ -141,7 +141,7 @@
> >
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="盘点单号" align="center" prop="no" /> <el-table-column min-width="180" label="盘点单号" align="center" prop="no" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" /> <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
<el-table-column <el-table-column
label="盘点时间" label="盘点时间"
align="center" align="center"
@ -152,13 +152,15 @@
<el-table-column label="创建人" align="center" prop="creatorName" /> <el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column <el-table-column
label="数量" label="数量"
align="center" align="right"
sortable
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="金额" label="金额"
align="center" align="right"
sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> />

8
src/views/erp/stock/in/index.vue
Unescape Escape View File

@ -163,7 +163,7 @@
> >
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="入库单号" align="center" prop="no" /> <el-table-column min-width="180" label="入库单号" align="center" prop="no" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" /> <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
<el-table-column label="供应商" align="center" prop="supplierName" /> <el-table-column label="供应商" align="center" prop="supplierName" />
<el-table-column <el-table-column
label="入库时间" label="入库时间"
@ -175,13 +175,15 @@
<el-table-column label="创建人" align="center" prop="creatorName" /> <el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column <el-table-column
label="数量" label="数量"
align="center" align="right"
sortable
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="金额" label="金额"
align="center" align="right"
sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> />

9
src/views/erp/stock/move/index.vue
Unescape Escape View File

@ -140,24 +140,27 @@
> >
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="调度单号" align="center" prop="no" /> <el-table-column min-width="180" label="调度单号" align="center" prop="no" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" /> <el-table-column label="产品信息" align="left" prop="productNames" min-width="200" />
<el-table-column <el-table-column
label="调度时间" label="调度时间"
align="center" align="center"
prop="moveTime" prop="moveTime"
sortable
:formatter="dateFormatter2" :formatter="dateFormatter2"
width="120px" width="120px"
/> />
<el-table-column label="创建人" align="center" prop="creatorName" /> <el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column <el-table-column
label="数量" label="数量"
align="center" align="right"
sortable
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="金额" label="金额"
align="center" align="right"
sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> />

9
src/views/erp/stock/out/index.vue
Unescape Escape View File

@ -163,11 +163,12 @@
> >
<el-table-column width="30" label="选择" type="selection" /> <el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="出库单号" align="center" prop="no" /> <el-table-column min-width="180" label="出库单号" align="center" prop="no" />
<el-table-column label="产品信息" align="center" prop="productNames" min-width="200" /> <el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="210" />
<el-table-column label="客户" align="center" prop="customerName" /> <el-table-column label="客户" align="center" prop="customerName" />
<el-table-column <el-table-column
label="出库时间" label="出库时间"
align="center" align="center"
sortable
prop="outTime" prop="outTime"
:formatter="dateFormatter2" :formatter="dateFormatter2"
width="120px" width="120px"
@ -175,13 +176,15 @@
<el-table-column label="创建人" align="center" prop="creatorName" /> <el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column <el-table-column
label="数量" label="数量"
align="center" align="right"
sortable
prop="totalCount" prop="totalCount"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="金额" label="金额"
align="center" align="right"
sortable
prop="totalPrice" prop="totalPrice"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> />

13
src/views/erp/stock/record/index.vue
Unescape Escape View File

@ -113,7 +113,7 @@
</el-tabs> </el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品名称" align="center" prop="productName" width="180px"/> <el-table-column label="产品名称" align="left" sortable prop="productName" width="210px"/>
<el-table-column label="产品分类" align="center" prop="categoryName" /> <el-table-column label="产品分类" align="center" prop="categoryName" />
<el-table-column label="产品单位" align="center" prop="unitName" /> <el-table-column label="产品单位" align="center" prop="unitName" />
<el-table-column label="仓库编号" align="center" prop="warehouseName" /> <el-table-column label="仓库编号" align="center" prop="warehouseName" />
@ -125,22 +125,27 @@
<el-table-column label="出入库单号" align="center" prop="bizNo" width="200" /> <el-table-column label="出入库单号" align="center" prop="bizNo" width="200" />
<el-table-column <el-table-column
label="出入库数量" label="出入库数量"
align="center" align="right"
sortable
prop="count" prop="count"
width="120px"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="库存量" label="库存量"
align="center" align="right"
sortable
prop="totalCount" prop="totalCount"
width="120px"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />
<el-table-column <el-table-column
label="出入库日期" label="出入库日期"
align="center" align="center"
sortable
prop="recordTime" prop="recordTime"
:formatter="dateFormatter2" :formatter="dateFormatter2"
width="180px" width="120px"
/> />
<el-table-column <el-table-column
label="创建日期" label="创建日期"

5
src/views/erp/stock/stock/index.vue
Unescape Escape View File

@ -79,11 +79,12 @@
</el-tabs> </el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品" align="center" prop="productName" /> <el-table-column label="产品" align="left" sortable prop="productName" />
<el-table-column label="分类" align="center" prop="categoryName" /> <el-table-column label="分类" align="center" prop="categoryName" />
<el-table-column <el-table-column
label="库存量" label="库存量"
align="center" align="right"
sortable
prop="count" prop="count"
:formatter="erpCountTableColumnFormatter" :formatter="erpCountTableColumnFormatter"
/> />

4
src/views/mes/producereport/AdminIndex.vue
Unescape Escape View File

@ -116,8 +116,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" prop="orgName" width="130px"/> <el-table-column label="工位" align="center" prop="orgName" width="130px"/>
<el-table-column label="计件时段" align="center" prop="reportTime" /> <el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计件时长" align="center" prop="totalTime" /> <el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="班别" align="center" prop="groupType"> <el-table-column label="班别" align="center" prop="groupType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" /> <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />

4
src/views/mes/producereport/DailyReportIndex.vue
Unescape Escape View File

@ -158,8 +158,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" prop="orgName" sortable/> <el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="计件时段" align="center" prop="reportTime" /> <el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计件时长" align="center" prop="totalTime" /> <el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="状态" align="center" prop="reportStatus"> <el-table-column label="状态" align="center" prop="reportStatus">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />

4
src/views/mes/producereport/ProduceReportForm.vue
Unescape Escape View File

@ -83,12 +83,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="计件时段" prop="reportTime"> <el-form-item label="计时时段" prop="reportTime">
<el-input v-model="formData.reportTime" placeholder="请输入计件时段" /> <el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="计件时长" prop="totalTime"> <el-form-item label="计时时长" prop="totalTime">
<el-input-number v-model="formData.totalTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/> <el-input-number v-model="formData.totalTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/mes/producereport/components/AdminReplaceForm.vue
Unescape Escape View File

@ -99,12 +99,12 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="计件时段" prop="reportTime"> <el-form-item label="计时时段" prop="reportTime">
<el-input v-model="formData.reportTime" placeholder="请输入计件时段" /> <el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="计件时长" prop="totalTime"> <el-form-item label="计时时长/h" prop="totalTime">
<el-input-number v-model="formData.totalTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/> <el-input-number v-model="formData.totalTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/mes/producereport/index.vue
Unescape Escape View File

@ -99,8 +99,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工位" align="center" prop="orgName" width="130px"/> <el-table-column label="工位" align="center" prop="orgName" width="130px"/>
<el-table-column label="计件时段" align="center" prop="reportTime" /> <el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计件时长" align="center" prop="totalTime" /> <el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="状态" align="center" prop="reportStatus"> <el-table-column label="状态" align="center" prop="reportStatus">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" /> <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />

Write Preview
Loading…
Cancel
Save