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

src/pages/sale/saleTask.vue

@@ -93,6 +93,8 @@
               @click="EditTask(props.row)" />
             <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
               @click="RemoveTask(props.row.Id)" />
+            <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="详情"
+              @click="iShowEdit(props.row)" />
           </q-td>
         </template>
         <template v-slot:bottom>
@@ -102,6 +104,7 @@
       </q-table>
     </div>
     <saleForm v-if="isShowTask" :taskOption="taskOption" @close="closeSaleForm" @success="RefreshPage"></saleForm>
+    <!-- <saleRightForm v-if="isShowRight" :taskOption="taskOption" @close="closeSaleForm"></saleRightForm> -->
   </div>
 </template>
 <script>
@@ -110,12 +113,14 @@
     RemoveCustomerTask
   } from '../../api/sale/peemanagement';
   import saleForm from '../../components/sale/sale-form';
+  // import saleRightForm from '../../components/sale/saleRight-form'
   export default {
     meta: {
       title: "营销任务"
     },
     components: {
-      saleForm
+      saleForm,
+      saleRightForm
     },
     data() {
       return {
@@ -194,6 +199,7 @@
         pageCount: 0,
         taskOption: null,
         isShowTask: false,
+        isShowRight: false
       }
     },
     created() {},
@@ -254,6 +260,14 @@
         }
         this.isShowTask = true
       },
+      iShowEdit(obj){
+        if (obj) {
+          this.taskOption = obj;
+        } else {
+          this.taskOption = null
+        }
+        this.isShowRight = true
+      },
       closeSaleForm() {
         this.isShowTask = false
       },