Merge branch 'feature/12月迭代' into dev

src/views/ecm/list.vue

@@ -103,7 +103,7 @@
           </template> -->
           <!-- <el-button type="text" @click="toRecord(scope.row)">记录</el-button>
           <el-button type="text" @click="toTouch(scope.row)" v-if="xsxsFlag && isOpenFlag(scope.row.analyseJson)">触达效果</el-button> -->
-          <el-dropdown style="margin-left:8px" trigger="click" @command="onCommand($event, scope.row)">
+          <el-dropdown style="margin-left:8px" trigger="click" @command="onCommand($event, scope.row)" v-if="($getButtonLimit($buttonCode.marketingDelEcm) && scope.row.putonStatus !== 2 && scope.row.canEdit !== false) || ($getButtonLimit($buttonCode.marketingOutlineEcm) && scope.row.effectType !== 2 && scope.row.onlineStatus === 1 && scope.row.canEdit !== false) || (xsxsFlag && isOpenFlag(scope.row.analyseJson))">
             <el-button type="text">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
             <el-dropdown-menu slot="dropdown">
               <!-- <el-dropdown-item :command="1">记录</el-dropdown-item> -->