diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
index dc4ac658..f37ffcea 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
@@ -116,10 +116,18 @@ public abstract class AbstractInManage {
String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time");
map.put("flag", "2");
- map.put("receive_code", receive_code);
- map.put("material_search", material_search);
- map.put("begin_time", begin_time);
- map.put("end_time", end_time);
+ if (StrUtil.isNotEmpty(receive_code)) {
+ map.put("bill_code", "%" +receive_code + "%");
+ }
+ if (StrUtil.isNotEmpty(material_search)) {
+ map.put("material_search", "%" +material_search + "%");
+ }
+ if (StrUtil.isNotEmpty(begin_time)) {
+ map.put("begin_time", begin_time.substring(0,10));
+ }
+ if (StrUtil.isNotEmpty(end_time)) {
+ map.put("end_time", end_time.substring(0,10));
+ }
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo;
}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java
index 2f2ace3a..2808d991 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java
@@ -27,8 +27,12 @@ public class RawManage extends InManage {
if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" +material_search + "%");
}
- map.put("begin_time", begin_time);
- map.put("end_time", end_time);
+ if (StrUtil.isNotEmpty(begin_time)) {
+ map.put("begin_time", begin_time.substring(0,10));
+ }
+ if (StrUtil.isNotEmpty(end_time)) {
+ map.put("end_time", end_time.substring(0,10));
+ }
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo;
}
diff --git a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue
index d37be379..fc805cd8 100644
--- a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue
@@ -152,10 +152,10 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
-
-
-
-
+
+
+
+
diff --git a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDtl.vue
index c8f06fe3..ea6d3e0f 100644
--- a/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/core/inbill/backinbill/AddDtl.vue
@@ -10,7 +10,16 @@
>
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -81,16 +90,16 @@
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
+import Date from '@/utils/datetime'
const start = new Date()
export default {
name: 'AddDtl',
dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'],
- components: { crudOperation, rrOperation, pagination, DateRangePicker },
+ components: { rrOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '用户',
@@ -98,9 +107,6 @@ export default {
crudMethod: {},
optShow: {
reset: true
- },
- query: {
- createTime: [start.daysAgo(7), new Date()]
}
})
},
@@ -118,6 +124,7 @@ export default {
return {
dialogVisible: false,
rows: [],
+ query_flag: true,
billtypes: [],
tableData: []
}
@@ -132,6 +139,11 @@ export default {
methods: {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.bill_type = '000501'
+ if (this.query_flag) {
+ this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
+ this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+ this.query_flag = false
+ }
return true
},
open() {
@@ -139,13 +151,13 @@ export default {
crudRawAssist.getType({ 'io_code': '0005', 'io_flag': '00', 'io_other': false }).then(res => {
this.billtypes = res
for (let i = 0; i < this.billtypes.length; i++) {
- debugger
if (this.billtypes[i].code === '000401' || this.billtypes[i].code === '000601') {
this.billtypes.splice(i, 1)
i--
}
}
})
+ this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
this.crud.toQuery()
},
close() {
@@ -160,6 +172,19 @@ export default {
activeFormat(row, column) {
return this.dict.label.IS_OR_NOT[row.is_active]
},
+ onInput() {
+ this.$forceUpdate()
+ },
+ mytoQuery(array1) {
+ if (array1 === null) {
+ this.crud.query.begin_time = ''
+ this.crud.query.end_time = ''
+ } else {
+ this.crud.query.begin_time = array1[0]
+ this.crud.query.end_time = array1[1]
+ }
+ this.crud.toQuery()
+ },
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection
diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDtl.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDtl.vue
index 483f499f..baca3768 100644
--- a/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/AddDtl.vue
@@ -11,7 +11,16 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -72,6 +81,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
+import Date from '@/utils/datetime'
const start = new Date()
export default {
@@ -84,9 +94,6 @@ export default {
crudMethod: {},
optShow: {
reset: true
- },
- query: {
- createTime: [start.daysAgo(7), new Date()]
}
})
},
@@ -104,6 +111,7 @@ export default {
return {
dialogVisible: false,
rows: [],
+ query_flag: true,
tableData: []
}
},
@@ -117,14 +125,33 @@ export default {
methods: {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.bill_type = '000101'
+ if (this.query_flag) {
+ this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
+ this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
+ this.query_flag = false
+ }
return true
},
open() {
+ this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
+ onInput() {
+ this.$forceUpdate()
+ },
+ mytoQuery(array1) {
+ if (array1 === null) {
+ this.crud.query.begin_time = ''
+ this.crud.query.end_time = ''
+ } else {
+ this.crud.query.begin_time = array1[0]
+ this.crud.query.end_time = array1[1]
+ }
+ this.crud.toQuery()
+ },
submit() {
this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection