wans

src/views/workflow/workflow/modules/BaseForm.vue

@@ -374,14 +374,14 @@ export default {
   position: relative;
   display: flex;
   flex-direction: column;
-  min-height: calc(100vh - 100px);
-  max-height: calc(100vh - 100px);
+  min-height: calc(100vh - 200px);
+  max-height: calc(100vh - 200px);
   overflow-y: auto;
 
   width: 100%;
 }
 .scale {
-  position: absolute;
+  position: fixed;
   bottom: 20px;
   right: 30px;
   z-index: 9999;

src/views/workflow/workflow/modules/modules/BaseForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-drawer title="编辑" placement="right" :closable="false" :visible="visible" @close="onClose">
+  <a-drawer title="编辑" :width="300" placement="right" :closable="false" :visible="visible" @close="onClose">
     <a-form :form="form">
       <a-form-item label="节点名称">
         <a-input v-decorator="['name', {rules: [{required: true, message: '节点名称不能为空'}]}]" />
@@ -32,10 +32,22 @@
           </a-select>
         </a-form-item>
         <a-form-item label="条件名称">
-          <a-select v-decorator="['titleColumnCode', {rules: [{required: true, message: '条件名称不能为空'}]}]" placeholder="请选择" @change="handleTitleColumnCode">
-            <a-select-option v-for="{titleColumnName, titleColumnCode} in customClassNameList" :key="titleColumnCode" :label="titleColumnName" :value="titleColumnCode">{{ titleColumnName }}
-            </a-select-option>
-          </a-select>
+          <a-row>
+            <a-col :span="9">
+              <a-select v-decorator="['titleColumnCode', {rules: [{required: true, message: '条件名称不能为空'}]}]" placeholder="请选择" @change="handleTitleColumnCode">
+                <a-select-option v-for="{titleColumnName, titleColumnCode} in customClassNameList" :key="titleColumnCode" :label="titleColumnName" :value="titleColumnCode">{{ titleColumnName }}
+                </a-select-option>
+              </a-select>
+            </a-col>
+            <a-col :span="6">
+              <a-select v-decorator="['handleCondition', {rules: [{required: true, message: '处理条件不能为空'}]}]">
+                <a-select-option v-for="(label,value) in handleConditionMap" :key="value" :value="value">{{label}}</a-select-option>
+              </a-select>
+            </a-col>
+            <a-col :span="9">
+              <a-input v-decorator="['handleConditionValue', {rules: [{required: true, message: '处理条件值不能为空'}]}]" />
+            </a-col>
+          </a-row>
         </a-form-item>
         <a-form-item label="处理类">
           <a-select v-decorator="['handleNameId', {rules: [{required: true, message: '条件类不能为空'}]}]" placeholder="请选择">
@@ -43,7 +55,7 @@
             </a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item label="处理条件">
+        <!-- <a-form-item label="处理条件">
           <a-row>
             <a-col :span="6">
               <a-select v-decorator="['handleCondition', {rules: [{required: true, message: '处理条件不能为空'}]}]">
@@ -54,7 +66,7 @@
               <a-input v-decorator="['handleConditionValue', {rules: [{required: true, message: '处理条件值不能为空'}]}]" />
             </a-col>
           </a-row>
-        </a-form-item>
+        </a-form-item> -->
       </template>
 
       <!-- <a-form-item label="描述">

src/views/workflow/workflow/modules/modules/Node.vue

@@ -19,7 +19,6 @@
       </div>
       <div class="card-content">
         {{ detail.name }}
-
       </div>
     </div>
     <div v-else-if="detail.type===3" class="verify">
@@ -29,7 +28,8 @@
         审核人
       </div>
       <div class="card-content">
-        {{ detail.name }}
+        <div>{{ detail.name }}</div>
+        <div>{{detail.userName}}</div>
       </div>
 
     </div>
@@ -151,6 +151,7 @@ export default {
   }
   .card-content {
     background: #fff;
+    padding: 10px;
     min-height: 50px;
   }
   .term {