Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/OPgroup.vue

@@ -79,8 +79,8 @@
                         label="所属部门">
                         <template slot-scope="scope">
                             <div v-if="scope.row.department=='市场部'" style="background-color: #67C23A;color:#fff;border-radius: 5px;">市场客户</div>
-                            <div v-if="scope.row.department=='国交部'" style="background-color: #409EFF;color:#fff;border-radius: 5px;">公司客户</div>
-                            <div v-if="scope.row.department!='国交部'&&scope.row.department!='市场部'">{{ scope.row.department }}</div>
+                            <div v-if="scope.row.department=='国交部'||scope.row.department=='策划部'" style="background-color: #409EFF;color:#fff;border-radius: 5px;">公司客户</div>
+                            <div v-if="scope.row.department!='国交部'&&scope.row.department!='市场部'&&scope.row.department!='策划部'">{{ scope.row.department }}</div>
                         </template>
                     </el-table-column>
                     <el-table-column