소스 검색

更新流程

tongshangming 2 년 전
부모
커밋
894a60332b

BIN
src/assets/images/phone-wrap.png


+ 11 - 0
src/assets/main.css

@@ -45,4 +45,15 @@ a {
 
 #nprogress .bar {
   background: var(--el-color-primary) !important;
+}
+.el-dialog__header {
+  border-bottom: 1px solid #e3edfe;
+  margin-right: 0;
+}
+.el-dialog__body {
+  max-height: calc(100vh - 56px - 62px);
+  overflow: auto;
+}
+.el-dialog__footer{
+  border-top: 1px solid #e3edfe;
 }

+ 2 - 2
src/components/DynamicFormEdit.vue

@@ -117,8 +117,8 @@ defineExpose({
 })
 </script>
 <template>
-  <el-dialog v-model="dialogFormVisible" title="新增" width="1200" @close="closeDialog">
-    <el-steps :active="active" finish-status="success" simple style="margin-top: 20px">
+  <el-dialog v-model="dialogFormVisible" title="新增" fullscreen @close="closeDialog">
+    <el-steps :active="active" finish-status="success" simple>
       <el-step title="流程类型设置" />
       <el-step title="流程表单设置" />
       <el-step title="流程审批设置" />

+ 19 - 6
src/components/designer/DesignerRender.vue

@@ -13,6 +13,8 @@ const formItems = computed({
     return formDesignerStore.formItems
   },
   set(val) {
+    console.log('val', val)
+
     formDesignerStore.formItems = val
   }
 })
@@ -46,7 +48,7 @@ const handleDel = (item: BasicFormItem, index: number) => {
 </script>
 <template>
   <div class="h-full bg-white overflow-x-hidden overflow-y-auto p-16px">
-    <div class="ios-bg ml-15" style="height: " v-if="designerHeaderType.type == 0">
+    <div class="ios-bg ml-15" style="height:" v-if="designerHeaderType.type == 0">
       <el-form v-bind="formProps" class="h-full overflow-auto pt-px">
         <draggable
           class="content-start"
@@ -65,11 +67,13 @@ const handleDel = (item: BasicFormItem, index: number) => {
                 :class="{ active: curFormItem.id === element.id }"
                 @click="handleClick(element)"
               >
-                <el-form-item :label="element.label" :rules="element.rules" :prop="element.name">
+                <el-form-item label-width="70px" :label="element.label" :rules="element.rules" :prop="element.name">
                   <form-comp :item="element" v-model="formData[element.name]"></form-comp>
                 </el-form-item>
                 <div class="form-handle" v-if="curFormItem.id === element.id">
-                  <el-icon color="#fff"><Rank /></el-icon>
+                  <el-icon color="#fff">
+                    <Rank />
+                  </el-icon>
                 </div>
                 <div class="form-btns" v-if="curFormItem.id === element.id">
                   <el-button
@@ -117,7 +121,9 @@ const handleDel = (item: BasicFormItem, index: number) => {
                 <form-comp :item="element" v-model="formData[element.name]"></form-comp>
               </el-form-item>
               <div class="form-handle" v-if="curFormItem.id === element.id">
-                <el-icon color="#fff"><Rank /></el-icon>
+                <el-icon color="#fff">
+                  <Rank />
+                </el-icon>
               </div>
               <div class="form-btns" v-if="curFormItem.id === element.id">
                 <el-button
@@ -154,17 +160,20 @@ const handleDel = (item: BasicFormItem, index: number) => {
     color: var(--el-color-primary);
     outline: 1px dashed currentColor;
   }
+
   &.active {
     color: var(--el-color-primary);
     outline: 1px solid currentColor;
   }
 }
+
 .form-btns {
   position: absolute;
   right: 5px;
   bottom: 5px;
   z-index: 10;
 }
+
 .form-handle {
   position: absolute;
   top: 0;
@@ -174,13 +183,17 @@ const handleDel = (item: BasicFormItem, index: number) => {
   z-index: 10;
   cursor: move;
 }
+
 :deep(.el-select) {
   width: 100%;
 }
+
 .ios-bg {
+  width: 311px;
   height: 580px;
-  background: url('@/assets/images/iosBg.png') no-repeat;
+  background: url('@/assets/images/phone-wrap.png') no-repeat;
   background-size: contain;
-  padding: 60px 92px 60px 35px;
+  padding: 60px 20px;
+  margin: auto;
 }
 </style>

+ 0 - 0
src/css/dialog.css → src/components/workflow/css/dialog.css


+ 0 - 0
src/css/workflow.css → src/components/workflow/css/workflow.css


+ 1 - 1
src/components/workflow/dialog/employeesRoleDialog.vue

@@ -142,5 +142,5 @@ const closeDialog = () => {
 </script>
 
 <style>
-@import '@/css/dialog.css';
+@import '../css/dialog.css';
 </style>

+ 1 - 1
src/components/workflow/nodeWrap.vue

@@ -263,7 +263,7 @@ const arrTransfer = (index: any, type = 1) => {
 }
 </script>
 <style lang="scss">
-@import '@/css/workflow.css';
+@import '../css/workflow.css';
 .error_tip {
   position: absolute;
   top: 0px;