提交 41cd0c36 authored 作者: 宋雄's avatar 宋雄

优化

上级 6cfc7c8e
NODE_ENV=development NODE_ENV=development
#VUE_APP_API_BASE_URL='http://192.168.0.119:9999' #VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
#VUE_APP_API_BASE_URL='http://192.168.0.100:9999' VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
VUE_APP_API_BASE_URL='http://220.203.25.212:9998' # VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
{ {
"name": "vue-antd-jeecg", "name": "vue-antd-jeecg",
"version": "3.4.3", "version": "3.4.3",
"private": true, "private": true,
......
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
.house-content-box { .house-content-box {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; // justify-content: space-between;
.box { .box {
box-sizing: border-box; box-sizing: border-box;
flex: none; flex: none;
......
...@@ -12,7 +12,6 @@ import store from '@/store' ...@@ -12,7 +12,6 @@ import store from '@/store'
export const JeecgListMixin = { export const JeecgListMixin = {
data(){ data(){
return { return {
createTimeValue: [],
/* 查询条件-请不要在queryParam中声明非字符串值的属性 */ /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
queryParam: {}, queryParam: {},
/* 数据源 */ /* 数据源 */
...@@ -152,9 +151,7 @@ export const JeecgListMixin = { ...@@ -152,9 +151,7 @@ export const JeecgListMixin = {
this.$refs.superQueryModal.show(); this.$refs.superQueryModal.show();
}, },
searchReset() { searchReset() {
this.createTimeValue = []
this.queryParam = {} this.queryParam = {}
this.initPageParams(this.queryParam);
this.loadData(1); this.loadData(1);
}, },
batchDel: function () { batchDel: function () {
......
...@@ -14,9 +14,14 @@ ...@@ -14,9 +14,14 @@
<j-input placeholder="收货人" v-model="queryParam.ownerName"></j-input> <j-input placeholder="收货人" v-model="queryParam.ownerName"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="6" :sm="8">
<a-form-item label="提交时间:"> <a-form-item label="提交开始时间">
<a-range-picker @change="onChangeData" :value="createTimeValue"/> <a-date-picker placeholder="提交开始时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_begin"></a-date-picker>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="提交结束时间">
<a-date-picker placeholder="提交结束时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_end"></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -153,13 +158,6 @@ export default { ...@@ -153,13 +158,6 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
onChangeData(date, dateString) {
if (dateString.length > 0) {
this.createTimeValue = date
this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1]
}
},
onDetail(id,type) { onDetail(id,type) {
this.$router.push({ this.$router.push({
path: `/paymentorder/paymentDetail?id=${id}&type=${type}`, path: `/paymentorder/paymentDetail?id=${id}&type=${type}`,
......
...@@ -22,12 +22,15 @@ ...@@ -22,12 +22,15 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="6" :sm="8">
<a-form-item label="提交开始时间">
<a-form-item label="订单时间:"> <a-date-picker placeholder="提交开始时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_begin"></a-date-picker>
<a-range-picker @change="onChangeData" :value='createTimeValue'/> </a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="提交结束时间">
<a-date-picker placeholder="提交结束时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_end"></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="5" :sm="24"> <a-col :md="5" :sm="24">
......
...@@ -17,10 +17,14 @@ ...@@ -17,10 +17,14 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="6" :sm="8">
<a-form-item label="提交开始时间">
<a-form-item label="订单时间:"> <a-date-picker placeholder="提交开始时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_begin"></a-date-picker>
<a-range-picker @change="onChangeData" :value="createTimeValue"/> </a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="提交结束时间">
<a-date-picker placeholder="提交结束时间" valueFormat="YYYY-MM-DD" v-model="queryParam.createTime_end"></a-date-picker>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
...@@ -154,9 +158,6 @@ export default { ...@@ -154,9 +158,6 @@ export default {
onChange(date, dateString) { onChange(date, dateString) {
this.queryParam.createTime = dateString this.queryParam.createTime = dateString
}, },
initPageParams(params) {
params['platformType'] = 'shop'
},
propertyDetails(type, id) { propertyDetails(type, id) {
if (type == 1) { if (type == 1) {
this.$router.push({ this.$router.push({
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论