页面修改

src/components/sale/sale-form.vue

@@ -49,6 +49,11 @@
   .el-select-dropdown {
     z-index: 9999 !important;
   }
+
+  .CusTask_Date .el-input__inner {
+    background: transparent !important;
+    border: 0 !important;
+  }
 </style>
 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
@@ -69,55 +74,40 @@
         </div>
         <div class="row wrap q-pb-lg">
           <div class="col-6">
-            <q-input filled v-model="objOption.TaskStartTime" class="q-pr-lg" mask="date" label="开始时间">
-              <template v-slot:append>
-                <q-icon name="event" class="cursor-pointer">
-                  <q-popup-proxy ref="qDateProxy1" cover transition-show="scale" transition-hide="scale">
-                    <q-date v-model="objOption.TaskStartTime">
-                      <div class="row items-center justify-end">
-                        <q-btn v-close-popup label="Close" color="primary" flat />
-                      </div>
-                    </q-date>
-                  </q-popup-proxy>
-                </q-icon>
+            <div class="CusTask_Date">
+              <q-field filled stack-label label="开始时间" class="col-6 q-pb-lg q-pr-lg">
+                 <template v-slot:control>
+                  <el-date-picker v-model="objOption.TaskStartTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
+                    size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
                 </template>
-            </q-input>
+              </q-field>
             </div>
-          <div class="col-6">
-            <q-input filled v-model="objOption.TaskEndTime" mask="date" label="结束时间">
-              <template v-slot:append>
-                <q-icon name="event" class="cursor-pointer">
-                  <q-popup-proxy ref="qDateProxy2" cover transition-show="scale" transition-hide="scale">
-                    <q-date v-model="objOption.TaskEndTime">
-                      <div class="row items-center justify-end">
-                        <q-btn v-close-popup label="Close" color="primary" flat />
           </div>
-                    </q-date>
-                  </q-popup-proxy>
-                </q-icon>
+          <div class="col-6">
+            <div class="CusTask_Date">
+              <q-field filled stack-label label="结束时间" class="col-6 q-pb-lg">
+                 <template v-slot:control>
+                  <el-date-picker v-model="objOption.TaskEndTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
+                    size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
                 </template>
-            </q-input>
+              </q-field>
+            </div>
           </div>
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled v-model="objOption.ExchangeEndTime" class="q-pr-lg" mask="date" label="兑换截止日期">
-              <template v-slot:append>
-                <q-icon name="event" class="cursor-pointer">
-                  <q-popup-proxy ref="ExchangeEndTime" cover transition-show="scale" transition-hide="scale">
-                    <q-date v-model="objOption.ExchangeEndTime">
-                      <div class="row items-center justify-end">
-                        <q-btn v-close-popup label="Close" color="primary" flat />
-                      </div>
-                    </q-date>
-                  </q-popup-proxy>
-                </q-icon>
+            <div class="CusTask_Date">
+              <q-field filled stack-label label="兑换截止日期" class="col-6 q-pb-lg q-pr-lg">
+                 <template v-slot:control>
+                  <el-date-picker v-model="objOption.ExchangeEndTime" value-format='yyyy-MM-dd HH:mm:ss' type="datetime"
+                    size="small" clear-icon="iconfont icon-guanbi"></el-date-picker>    
                 </template>
-            </q-input>
+              </q-field>
+            </div>
           </div>
           <div class="col-6">
-            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.TaskFinishType"
-              :options="finishTypeObj" label="请选择" dense emit-value map-options />
+            <q-select filled option-value="Id" option-label="Name" v-model="objOption.TaskFinishType"
+              :options="finishTypeObj" label="任务完成类型" emit-value map-options />
           </div>
         </div>
         <div class="row wrap" style="margin-top:20px;">
@@ -136,9 +126,8 @@
             </el-upload>
           </div>
         </div>
-
         <div class="q-pt-none scroll" style="max-height:60hv;margin-bottom:20px;">
-          <q-btn color="accent" size="sm" icon="add" style="margin-bottom:20px;" label="新增子任务" @click="addSubTask()" />
+          <q-btn color="accent" size="sm" icon="add" style="margin-bottom:20px;" label="新增完成条件" @click="addSubTask()" />
           <template v-for="(sItem, sIndex) in objOption.DetailsList">
             <div :key="sIndex" class="Details_List">
               <q-input filled stack-label maxlength="20" style="width:523px;" dense v-model="sItem.DetailsName"
@@ -199,7 +188,6 @@
                 @click="deleSubTask(index)" />
             </div>
           </template>
-
         </div>
         <div class="row wrap">
           <div class="col-12">

src/pages/sale/commsionManagement.vue

@@ -81,6 +81,18 @@
             field: 'PeopleNum',
             align: 'left',
           },
+          {
+            name: 'BalanceStateStr',
+            label: '返佣',
+            field: 'BalanceStateStr',
+            align: 'left',
+          },
+          {
+            name: 'RemitStr',
+            label: '提现',
+            field: 'RemitStr',
+            align: 'left',
+          },
           {
             name: 'UpdateTimeStr',
             label: '更新时间',
@@ -96,7 +108,7 @@
           pageSize: 12,
           rowsPerPage: 12,
           RebateType: 1,
-          Description:"",
+          Description: "",
         },
         pageCount: 0,
         taskOption: null,

src/pages/sale/happyPassbook.vue

@@ -80,6 +80,18 @@
             field: 'PeopleNum',
             align: 'left',
           },
+          {
+            name: 'BalanceStateStr',
+            label: '返佣',
+            field: 'BalanceStateStr',
+            align: 'left',
+          },
+          {
+            name: 'RemitStr',
+            label: '提现',
+            field: 'RemitStr',
+            align: 'left',
+          },
           {
             name: 'UpdateTimeStr',
             label: '更新时间',
@@ -95,7 +107,7 @@
           pageSize: 12,
           rowsPerPage: 12,
           RebateType: 2,
-            Description:"",
+          Description: "",
         },
         pageCount: 0,
         taskOption: null,