diff --git a/.env.development b/.env.development
index c3de30d55ca64514a5b51a2aaea0ebba0248aa77..55c03c21c008344494e263e10255259eff7d4a51 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
NODE_ENV=development
#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://220.203.25.212:9998'
+VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
+# VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
diff --git a/package.json b/package.json
index 61e8f9138bebf77d36a308d63d4fe828fcaa1e35..01a8cfaa1d07dc0fe2c3bf5ecffba075fbb64b3f 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,4 @@
- {
+{
"name": "vue-antd-jeecg",
"version": "3.4.3",
"private": true,
diff --git a/src/components/tools/LoginSwitchHouse.vue b/src/components/tools/LoginSwitchHouse.vue
index 6613f2ff953b8f61795906bc2d714bc034b2b11f..2ff73e61b7ce0eddca1429a7abe558264be76bbc 100644
--- a/src/components/tools/LoginSwitchHouse.vue
+++ b/src/components/tools/LoginSwitchHouse.vue
@@ -144,7 +144,7 @@ export default {
.house-content-box {
display: flex;
flex-wrap: wrap;
- justify-content: space-between;
+ // justify-content: space-between;
.box {
box-sizing: border-box;
flex: none;
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index b5417a2c01f4111cbae254c5e8385c67d19bae08..d1a800dee3174e63dd931bf9e1be00da200e81e0 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -12,7 +12,6 @@ import store from '@/store'
export const JeecgListMixin = {
data(){
return {
- createTimeValue: [],
/* 查询æ¡ä»¶-请ä¸è¦åœ¨queryParamä¸å£°æ˜Žéžå—符串值的属性 */
queryParam: {},
/* æ•°æ®æº */
@@ -152,9 +151,7 @@ export const JeecgListMixin = {
this.$refs.superQueryModal.show();
},
searchReset() {
- this.createTimeValue = []
this.queryParam = {}
- this.initPageParams(this.queryParam);
this.loadData(1);
},
batchDel: function () {
diff --git a/src/views/paymentorder/payment/payment.vue b/src/views/paymentorder/payment/payment.vue
index 3d0c8ac0fda82d9fe5c1f3601abb34b8e71236bd..f943ba6149a4044266376c42a2c1f732cf35ea9e 100644
--- a/src/views/paymentorder/payment/payment.vue
+++ b/src/views/paymentorder/payment/payment.vue
@@ -14,9 +14,14 @@
<j-input placeholder="收货人" v-model="queryParam.ownerName"></j-input>
</a-form-item>
</a-col>
- <a-col :md="7" :sm="10">
- <a-form-item label="æ交时间：">
- <a-range-picker @change="onChangeData" :value="createTimeValue"/>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="æ交开始时间">
+ <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-col>
@@ -153,13 +158,6 @@ export default {
},
created() {},
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) {
this.$router.push({
path: `/paymentorder/paymentDetail?id=${id}&type=${type}`,
diff --git a/src/views/settlement/reconciliation/reconciliationList.vue b/src/views/settlement/reconciliation/reconciliationList.vue
index e4e97b1ad6c860c608cc7cbbd17c8d1575eef2c3..32d0fb9125ead40fc1c214db89bab3f00f834363 100644
--- a/src/views/settlement/reconciliation/reconciliationList.vue
+++ b/src/views/settlement/reconciliation/reconciliationList.vue
@@ -22,12 +22,15 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="7" :sm="10">
-
- <a-form-item label="订å•æ—¶é—´ï¼š">
- <a-range-picker @change="onChangeData" :value='createTimeValue'/>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="æ交开始时间">
+ <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-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="5" :sm="24">
diff --git a/src/views/settlement/settlements/settlementList.vue b/src/views/settlement/settlements/settlementList.vue
index 9e49ffcfe8e89ccc01761418b32f916d7a728ac5..01b788e22451b24ab4eaab8151b3d8f2c1fc07fc 100644
--- a/src/views/settlement/settlements/settlementList.vue
+++ b/src/views/settlement/settlements/settlementList.vue
@@ -17,10 +17,14 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="7" :sm="10">
-
- <a-form-item label="订å•æ—¶é—´ï¼š">
- <a-range-picker @change="onChangeData" :value="createTimeValue"/>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="æ交开始时间">
+ <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-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -154,9 +158,6 @@ export default {
onChange(date, dateString) {
this.queryParam.createTime = dateString
},
- initPageParams(params) {
- params['platformType'] = 'shop'
- },
propertyDetails(type, id) {
if (type == 1) {
this.$router.push({