qukaidi пре 3 година
родитељ
комит
e6a263a7db

+ 1 - 1
src/api/workManagement/mainProject.js

@@ -57,7 +57,7 @@ export function updateItemStatus(id,status,accountName,payTime) {
 //任务列表
 export function getFlowList(current,size,params) {
   return request({
-    url: '/api/trade-project/project/item/list',
+    url: '/api/trade-project/project/itemTask/list',
     method: 'get',
     params: {
       ...params,

+ 15 - 3
src/views/workManagement/task/configuration/mainList.json

@@ -11,7 +11,7 @@
   "height": "auto",
   "searchIcon": true,
   "searchIndex": 2,
-  "searchMenuSpan": 24,
+  "searchMenuSpan": 16,
   "tree": true,
   "selection": false,
   "addBtn": false,
@@ -166,7 +166,7 @@
     },
     {
       "label": "完成日期",
-      "prop": "endTime",
+      "prop": "actualDate",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
       "type": "date",
@@ -176,7 +176,7 @@
       "cell": true
     },
     {
-      "label": "业务日期",
+      "label": "开始日期",
       "prop": "createdTime",
       "type": "date",
       "format": "yyyy-MM-dd",
@@ -188,6 +188,18 @@
       "showColumn": false
     },
     {
+      "label": "完成日期",
+      "prop": "createdTime2",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "hide": true,
+      "showColumn": false
+    },
+    {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,

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

@@ -294,10 +294,15 @@ export default {
       // }
       let data = this.deepClone(Object.assign({}, params, this.search));
       if (data.createdTime) {
-        data.beginTime = data.createdTime[0]
-        data.endTime = data.createdTime[1]
+        data.beginStartTime = data.createdTime[0]
+        data.beginEndTime = data.createdTime[1]
         delete data.createdTime
       }
+      if (data.createdTime2) {
+        data.actualDateStart = data.createdTime2[0]
+        data.actualDateEnd = data.createdTime2[1]
+        delete data.createdTime2
+      }
       if (!data.status) {
         data.status = "1,4,5";
       }