xiaosuonian
/
yixindibang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.完善榜单信息前端界面。 

2.完善各榜单称重界面，前端逻辑。
This commit is contained in:
xiaosuonian 2025-07-16 14:02:35 +08:00
parent 9021b079e8
commit cd925d4f7c
6 changed files with 206 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml
View File

@ -97,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="billstate != null and billstate != ''"> and billstate = #{billstate}</if>
<if test="usrcode != null and usrcode != ''"> and usrcode = #{usrcode}</if>
<if test="carno != null and carno != ''"> and carno like concat('%', #{carno}, '%')</if>
<if test="wghmqty != null "> and wghmqty = #{wghmqty}</if>
<if test="empmqty != null "> and empmqty = #{empmqty}</if>
<if test="params.beginWghdt != null and params.beginWghdt != '' and params.endWghdt != null and params.endWghdt != ''"> and wghdt between #{params.beginWghdt} and #{params.endWghdt}</if>
<if test="params.beginEmpdt != null and params.beginEmpdt != '' and params.endEmpdt != null and params.endEmpdt != ''"> and empdt between #{params.beginEmpdt} and #{params.endEmpdt}</if>
<if test="netmqty != null "> and netmqty = #{netmqty}</if>
<if test="wghdt != null "> and wghdt = #{wghdt}</if>
<if test="empdt != null "> and empdt = #{empdt}</if>

12
ruoyi-ui/src/api/measurement/util/util.js Normal file
View File

@ -0,0 +1,12 @@
export function formatDate(date) {
if (!date) return '';
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
const hours = String(date.getHours()).padStart(2, '0'); // 24小时制
const minutes = String(date.getMinutes()).padStart(2, '0');
const seconds = String(date.getSeconds()).padStart(2, '0');
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}

7
ruoyi-ui/src/components/SearchSelect/searchdata.js
View File

@ -1,6 +1,13 @@
// searchData.js - 搜索配置的独立模块
export const selectConfigs =[
//所有物理磅
{
key: 'alltruepound',
params: 't_data_truepound;id;concat(name,\' \',usrcode)',
where: "",
orderby: 'usrcode asc'
},
// 出厂入厂磅
{
key: 'outinpound',

281
ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
View File

@ -27,85 +27,27 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="毛重" prop="wghmqty">
<el-input
v-model="queryParams.wghmqty"
placeholder="请输入毛重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="皮重" prop="empmqty">
<el-input
v-model="queryParams.empmqty"
placeholder="请输入皮重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="净重" prop="netmqty">
<el-input
v-model="queryParams.netmqty"
placeholder="请输入净重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="过重磅时间" prop="wghdt">
<el-date-picker clearable
v-model="queryParams.wghdt"
type="date"
<el-form-item label="过重磅时间">
<el-date-picker
v-model="daterangeWghdt"
style="width: 240px"
value-format="yyyy-MM-dd"
placeholder="请选择过重磅时间">
</el-date-picker>
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="过皮重时间" prop="empdt">
<el-date-picker clearable
v-model="queryParams.empdt"
type="date"
<el-form-item label="过皮重时间">
<el-date-picker
v-model="daterangeEmpdt"
style="width: 240px"
value-format="yyyy-MM-dd"
placeholder="请选择过皮重时间">
</el-date-picker>
</el-form-item>
<el-form-item label="原磅单号" prop="srcpunmqty">
<el-input
v-model="queryParams.srcpunmqty"
placeholder="请输入原磅单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原毛重" prop="srcwghmqty">
<el-input
v-model="queryParams.srcwghmqty"
placeholder="请输入原毛重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原皮重" prop="srcempmqty">
<el-input
v-model="queryParams.srcempmqty"
placeholder="请输入原皮重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原净重" prop="srcnetmqty">
<el-input
v-model="queryParams.srcnetmqty"
placeholder="请输入原净重"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="名称" prop="itmname">
<el-input
v-model="queryParams.itmname"
placeholder="请输入名称"
clearable
@keyup.enter.native="handleQuery"
/>
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="毛重司磅员" prop="wghdtoprname">
<el-input
@ -140,14 +82,10 @@
/>
</el-form-item>
<el-form-item label="榜点" prop="poundid">
<el-select v-model="queryParams.poundid" placeholder="请选择榜点" clearable>
<el-option
v-for="dict in dict.type.pound"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<search-select v-model="queryParams.poundid"
clearable
:options="getOptionsByKey('alltruepound')"
></search-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -215,6 +153,7 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
row-key="id"
border
>
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="id" />-->
@ -223,8 +162,8 @@
<dict-tag :options="dict.type.pound_status" :value="scope.row.billstate"/>
</template>
</el-table-column>
<el-table-column label="磅单号" align="center" prop="usrcode" />
<el-table-column label="车号/车厢" align="center" prop="carno" />
<el-table-column label="磅单号" align="center" prop="usrcode" width="150px"/>
<el-table-column label="车号/车厢" align="center" prop="carno" width="100px" />
<el-table-column label="毛重" align="center" prop="wghmqty" />
<el-table-column label="皮重" align="center" prop="empmqty" />
<el-table-column label="净重" align="center" prop="netmqty" />
@ -253,22 +192,58 @@
<el-table-column label="皮重司磅员" align="center" prop="empdtoprname" />
<el-table-column label="规格" align="center" prop="specification" />
<el-table-column label="计量单位" align="center" prop="msrname" />
<el-table-column label="榜点" align="center" prop="poundid"/>
<el-table-column label="磅点名称" align="center" prop="poundname" />
<el-table-column label="皮重称重id" align="center" prop="empsysid" />
<el-table-column label="皮重单号" align="center" prop="empusrcode" />
<el-table-column label="毛重id" align="center" prop="wghsysid" />
<el-table-column label="毛重单号" align="center" prop="wghusrcode" />
<el-table-column label="收货单位" align="center" prop="recunitid" />
<el-table-column label="收货单位名称" align="center" prop="recunitname" />
<el-table-column label="发货单位" align="center" prop="sendunitid" />
<el-table-column label="发货单位名称" align="center" prop="sendunitname" />
<el-table-column label="承运单位" align="center" prop="trnunitid" />
<el-table-column label="承运单位名称" align="center" prop="trnunitname" />
<el-table-column label="业务单位" align="center" prop="bsnunitid" />
<el-table-column label="业务单位名称" align="center" prop="bsnunitname" />
<el-table-column label="业务部门id" align="center" prop="bsndptid" />
<el-table-column label="业务部门名称" align="center" prop="bsndptname" />
<el-table-column label="榜点" align="center" prop="poundid" width="200px">
<template slot-scope="scope">
<search-select
:disabled = "true"
v-model="scope.row.poundid"
:options = "getOptionsByKey('alltruepound')"
class="search-select-custom-disabled"
></search-select>
</template>
</el-table-column>
<!-- <el-table-column label="磅点名称" align="center" prop="poundname" />-->
<!-- <el-table-column label="皮重称重id" align="center" prop="empsysid" />-->
<el-table-column label="皮重单号" align="center" prop="empusrcode" width="200px" />
<!-- <el-table-column label="毛重id" align="center" prop="wghsysid" />-->
<!-- <el-table-column label="毛重单号" align="center" prop="wghusrcode" />-->
<el-table-column label="收货单位" align="center" prop="recunitid" width="200px" >
<template slot-scope="scope">
<search-select
:disabled = "true"
v-model="scope.row.recunitid"
:options = "getOptionsByKey('recunit')"
class="search-select-custom-disabled"
></search-select>
</template>
</el-table-column>
<!-- <el-table-column label="收货单位名称" align="center" prop="recunitname" />-->
<el-table-column label="发货单位" align="center" prop="sendunitid" width="200px" >
<template slot-scope="scope">
<search-select
:disabled = "true"
v-model="scope.row.sendunitid"
:options = "getOptionsByKey('sendunit')"
class="search-select-custom-disabled"
></search-select>
</template>
</el-table-column>
<!-- <el-table-column label="发货单位名称" align="center" prop="sendunitname" />-->
<el-table-column label="承运单位" align="center" prop="trnunitid" width="200px" >
<template slot-scope="scope">
<search-select
:disabled = "true"
v-model="scope.row.trnunitid"
:options = "getOptionsByKey('trnunit')"
class="search-select-custom-disabled"
></search-select>
</template>
</el-table-column>
<!-- <el-table-column label="承运单位名称" align="center" prop="trnunitname" />-->
<!-- <el-table-column label="业务单位" align="center" prop="bsnunitid" />-->
<!-- <el-table-column label="业务单位名称" align="center" prop="bsnunitname" />-->
<!-- <el-table-column label="业务部门id" align="center" prop="bsndptid" />-->
<!-- <el-table-column label="业务部门名称" align="center" prop="bsndptname" />-->
<el-table-column label="过磅类型" align="center" prop="wghtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.wghtype"/>
@ -280,33 +255,37 @@
</template>
</el-table-column>
<el-table-column label="驾驶员" align="center" prop="cardriver" />
<el-table-column label="来源单据类型" align="center" prop="srcblltype">
<el-table-column label="来源单据类型" align="center" prop="srcblltype" width="120px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.srcblltype"/>
<dict-tag :options="dict.type.oa_formid" :value="scope.row.srcblltype"/>
</template>
</el-table-column>
<el-table-column label="申请来源" align="center" prop="pondsrc" />
<el-table-column label="申请单号" align="center" prop="wetusrcode" />
<el-table-column label="申请单号" align="center" prop="wetusrcode" width="150px" />
<el-table-column label="来源编号" align="center" prop="srcbllusrcode" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="炉号" align="center" prop="boilerno" />
<el-table-column label="复磅状态" align="center" prop="agnstatus" />
<el-table-column label="复磅状态" align="center" prop="agnstatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.reweighing_status" :value="scope.row.agnstatus"/>
</template>
</el-table-column>
<el-table-column label="复磅前毛重" align="center" prop="agngrossmqty" />
<el-table-column label="复磅前皮重" align="center" prop="agntaremqty" />
<el-table-column label="复磅前净重" align="center" prop="agnnetmqty" />
<el-table-column label="扣减吨位" align="center" prop="ductmqty" />
<el-table-column label="扣减比例" align="center" prop="ductmqtypre" />
<el-table-column label="钢号" align="center" prop="steeno" />
<el-table-column label="长度" align="center" prop="unitlen" />
<el-table-column label="序号" align="center" prop="indexid" />
<el-table-column label="冷轧支数" align="center" prop="carnolz" />
<el-table-column label="钢种" align="center" prop="steeltype" />
<el-table-column label="线材类型" align="center" prop="linetype" />
<el-table-column label="批号" align="center" prop="batno" />
<el-table-column label="连铸" align="center" prop="lzno" />
<el-table-column label="支数" align="center" prop="lqty" />
<el-table-column label="编号" align="center" prop="bdcode" />
<el-table-column label="登记部门" align="center" prop="crtorgid" />
<!-- <el-table-column label="长度" align="center" prop="unitlen" />-->
<!-- <el-table-column label="序号" align="center" prop="indexid" />-->
<!-- <el-table-column label="冷轧支数" align="center" prop="carnolz" />-->
<!-- <el-table-column label="钢种" align="center" prop="steeltype" />-->
<!-- <el-table-column label="线材类型" align="center" prop="linetype" />-->
<!-- <el-table-column label="批号" align="center" prop="batno" />-->
<!-- <el-table-column label="连铸" align="center" prop="lzno" />-->
<!-- <el-table-column label="支数" align="center" prop="lqty" />-->
<!-- <el-table-column label="编号" align="center" prop="bdcode" />-->
<!-- <el-table-column label="登记部门" align="center" prop="crtorgid" />-->
<el-table-column label="是否启用" align="center" prop="isinuse">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isinuse"/>
@ -625,10 +604,17 @@
<script>
import { listPoundbill,getNumber, getPoundbill, delPoundbill, addPoundbill, updatePoundbill, returnPound } from "@/api/measurement/bill/poundbill"
import {getSearchSelectData} from "@/api/tool/gen";
//引入searchData组件
import {selectConfigs} from "@/components/SearchSelect/searchdata.js";
import SearchSelect from "@/components/SearchSelect/index.vue";
//引入时间格式化方法
import { formatDate } from "@/api/measurement/util/util";
export default {
name: "Poundbill",
dicts: ['pound_status', 'pound', 'sys_yes_no','oa_formid'],
components: {SearchSelect},
dicts: ['pound_status', 'pound', 'sys_yes_no','oa_formid','reweighing_status'],
data() {
return {
// 遮罩层
@ -651,6 +637,10 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 过毛时间
daterangeWghdt: [],
// 过重时间
daterangeEmpdt: [],
// 查询参数
queryParams: {
pageNum: 1,
@ -717,16 +707,38 @@ export default {
form: {},
// 表单校验
rules: {
}
},
searchData: {
optionsMap: {},
selectConfigs:selectConfigs
},
}
},
created() {
this.getList()
this.loadAllSelectOptions();
this.getList();
},
methods: {
/** 查询磅单信息列表 */
getList() {
async getList() {
this.loading = true
this.queryParams.params = {}
if (null != this.daterangeWghdt && '' !== this.daterangeWghdt && this.daterangeWghdt.length > 0) {
this.queryParams.params["beginWghdt"] = this.daterangeWghdt[0]
const endDate = new Date(this.daterangeWghdt[1]);
// 设置时分秒为 23:59:59
endDate.setHours(23, 59, 59, 999);
const endDateStr = formatDate(endDate);
this.queryParams.params["endWghdt"] = endDateStr;
}
if (null != this.daterangeEmpdt && '' !== this.daterangeEmpdt && this.daterangeEmpdt.length > 0) {
this.queryParams.params["beginEmpdt"] = this.daterangeEmpdt[0]
const endDate = new Date(this.daterangeEmpdt[1]);
// 设置时分秒为 23:59:59
endDate.setHours(23, 59, 59, 999);
const endDateStr = formatDate(endDate);
this.queryParams.params["endEmpdt"] = endDateStr;
}
listPoundbill(this.queryParams).then(response => {
this.poundbillList = response.rows
this.total = response.total
@ -810,6 +822,8 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.daterangeWghdt = []
this.daterangeEmpdt = []
this.resetForm("queryForm")
this.handleQuery()
},
@ -902,7 +916,32 @@ export default {
// 切换选中状态
this.$refs.table1.toggleRowSelection(row, !isSelected);
// this.$refs.table1.toggleRowSelection(row, true);
}
},
//searchSelect相关方法
buildCacheKey({ params, where, groupby = '', orderby = '' }) {
return `${params}|${where}|${groupby}|${orderby}`;
},
async loadAllSelectOptions() {
for (const cfg of this.searchData.selectConfigs) {
const key = this.buildCacheKey(cfg);
if (!this.searchData.optionsMap[key]) {
const [tableName, value, label] = cfg.params.split(';');
const res = await getSearchSelectData({
tableName: tableName,
value: value,
label: label,
where: cfg.where,
groupby: cfg.groupby,
orderby: cfg.orderby
});
this.$set(this.searchData.optionsMap, key, res.code === 200 ? res.data : []);
}
}
},
getOptionsByKey(key) {
const cfg = this.searchData.selectConfigs.find(c => c.key === key);
return this.searchData.optionsMap[this.buildCacheKey(cfg)] || [];
},
}
}
</script>

37
ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
View File

@ -260,7 +260,11 @@
<el-table-column label="收货单位" align="center" prop="recentname" />
<el-table-column label="承运单位" align="center" prop="trnentname" />
<el-table-column label="物料编码" align="center" prop="itmno" />
<el-table-column label="来源单据类型" align="center" prop="srcbilltype" />
<el-table-column label="来源单据类型" align="center" prop="srcbilltype" >
<template slot-scope="scope">
<dict-tag :options="dict.type.oa_formid" :value="scope.row.srcbilltype"/>
</template>
</el-table-column>
<el-table-column label="来源单号" align="center" prop="srcbillusrcode" />
</el-table>
<pagination
@ -370,8 +374,8 @@
<dict-tag :options="dict.type.pound_status" :value="scope.row.billstate"/>
</template>
</el-table-column>
<el-table-column label="磅单号" align="center" prop="usrcode" />
<el-table-column label="车号/车厢" align="center" prop="carno" />
<el-table-column label="磅单号" align="center" prop="usrcode" width="250px" />
<el-table-column label="车号/车厢" align="center" prop="carno" width="150px"/>
<el-table-column label="毛重" align="center" prop="wghmqty" />
<el-table-column label="皮重" align="center" prop="empmqty" />
<el-table-column label="净重" align="center" prop="netmqty" />
@ -399,10 +403,10 @@
<dict-tag :options="dict.type.pound" :value="scope.row.poundid"/>
</template>
</el-table-column>
<el-table-column label="磅点名称" align="center" prop="poundname" />
<el-table-column label="皮重称重id" align="center" prop="empsysid" />
<el-table-column label="皮重单号" align="center" prop="empusrcode" />
<el-table-column label="毛重id" align="center" prop="wghsysid" />
<el-table-column label="磅点名称" align="center" prop="poundname" width="150px"/>
<!-- <el-table-column label="皮重称重id" align="center" prop="empsysid" />-->
<el-table-column label="皮重单号" align="center" prop="empusrcode" width="150px"/>
<!-- <el-table-column label="毛重id" align="center" prop="wghsysid" />-->
<el-table-column label="毛重单号" align="center" prop="wghusrcode" />
<el-table-column label="收货单位" align="center" prop="recunitid" />
<el-table-column label="收货单位名称" align="center" prop="recunitname" />
@ -410,10 +414,10 @@
<el-table-column label="发货单位名称" align="center" prop="sendunitname" />
<el-table-column label="承运单位" align="center" prop="trnunitid" />
<el-table-column label="承运单位名称" align="center" prop="trnunitname" />
<el-table-column label="业务单位" align="center" prop="bsnunitid" />
<el-table-column label="业务单位名称" align="center" prop="bsnunitname" />
<el-table-column label="业务部门id" align="center" prop="bsndptid" />
<el-table-column label="业务部门名称" align="center" prop="bsndptname" />
<!-- <el-table-column label="业务单位" align="center" prop="bsnunitid" />-->
<!-- <el-table-column label="业务单位名称" align="center" prop="bsnunitname" />-->
<!-- <el-table-column label="业务部门id" align="center" prop="bsndptid" />-->
<!-- <el-table-column label="业务部门名称" align="center" prop="bsndptname" />-->
<el-table-column label="过磅类型" align="center" prop="wghtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.wghtype"/>
@ -427,7 +431,7 @@
<el-table-column label="驾驶员" align="center" prop="cardriver" />
<el-table-column label="来源单据类型" align="center" prop="srcblltype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.srcblltype"/>
<dict-tag :options="dict.type.oa_formid" :value="scope.row.srcblltype"/>
</template>
</el-table-column>
<el-table-column label="申请来源" align="center" prop="pondsrc" />
@ -502,7 +506,7 @@ import {selectConfigs} from "@/components/SearchSelect/searchdata.js";
export default {
name: "Outinpound",
components: {SearchSelect},
dicts: ['pound_status', 'pound', 'sys_yes_no','weighttype','poundoutintype'],
dicts: ['pound_status', 'pound', 'sys_yes_no','weighttype','poundoutintype','oa_formid'],
data() {
return {
// 遮罩层
@ -1057,6 +1061,11 @@ export default {
},
//查询磅单
handleQueryPoundList(){
//查看是否选中磅点
if(this.queryParams.poundid == null || this.queryParams.poundid === ""){
this.$message.error("请选择磅点！");
return;
}
this.loading = true;
var thisqueryParams = {
@ -1068,6 +1077,8 @@ export default {
thisqueryParams.params.queryEnd = this.queryPageParams.weightInfo.queryEnd;
thisqueryParams.pageNum = this.queryPageParams.weightInfo.pageNum;
thisqueryParams.pageSize = this.queryPageParams.weightInfo.pageSize;
//设置物理磅点。
thisqueryParams.poundid = this.queryParams.poundid;
listPoundbill(thisqueryParams).then(response => {
this.queryPageParams.weightInfo.total = response.total;
this.poundbillList = response.rows;

2
ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
View File

@ -114,7 +114,7 @@
ref = "mstBillTable"
@row-click="handleMstBillClick"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="打印次数" align="center" prop="id" />-->
<el-table-column label="单号" align="center" prop="usrcode" width="180"/>
<el-table-column label="榜单日期" align="center" prop="bsndt" width="180">