Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator

src/components/WorkFlow/index.vue

 <template>
-    <div>
+    <div class="workflow">
         <div class="mb-10">
             <my-process-viewer
                 ref="processViewer"
@@ -83,3 +83,8 @@ export default {
 
 }
 </script>
+<style lang="scss" scoped>
+.workflow ::v-deep .my-process-designer{
+    height: auto;
+}
+</style>
\ No newline at end of file

src/views/ecw/box/ladingBill/previewBill.vue

@@ -58,6 +58,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .contentHtml {
+  word-break: initial;
   > table {
     width: 96% !important;
     margin-left: 2%;