Merge remote-tracking branch 'origin/dev' into dev

src/views/statisticAnalysis/commissionStatistics/index.vue

@@ -81,7 +81,7 @@ export default {
           },
           {
             label: "业务日期",
-            prop: "actualDate",
+            prop: "createTime",
             type: "date",
             format: 'yyyy-MM-dd',
             valueFormat: 'yyyy-MM-dd',
@@ -133,9 +133,9 @@ export default {
     },
     onLoad(page, params) {
       let data = this.deepClone(Object.assign({}, params, this.search));
-      if (data.actualDate) {
-        data.actualDateStart = data.actualDate[0]
-        data.actualDateEnd = data.actualDate[1]
+      if (data.createTime) {
+        data.actualDateStart = data.createTime[0]
+        data.actualDateEnd = data.createTime[1]
         delete data.actualDate
       }
       data.branch = "Y"

src/views/workManagement/task/index.vue

@@ -203,6 +203,7 @@ export default {
           updateProjectItem(row).then(res => {
             this.$message.success("修改成功!")
             this.$set(row, "$cellEdit", false);
+            this.onLoad(this.page);
           })
         });
       } else {