1.调整倒短磅界面和逻辑。
This commit is contained in:
parent
b6d9def4be
commit
7aae3780d1
|
|
@ -63,7 +63,7 @@ public class PoundBill extends BaseEntity
|
|||
@Excel(name = "过皮重时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date empdt;
|
||||
|
||||
@Excel(name = "过磅申请/主榜单id")
|
||||
@Excel(name = "过磅申请/主磅单id")
|
||||
private String appliid;
|
||||
|
||||
/** 原磅日期 */
|
||||
|
|
@ -113,8 +113,8 @@ public class PoundBill extends BaseEntity
|
|||
@Excel(name = "计量单位")
|
||||
private String msrname;
|
||||
|
||||
/** 榜点 */
|
||||
@Excel(name = "榜点")
|
||||
/** 磅点 */
|
||||
@Excel(name = "磅点")
|
||||
private String poundid;
|
||||
|
||||
/** 磅点名称 */
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<sql id="selectPoundBillVo">
|
||||
select id, billstate, usrcode, carno, wghmqty, empmqty, netmqty, wghdt, empdt, srcpunmqty, srcwghmqty, srcempmqty, srcnetmqty, itmname, itmcode, bundleNo, wghdtoprname, empdtoprname, specification, msrname, poundid, poundname, empsysid, empusrcode, wghsysid, wghusrcode, recunitid, recunitname, sendunitid, sendunitname, trnunitid, trnunitname, bsnunitid, bsnunitname, bsndptid, bsndptname, wghtype, scltype, cardriver, srcblltype, pondsrc, wetusrcode, srcbllusrcode, remark, boilerno,agnstatus,agngrossmqty,agntaremqty,agnnetmqty,ductmqty,ductmqtypre, steeno, unitlen, indexid, carnolz, steeltype, linetype, batno, lzno, lqty, bdcode, crtorgid, printcount, zgsId, zgsName, fid, fentity_fentryid, isinuse, crtdt, crtopr,oaOrgNumber,inStockNumber,inStockName,outStockNumber,outStockName, lstedtdt, lstedtopr from t_data_poundbill
|
||||
select id, billstate, usrcode, carno, wghmqty, empmqty, netmqty, wghdt, empdt,appliid, srcpunmqty, srcwghmqty, srcempmqty, srcnetmqty, itmname, itmcode, bundleNo, wghdtoprname, empdtoprname, specification, msrname, poundid, poundname, empsysid, empusrcode, wghsysid, wghusrcode, recunitid, recunitname, sendunitid, sendunitname, trnunitid, trnunitname, bsnunitid, bsnunitname, bsndptid, bsndptname, wghtype, scltype, cardriver, srcblltype, pondsrc, wetusrcode, srcbllusrcode, remark, boilerno,agnstatus,agngrossmqty,agntaremqty,agnnetmqty,ductmqty,ductmqtypre, steeno, unitlen, indexid, carnolz, steeltype, linetype, batno, lzno, lqty, bdcode, crtorgid, printcount, zgsId, zgsName, fid, fentity_fentryid, isinuse, crtdt, crtopr,oaOrgNumber,inStockNumber,inStockName,outStockNumber,outStockName, lstedtdt, lstedtopr from t_data_poundbill
|
||||
</sql>
|
||||
|
||||
<select id="selectPoundBillList" parameterType="PoundBill" resultMap="PoundBillResult">
|
||||
|
|
|
|||
|
|
@ -242,12 +242,75 @@
|
|||
@row-click="handlePoundBillClick"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="按钮1" align="center" prop="id" />
|
||||
<el-table-column label="状态" align="center" prop="billstate">
|
||||
<!-- <el-table-column label="按钮1" align="center" prop="id" />-->
|
||||
<el-table-column label="主榜单号" align="center" prop="appliid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.pound_status" :value="scope.row.billstate"/>
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.appliid"
|
||||
params = "t_data_poundmst;id;usrcode"
|
||||
where=""
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="榜单号" align="center" prop="usrcode" width="200px"/>
|
||||
|
||||
<el-table-column label="发货单位" align="center" prop="sendunitid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.sendunitid"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'shippingCompany'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收货单位" align="center" prop="recunitid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.recunitid"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'receivingCompany'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="品名" align="center" prop="itmcode" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.itmcode"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'productName'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="车号" align="center" prop="carno"/>
|
||||
<el-table-column label="司机" align="center" prop="cardriver"/>
|
||||
<el-table-column label="毛重" align="center" prop="wghmqty"/>
|
||||
<el-table-column label="皮重" align="center" prop="empmqty"/>
|
||||
<el-table-column label="净重" align="center" prop="netmqty"/>
|
||||
<el-table-column label="过毛时间" align="center" prop="wghdt">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.wghdt, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="过毛司磅员" align="center" prop="wghdtoprname"/>
|
||||
<el-table-column label="过皮时间" align="center" prop="empdt">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.empdt, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="过皮司磅员" align="center" prop="empdtoprname"/>
|
||||
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="queryPageParams.poundBillDetail.total>0"
|
||||
|
|
@ -269,59 +332,135 @@
|
|||
<el-form :model="queryParams" v-show="activeTab === 'tareRequest'" ref="queryForm" size="small" :inline="true" label-width="68px">
|
||||
<el-form-item label="起始日期" prop="lstedtdt">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.lstedtdt"
|
||||
v-model="queryPageParams.poundBillFull.queryStart"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择最后修改时间">
|
||||
placeholder=""
|
||||
@keyup.enter.native="handleQueryPoundBillFullListFirst">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="截止日期" prop="lstedtdt">
|
||||
<el-date-picker clearable
|
||||
v-model="queryParams.lstedtdt"
|
||||
v-model="queryPageParams.poundBillFull.queryEnd"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择最后修改时间">
|
||||
placeholder=""
|
||||
@keyup.enter.native="handleQueryPoundBillFullListFirst">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="车号" prop="carno" label-width="40">
|
||||
<el-input
|
||||
v-model="queryParams.carno"
|
||||
v-model="queryPageParams.poundBillFull.carno"
|
||||
placeholder="请输入车号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
@keyup.enter.native="handleQueryPoundBillFullListFirst"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="磅单号" prop="usrcode" label-width="40">
|
||||
<el-input
|
||||
v-model="queryParams.usrcode"
|
||||
v-model="queryPageParams.poundBillFull.usrcode"
|
||||
placeholder="请输入磅单号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
@keyup.enter.native="handleQueryPoundBillFullListFirst"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-button class="transition-all duration-200" type="primary" size="mini" @click="handleQuery">查询磅单</el-button>
|
||||
<el-button class="transition-all duration-200" type="primary" size="mini" @click="handleQueryPoundBillFullListFirst">查询磅单</el-button>
|
||||
</el-form>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="operationpoundList"
|
||||
v-loading="poundBillFullLoading"
|
||||
:data="poundBillFullList"
|
||||
border
|
||||
stripe
|
||||
height="500"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="按钮2" align="center" prop="id" />
|
||||
<el-table-column label="状态" align="center" prop="billstate">
|
||||
<el-table-column label="主榜单号" align="center" prop="appliid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.pound_status" :value="scope.row.billstate"/>
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.appliid"
|
||||
params = "t_data_poundmst;id;usrcode"
|
||||
where=""
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="榜单号" align="center" prop="usrcode" width="200px"/>
|
||||
|
||||
<el-table-column label="发货单位" align="center" prop="sendunitid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.sendunitid"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'shippingCompany'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收货单位" align="center" prop="recunitid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.recunitid"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'receivingCompany'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="承运单位" align="center" prop="trnunitid" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.trnunitid"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'teamOrCarrier'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="品名" align="center" prop="itmcode" width="200px">
|
||||
<template slot-scope="scope">
|
||||
<search-select
|
||||
:disabled = "true"
|
||||
v-model="scope.row.itmcode"
|
||||
params = "t_data_pounddata;usrcode;concat(name,' ',usrcode)"
|
||||
where="type = 'productName'"
|
||||
orderby="usrcode asc"
|
||||
class="search-select-custom-disabled"
|
||||
></search-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="车号" align="center" prop="carno"/>
|
||||
<el-table-column label="司机" align="center" prop="cardriver"/>
|
||||
<el-table-column label="毛重" align="center" prop="wghmqty"/>
|
||||
<el-table-column label="皮重" align="center" prop="empmqty"/>
|
||||
<el-table-column label="净重" align="center" prop="netmqty"/>
|
||||
<el-table-column label="过毛时间" align="center" prop="wghdt">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.wghdt, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="过毛司磅员" align="center" prop="wghdtoprname"/>
|
||||
<el-table-column label="过皮时间" align="center" prop="empdt">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.empdt, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="过皮司磅员" align="center" prop="empdtoprname"/>
|
||||
<el-table-column label="备注" align="center" prop="remark" width="200px"/>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="queryPageParams.poundBillFull.total>0"
|
||||
v-show="queryPageParams.poundBillFull.total>0 && activeTab === 'tareRequest'"
|
||||
:total="queryPageParams.poundBillFull.total"
|
||||
:page.sync="queryPageParams.poundBillFull.pageNum"
|
||||
:limit.sync="queryPageParams.poundBillFull.pageSize"
|
||||
@pagination="handleSearchTareappli"
|
||||
@pagination="handleQueryPoundBillFullList"
|
||||
/>
|
||||
</el-col>
|
||||
<el-col :span="4" v-show="activeTab === 'weighingRequest'">
|
||||
|
|
@ -734,7 +873,12 @@ export default {
|
|||
poundBillFull: {
|
||||
total: 0,
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
pageSize: 10,
|
||||
poundid: "",
|
||||
queryStart: "",
|
||||
queryEnd: "",
|
||||
carno: "",
|
||||
usrcode: "",
|
||||
},
|
||||
historyPound:{
|
||||
total:0,
|
||||
|
|
@ -1244,6 +1388,36 @@ watch: {
|
|||
}
|
||||
})
|
||||
},
|
||||
//点击查询磅单按钮，设置页数为1
|
||||
|
||||
handleQueryPoundBillFullListFirst(){
|
||||
this.queryPageParams.poundBillFull.pageNum = 1;
|
||||
this.handleQueryPoundBillFullList();
|
||||
},
|
||||
//查询完成的榜单数据
|
||||
handleQueryPoundBillFullList(){
|
||||
this.poundBillFullLoading = true;
|
||||
var thisqueryParams = {
|
||||
billstate:"2",
|
||||
isinuse:"Y"
|
||||
}
|
||||
//设置物理磅点作为查询条件
|
||||
thisqueryParams.poundid = this.truepoundData.id;
|
||||
//设置主榜单ID作为查询条件
|
||||
thisqueryParams.appliid = this.mstBillFormData.selectedIds[0];
|
||||
thisqueryParams.carno = this.queryPageParams.poundBillFull.carno;
|
||||
thisqueryParams.usrcode = this.queryPageParams.poundBillFull.usrcode;
|
||||
thisqueryParams.params = {};
|
||||
thisqueryParams.params.queryStart = this.queryPageParams.poundBillFull.queryStart;
|
||||
thisqueryParams.params.queryEnd = this.queryPageParams.poundBillFull.queryEnd;
|
||||
thisqueryParams.pageNum = this.queryPageParams.poundBillFull.pageNum;
|
||||
thisqueryParams.pageSize = this.queryPageParams.poundBillFull.pageSize;
|
||||
listPoundbill(thisqueryParams).then(response => {
|
||||
this.queryPageParams.poundBillFull.total = response.total;
|
||||
this.poundBillFullList = response.rows;
|
||||
this.poundBillFullLoading = false;
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue