Browse Source

事务查询bug

qinbai 3 years ago
parent
commit
cf33a10581

+ 7 - 0
src/views/workManagement/main-items/list.vue

@@ -110,6 +110,13 @@ export default {
     getList(page,params = {}) {
       params.flag = 0;
       this.loading = true;
+      if(params){
+        if (params.createTime != undefined) {  //发货
+          params.createStartDate = params.createTime[0]+ " " + "00:00:00";
+          params.createEndDate = params.createTime[1] + " " + "23:59:59";
+          this.$delete(params,'createTime')
+        }
+      }
       getList(page.currentPage, page.pageSize,params).then(res =>{
         this.data = res.data.data.records
         this.page.total = res.data.data.total

+ 10 - 3
src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -127,11 +127,13 @@
     {
       "label": "制单日期",
       "prop": "createTime",
+      "search": true,
       "type": "date",
-      "overHidden": true,
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "unlinkPanels": true,
       "searchRange": true,
-      "search": true,
+      "overHidden": true,
       "index": 12,
       "width": 150
     },
@@ -145,8 +147,13 @@
     {
       "label": "最新修改时间",
       "prop": "updateTime",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
       "overHidden": true,
-      "index": 14,
+      "index": 12,
       "width": 150
     }
   ]

+ 7 - 0
src/views/workManagement/receipt/settleAccounts.vue

@@ -78,6 +78,13 @@
       getList(page,params={}) {
         this.loading = true;
         params.flag = 1;
+        if(params){
+          if (params.createTime != undefined) {  //发货
+            params.createStartDate = params.createTime[0]+ " " + "00:00:00";
+            params.createEndDate = params.createTime[1] + " " + "23:59:59";
+            this.$delete(params,'createTime')
+          }
+        }
         getList(page.currentPage, page.pageSize,params).then(res =>{
           this.data = res.data.data.records
           this.page.total = res.data.data.total

+ 1 - 8
src/views/workManagement/service-items/configuration/projectOption.json

@@ -18,6 +18,7 @@
     {
       "label": "项目编码",
       "prop": "code",
+      "search": true,
       "index": 1,
       "width": 150,
       "rules": [
@@ -118,14 +119,6 @@
       "addDisplay": false,
       "index": 9,
       "width": 150
-    },
-    {
-      "label": "状态",
-      "prop": "status",
-      "hide": true,
-      "editDisplay": false,
-      "addDisplay": false,
-      "search": true
     }
   ]
 }

+ 2 - 14
src/views/workManagement/task/configuration/mainList.json

@@ -113,7 +113,8 @@
     {
       "label": "需求开始日期",
       "prop": "beginTime",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
       "type": "date",
       "unlinkPanels": true,
       "searchRange": true,
@@ -124,19 +125,6 @@
       "cell": true
     },
     {
-      "label": "需求完成日期",
-      "prop": "actualDate",
-      "valueFormat": "yyyy-MM-dd HH:mm:ss",
-      "type": "date",
-      "search": true,
-      "unlinkPanels": true,
-      "searchRange": true,
-      "overHidden": true,
-      "searchOrder": 4,
-      "width": 150,
-      "cell": true
-    },
-    {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,

+ 7 - 0
src/views/workManagement/task/index.vue

@@ -133,6 +133,13 @@
         if(!params.status){
           params.status = "1,4,5";
         }
+        if(params){
+          if (params.beginTime != undefined) {  //发货
+            params.beginStartTime = params.beginTime[0]+ " " + "00:00:00";
+            params.beginEndTime = params.beginTime[1] + " " + "23:59:59";
+            this.$delete(params,'beginTime')
+          }
+        }
         this.loading = true
         getFlowList(page.currentPage, page.pageSize,params).then(res =>{
           this.dataList = res.data.data.records