Merge pull request 'fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距' (#716) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/716

src/components/DetailComponent/SpecialFundDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading" style="padding: 0 40px">
+  <div v-loading="loading" style="padding: 0 30px">
     <baseTitle title="专项资金详情"></baseTitle>
     <el-form :model="formData" ref="form" >
       <el-row style="margin-left: 15px;margin-bottom: -18px">

src/views/expense-management/share/add.vue

@@ -1,9 +1,9 @@
 <template>
-  <div v-loading="loading" style="padding: 0 40px">
+  <div v-loading="loading" style="padding: 0 30px">
-    <el-form :model="formData" ref="form" :rules="rules" style="margin-left: 5px;margin-top: 18px">
+    <el-form :model="formData" ref="form" :rules="rules"  style="margin-left: 5px;margin-top: 18px">
       <el-row :gutter="30">
         <el-col :span="6" style="margin-left: -15px">
-          <el-form-item label="分摊名称" prop="shareName" label-width="80" >
+          <el-form-item label="分摊名称" prop="shareName"  >
             <el-input v-model="formData.shareName" placeholder="请输入分摊名称" clearable>
             </el-input>
           </el-form-item>
@@ -566,4 +566,11 @@ onMounted(() => {
 :deep(.el-date-editor--month){
   width: 100%;
 }
+:deep(.el-input-number) {
+  width: 100%;
+
+  .el-input__inner {
+    text-align: left;
+  }
+}
 </style>

src/views/expense-management/share/detail.vue

@@ -1,12 +1,13 @@
 <template>
-  <el-form :model="formData" ref="form" class="query-form" label-width="auto">
+<div style="padding: 0 30px">
+  <el-form :model="formData" ref="form" label-width="auto" style="margin-top: 18px">
     <el-row>
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="分摊名称">
           <span>{{ formData.shareName }}</span>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="分摊月份">
           <span>{{ formData.apportionmentMonth }}</span>
         </el-form-item>
@@ -54,6 +55,7 @@
   <opinion v-if="shareData.taskId" :formData="shareData.formData" :taskId="shareData.taskId"
            :taskUserOptionList="shareData.taskUserOptionList"
            v-model:value="auditOpinion"></opinion>
+</div>
 </template>
 
 <script setup lang="jsx">

src/views/plan/detail.vue

@@ -1,8 +1,8 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="loading" style="padding: 0 30px">
-    <el-form :model="formData" class="query-form">
+    <el-form :model="formData" style="margin-top: 18px">
       <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="年度计划名称" prop="annualPlanName">
             <div v-if="isEdit">
               <el-input v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
@@ -12,7 +12,7 @@
             <span v-else>{{ formData.annualPlanName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="创建时间" prop="createTime">
             <span>{{ formData.createTime }}</span>
           </el-form-item>

src/views/plan/index.vue

@@ -1,7 +1,7 @@
 <template>
  <div >
 <!--   <baseTitle title="年度计划" style="margin-left: -15px;margin-bottom: -2px"></baseTitle>-->
-   <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+   <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px;margin-bottom: -18px"></fvSearchForm>
    <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
  </div>
 </template>

src/views/special-fund/add.vue

@@ -335,7 +335,7 @@ onMounted(async () => {
 }
 
 .add-block {
-  padding: 0 40px;
+  padding: 0 30px;
 }
 
 :deep(.el-input-number) {