Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

src/App.vue

@@ -123,7 +123,7 @@ const sellHistoryTripTemplate = async (sellId:any,LogId:any) => {
   try {
       let queryMsg 
       let dataRes
-      if(LogId){
+      if(!LogId){
         queryMsg = {
           Id: sellId,
           Status: 1

src/views/SellTemplate/components/journeyAdsList.vue

@@ -88,7 +88,7 @@
                                         <el-dropdown-item v-if="scope.row.FileType" icon="CopyDocument" @click.stop="CopyTo(scope.row)">复制到</el-dropdown-item>
                                         <el-dropdown-item icon="Delete" @click="editDelete(scope.row,1)">删除</el-dropdown-item>
                                     </template>
-                                    <el-dropdown-item v-if="scope.row.FileType" icon="View" @click="viewTemplate(scope.row)">查看</el-dropdown-item>
+                                    <el-dropdown-item v-if="currentMenu==-1&&scope.row.FileType" icon="View" @click="viewTemplate(scope.row)">查看</el-dropdown-item>
                             </el-dropdown-menu>
                             </template>
                         </el-dropdown>