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

1.倒短磅，铁水磅添加完成状态筛选条件

This commit is contained in:
ptt 2025-07-08 10:53:27 +08:00
parent 14b5f68377
commit 5777f1dae5
2 changed files with 30 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue
View File

@ -5,14 +5,6 @@
<el-row style="display: inline-block;width: 260px"> <el-row style="display: inline-block;width: 260px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="磅点" prop="poundid" label-width="40"> <el-form-item label="磅点" prop="poundid" label-width="40">
<!-- <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" <search-select v-model="queryParams.poundid"
:options = "getOptionsByKey('moltenironpound')" :options = "getOptionsByKey('moltenironpound')"
></search-select> ></search-select>
@ -36,18 +28,7 @@
<el-radio-group v-model="queryParams.weighttype"> <el-radio-group v-model="queryParams.weighttype">
<el-radio v-for="dict in dict.type.weighttype" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio> <el-radio v-for="dict in dict.type.weighttype" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
<!-- <el-button type="primary" size="mini" @click="handleQuery" style="width: 78px">生成榜单</el-button>-->
</el-form-item> </el-form-item>
<!-- <el-form-item label="车号" prop="carno">-->
<!-- <el-input-->
<!-- v-model="queryParams.carno"-->
<!-- placeholder="请输入车号"-->
<!-- style=""-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- <el-button type="primary" size="mini" @click="handleQuery" style="position: absolute;left: 150px;top: 2px;">刷新</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="重量" prop="1aaa"> <el-form-item label="重量" prop="1aaa">
<el-input <el-input
v-model="queryParams.weight" v-model="queryParams.weight"
@ -62,14 +43,6 @@
<el-row style="display: inline-block;width: 300px"> <el-row style="display: inline-block;width: 300px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="收货单位" prop="recunitid"> <el-form-item label="收货单位" prop="recunitid">
<!-- <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="queryPageParams.mstBill.recunitid" <search-select v-model="queryPageParams.mstBill.recunitid"
:options = "getOptionsByKey('recunit')" :options = "getOptionsByKey('recunit')"
clearable clearable
@ -78,12 +51,6 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="品名" prop="itmcode"> <el-form-item label="品名" prop="itmcode">
<!-- <el-input-->
<!-- v-model="queryParams.poundname"-->
<!-- placeholder="请输入品名"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<search-select v-model="queryPageParams.mstBill.itmcode" <search-select v-model="queryPageParams.mstBill.itmcode"
:options = "getOptionsByKey('itmcode')" :options = "getOptionsByKey('itmcode')"
clearable clearable
@ -108,7 +75,17 @@
></search-select> ></search-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row style="display: inline-block;width: 100px">
<el-col>
<el-form-item prop="sendunitid">
<el-checkbox
v-model="queryPageParams.mstBill.bllstt"
:true-value="'2'"
:false-value="'1'"
>完成</el-checkbox>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -721,6 +698,7 @@ export default {
trnunitid:"",//运输单位 trnunitid:"",//运输单位
sendunitid:"",//发货单位 sendunitid:"",//发货单位
poundid:"",//业务磅点,java对象中存储为该字段。 poundid:"",//业务磅点,java对象中存储为该字段。
bllstt:"1",//完成状态
}, },
poundBillDetail: { poundBillDetail: {
total: 0, total: 0,

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

@ -1,19 +1,10 @@
<!--倒短--> <!--倒短-->
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-row style="display: inline-block;width: 260px"> <el-row style="display: inline-block;width: 260px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="磅点" prop="poundid" label-width="40"> <el-form-item label="磅点" prop="poundid" label-width="40">
<!-- <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" <search-select v-model="queryParams.poundid"
:options="this.getOptionsByKey('shortdispound')" :options="this.getOptionsByKey('shortdispound')"
></search-select> ></search-select>
@ -37,22 +28,11 @@
<el-radio-group v-model="queryParams.weighttype"> <el-radio-group v-model="queryParams.weighttype">
<el-radio v-for="dict in dict.type.weighttype" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio> <el-radio v-for="dict in dict.type.weighttype" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
<!-- <el-button type="primary" size="mini" @click="handleQuery" style="width: 78px">生成榜单</el-button>-->
</el-form-item> </el-form-item>
<!-- <el-form-item label="车号" prop="carno">-->
<!-- <el-input-->
<!-- v-model="queryParams.carno"-->
<!-- placeholder="请输入车号"-->
<!-- style=""-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- <el-button type="primary" size="mini" @click="handleQuery" style="position: absolute;left: 150px;top: 2px;">刷新</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="重量" prop="1aaa"> <el-form-item label="重量" prop="1aaa">
<el-input <el-input
v-model="queryParams.weight" v-model="queryParams.weight"
style="" style="width: 150px"
clearable clearable
readonly readonly
/> />
@ -63,14 +43,6 @@
<el-row style="display: inline-block;width: 300px"> <el-row style="display: inline-block;width: 300px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="收货单位" prop="recunitid"> <el-form-item label="收货单位" prop="recunitid">
<!-- <el-select v-model="queryParams.recunitid" 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="queryPageParams.mstBill.recunitid" <search-select v-model="queryPageParams.mstBill.recunitid"
:options="getOptionsByKey('recunit')" :options="getOptionsByKey('recunit')"
clearable clearable
@ -79,12 +51,6 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="品名" prop="itmcode"> <el-form-item label="品名" prop="itmcode">
<!-- <el-input-->
<!-- v-model="queryParams.itmcode"-->
<!-- placeholder="请输入品名"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<search-select v-model="queryPageParams.mstBill.itmcode" <search-select v-model="queryPageParams.mstBill.itmcode"
:options = "getOptionsByKey('itmcode')" :options = "getOptionsByKey('itmcode')"
clearable clearable
@ -110,9 +76,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row style="display: inline-block;width: 100px">
<el-col>
<el-form-item prop="sendunitid">
<el-checkbox
v-model="queryPageParams.mstBill.bllstt"
:true-value="'2'"
:false-value="'1'"
>完成</el-checkbox>
</el-form-item>
</el-col>
<el-col>
<el-form-item> <el-form-item>
<el-button type="primary" size="mini" @click="getEmpPoundData">新增皮重</el-button> <el-button type="primary" size="mini" @click="getEmpPoundData">新增皮重</el-button>
</el-form-item> </el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<!-- 主磅单信息 --> <!-- 主磅单信息 -->
@ -809,6 +788,7 @@ export default {
trnunitid:"",//运输单位 trnunitid:"",//运输单位
sendunitid:"",//发货单位 sendunitid:"",//发货单位
poundid:"",//业务磅点,java对象中存储为该字段。 poundid:"",//业务磅点,java对象中存储为该字段。
bllstt:"1",//业务磅点,java对象中存储为该字段。
}, },
poundBillDetail: { poundBillDetail: {
total: 0, total: 0,