Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/sale-form.vue

@@ -308,7 +308,7 @@
               this.objOption.TaskImageList = tempData.TaskImageList;
               this.objOption.TaskKudoImgList = tempData.TaskKudoImgList;
               this.objOption.TaskDesc = tempData.TaskDesc;
-              this.objOption.ExchangeEndTime = tempData.ExchangeEndTime;
+              this.objOption.ExchangeEndTime = tempData.ExchangeEndTimeStr;
             }
           })
           this.optionTitle = "修改客户任务"

src/pages/sale/saleTask.vue

@@ -136,12 +136,6 @@
             field: 'TaskKudo',
             align: 'left'
           },
-          {
-            name: 'TaskNum',
-            label: '完成任务数量',
-            field: 'TaskNum',
-            align: 'left',
-          },
           {
             name: 'TaskStartTimeStr',
             label: '任务时间',
@@ -175,6 +169,12 @@
             required: true,
             align: "left",
             field: (row) => row.DetailsList
+          },
+            {
+            name: 'ExchangeEndTimeStr',
+            label: '兑换截止日期',
+            field: 'ExchangeEndTimeStr',
+            align: 'left',
           },
           {
             name: 'CreateByName',