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

src/views/bpm/definition/index.vue

 <template>
   <div class="app-container">
-    <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
+    <doc-alert title="工作流1" url="https://doc.iocoder.cn/bpm" />
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
@@ -168,8 +168,8 @@ export default {
 };
 </script>
 
-<style lang="scss">
-.my-process-designer {
+<style lang="scss" scoped>
+/* .my-process-designer {
   height: calc(100vh - 200px);
-}
+} */
 </style>

src/views/bpm/model/index.vue

@@ -538,8 +538,8 @@ export default {
 };
 </script>
 
-<style lang="scss">
-.my-process-designer {
+<style lang="scss" scoped>
+/* .my-process-designer {
   height: calc(100vh - 200px);
-}
+} */
 </style>

src/views/bpm/model/modelEditor.vue

 <template>
   <div class="app-container">
-
     <!-- 流程设计器，负责绘制流程等 -->
     <my-process-designer :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
       keyboard ref="processDesigner" @init-finished="initModeler"
@@ -130,6 +129,9 @@ export default {
 //  display: inline-grid;
 //  grid-template-columns: 100px auto max-content;
 //}
+.app-container{
+  min-height: calc(100vh - 84px);
+}
 .demo-control-bar {
   position: fixed;
   right: 8px;
@@ -172,9 +174,9 @@ export default {
   color: #fafafa;
 }
 
-.my-process-designer {
+/* .my-process-designer {
   height: calc(100vh - 84px);
-}
+} */
 .process-panel__container {
   position: absolute;
   right: 0;

src/views/bpm/processInstance/create.vue

@@ -164,9 +164,9 @@ export default {
 </script>
 
 <style lang="scss">
-.my-process-designer {
+/* .my-process-designer {
   height: calc(100vh - 200px);
-}
+} */
 
 .box-card {
   width: 100%;

src/views/ecw/order/edit.vue

@@ -937,6 +937,7 @@ export default {
         // 修改的提交
         if (this.form.orderNo != null) {
             let data = Object.assign({}, this.form, {
+                status: submitType,
               customDraweeVOList: this.customDraweeList,
               // transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
               orderItemVOList: this.getProductListWithDefaultValue(),

src/views/ecw/productBrank/Empower/index.vue

@@ -4,7 +4,7 @@
     <el-dialog
       :title="brandName"
       :visible.sync="dialogVisible"
-      width="900px"
+      width="1080px"
       :before-close="handleClose()">
       <el-tabs v-model="activeName">
         <el-tab-pane label="未授权客户" name="first">
@@ -44,6 +44,7 @@
             </el-table-column>
             <el-table-column
               prop="phone"
+              :formatter="(row, column, cellValue) => '+' + cellValue"
               label="客户号码">
             </el-table-column>
             <el-table-column
@@ -78,6 +79,7 @@
             </el-table-column>
             <el-table-column
               prop="phone"
+              :formatter="(row, column, cellValue) => '+' + cellValue"
               label="客户号码">
             </el-table-column>
             <el-table-column

src/views/index.vue

@@ -143,9 +143,9 @@ export default {
     padding: 8px;
   }
 }
-.my-process-designer {
+/* .my-process-designer {
   height: calc(100vh - 200px);
-}
+} */
 
 .box-card {
   width: 100%;