diff --git a/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml b/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml
index 54172a9..d9dcdbd 100644
--- a/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml
+++ b/measurement/src/main/resources/mapper/measurement/bill/PoundBillMapper.xml
@@ -97,8 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and billstate = #{billstate}
and usrcode = #{usrcode}
and carno like concat('%', #{carno}, '%')
- and wghmqty = #{wghmqty}
- and empmqty = #{empmqty}
+ and wghdt between #{params.beginWghdt} and #{params.endWghdt}
+ and empdt between #{params.beginEmpdt} and #{params.endEmpdt}
and netmqty = #{netmqty}
and wghdt = #{wghdt}
and empdt = #{empdt}
diff --git a/ruoyi-ui/src/api/measurement/util/util.js b/ruoyi-ui/src/api/measurement/util/util.js
new file mode 100644
index 0000000..396812e
--- /dev/null
+++ b/ruoyi-ui/src/api/measurement/util/util.js
@@ -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}`;
+}
diff --git a/ruoyi-ui/src/components/SearchSelect/searchdata.js b/ruoyi-ui/src/components/SearchSelect/searchdata.js
index b78b720..660e821 100644
--- a/ruoyi-ui/src/components/SearchSelect/searchdata.js
+++ b/ruoyi-ui/src/components/SearchSelect/searchdata.js
@@ -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',
diff --git a/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue b/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
index df13935..ba9a57c 100644
--- a/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
+++ b/ruoyi-ui/src/views/measurement/bill/poundbill/index.vue
@@ -27,85 +27,27 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
-
-
-
-
-
+
-
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ >
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ >
-
-
-
+
搜索
@@ -215,6 +153,7 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
row-key="id"
+ border
>
@@ -223,8 +162,8 @@
-
-
+
+
@@ -253,22 +192,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -280,33 +255,37 @@
-
+
-
+
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -625,10 +604,17 @@
diff --git a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
index f7691d3..01b9a41 100644
--- a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
+++ b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
@@ -260,7 +260,11 @@
-
+
+
+
+
+
-
-
+
+
@@ -399,10 +403,10 @@
-
-
-
-
+
+
+
+
@@ -410,10 +414,10 @@
-
-
-
-
+
+
+
+
@@ -427,7 +431,7 @@
-
+
@@ -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;
diff --git a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
index bed2f4a..86242e6 100644
--- a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
+++ b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
@@ -114,7 +114,7 @@
ref = "mstBillTable"
@row-click="handleMstBillClick"
>
-
+