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

src/components/OP/OPgroup.vue

@@ -151,6 +151,19 @@
                         label="成单人"
                         width="110">
                     </el-table-column>
+                    <el-table-column
+                        prop="operatorLabel"
+                        width="100"
+                        label="各部门操作人">
+                        <template slot-scope="scope">
+                            <el-popover placement="top" width="300" trigger="hover">
+                                <div style="white-space: pre-wrap;">{{scope.row.operatorLabel}}</div>
+                                <span
+                                    style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp:1; overflow: hidden;cursor: pointer;color: #48a2ff;"
+                                    slot="reference">移上查看</span>
+                            </el-popover>
+                        </template>
+                    </el-table-column>
                     <!-- <el-table-column
                         prop="tourCode"
                         width="100"

src/components/child/index.vue

@@ -165,8 +165,6 @@ export default {
             })
         },
         rowClassName({ row, rowIndex }) {
-            console.log(row, rowIndex);
-            
             if (rowIndex % 2 === 0) {
                 return 'warning-row';
             }else{