Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/components/FormViewer/index.vue

@@ -451,6 +451,6 @@
   }
   .my-form-viewer {
     overflow: auto;
-    height: 70vh;
+    height: calc( 100vh - 350px);
   }
 </style>

src/views/demo/workflow/task/process/audit.vue

@@ -95,15 +95,16 @@
                   :model="formData"
                   size="small"
                   labelAlign="left"
-                  :label-col="labelCol"
-                  :wrapper-col="wrapperCol"
+                  :label-col="2"
+                  :wrapper-col="22"
+                  
                 >
-                  <a-form-item :label="auditNameVal" />
-                  <a-form-item label="">
+                  <!-- <a-form-item :label="auditNameVal" /> -->
+                  <a-form-item :label="auditNameVal">
                     <a-textarea
                       v-model:value="formData.des"
                       placeholder="请输入"
-                      :auto-size="{ minRows: 5, maxRows: 8 }"
+                      :auto-size="{ minRows: 2, maxRows: 8 }"
                     />
                   </a-form-item>
                   <a-form-item label="" class="l-task-btns">
@@ -117,7 +118,7 @@
                     >
                   </a-form-item>
                 </a-form>
-                <auditInfo :data="designerData.userLogs" />
+                <!-- <auditInfo :data="designerData.userLogs" /> -->
               </div>
             </a-tab-pane>
           </a-tabs>
@@ -212,8 +213,8 @@
   const flowContent = ref('');
   const flowViewer = ref({});
   const formRef = ref();
-  const labelCol = { span: 7 };
-  const wrapperCol = { span: 24 };
+  const labelCol = { span:1 };
+  const wrapperCol = { span: 22 };
   const infoOpen = ref(true);
   const formVisble = ref(false);
   const formUrlVisble = ref(false);
@@ -236,11 +237,16 @@
   });
 
   const footerStyle = ref({
-    height:"440px",
+    height:"220px",
+    width:"100%",
     overFlow:"auto",
     color: '#fff',
     backgroundColor: '#ffffff',
     zIndex:"9999999999",
+    padding:"0px 100px",
+    position:"fixed",
+    bottom:"0px",
+    left:"0px"
   })
   if (props.type == 4) {
     rules.value = {};
@@ -887,7 +893,7 @@
     height:0px!important;
   }
   ::v-deep .ant-layout-footer{
-    padding:0px !important;
+    padding:0px 20px!important;
     overflow: auto!important;
   }