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

src/components/course/courseprice-form.vue

@@ -25,11 +25,11 @@
         <div>
           <table style="margin-left:10px;">
             <tr>
-              <td style="width:58px;text-align:right;">
+              <td style="width:42px;text-align:right;">
                 卖价
               </td>
               <td colspan="2">
-                <q-input filled stack-label maxlength="8" style="padding-bottom:0;width:390px;" :dense="false" v-model="priceObj.courseObj.SellPrice"
+                <q-input filled stack-label maxlength="8" style="padding-bottom:0;width:390px;margin-left:10px;" :dense="false" v-model="priceObj.courseObj.SellPrice"
                   ref="SellPrice" label="卖价"
                   @keyup.native="checkPrice(priceObj.courseObj, 'SellPrice')" :rules="[val => !!val || '请填写卖价']" />
               </td>

src/pages/sale/finishTask.vue

@@ -150,7 +150,6 @@
     methods: {
       //兑换奖品
       exchangeKudo(item) {
-        console.log(item,"item");
         var postMsg = {
           Id:item.Id,
           CustomerId: item.CustomerId,
@@ -173,10 +172,12 @@
         })
       },
       goToDetail(item) {
+        console.log("item",item)
         this.OpenNewUrl('/sale/finishTaskDetails', {
           TaskId: item.TaskId,
           DetailsId: item.DetailsId,
-          CustomerId: item.CustomerId
+          CustomerId: item.CustomerId,
+          FinishId:item.Id
         })
       },
       resetSearch() {

src/pages/sale/finishTaskDetails.vue

@@ -16,20 +16,8 @@
           <div class="page-option">
           </div>
         </template>
-        <template v-slot:body-cell-ExchangeNum="props">
-          <q-td>
-            <template v-if="props.row.FinishType==1">
-              {{props.row.ExchangeNum}} 人
-            </template>
-          </q-td>
-        </template>
-        <template v-slot:body-cell-ExchangeMoney="props">
-          <q-td>
-            <template v-if="props.row.FinishType==2">
-              {{props.row.ExchangeMoney}} 元
-            </template>
-          </q-td>
-        </template>
+ 
+ 
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />
@@ -70,18 +58,7 @@
             field: 'FinishValue',
             align: 'left',
           },
-          {
-            name: 'ExchangeNum',
-            label: '使用人数',
-            align: "left",
-            field: 'ExchangeNum',
-          },
-          {
-            name: 'ExchangeMoney',
-            label: '使用金额',
-            align: "left",
-            field: 'ExchangeMoney',
-          },
+           
         ],
         dataList: [],
         loading: true,
@@ -92,6 +69,7 @@
           TaskId: "", //任务编号
           DetailsId: "", //任务详情编号
           CustomerId: "", //客户编号
+          FinishId: "", //完成任务编号
         },
         pageCount: 0,
       }
@@ -106,6 +84,9 @@
       if (this.$route.query.CustomerId) {
         this.msg.CustomerId = this.$route.query.CustomerId;
       }
+      if (this.$route.query.FinishId) {
+        this.msg.FinishId = this.$route.query.FinishId;
+      }
     },
     mounted() {
       this.getList()