Kaynağa Gözat

1.物料基本档案详情展示字段为一行4列

002390 1 yıl önce
ebeveyn
işleme
d321c2f92a

+ 7 - 7
src/views/material/basicFile/details.vue

@@ -2,8 +2,10 @@
 <template>
   <div class="material-details" v-loading="loading">
     <!-- 操作栏 -->
-    <!-- 基本信息栏 -->
-    <div style="display: flex;justify-content: end;">
+  
+    <el-card>
+      <!-- 基本信息栏 -->
+      <div style="display: flex;justify-content: end;">
       <div v-if="activeMainTab == 'material'">
   
         <!-- 基本信息修改状态下—— 保存、保存新增、更新导入、取消 -->
@@ -111,8 +113,6 @@
       </el-row>
 
     </div>
-
-    <el-card>
     
       <div class="md-content">
         <el-form :inline="true" label-position="right" :model="basicData.value">
@@ -148,7 +148,7 @@
                 >
 
                   <el-row :gutter="10">
-                    <el-col :span="8" v-for="f in basicData.form" style="text-align: right;">
+                    <el-col :span="6" v-for="f in basicData.form" style="text-align: right;">
                       <template v-if="f.show">
 
                         <!-- 多选框 -->
@@ -296,7 +296,7 @@
                     >
 
                       <el-row :gutter="10">
-                        <el-col :span="8" v-for="m in medcineData.form" style="text-align: right;">
+                        <el-col :span="6" v-for="m in medcineData.form" style="text-align: right;">
 
                           <!-- 需要根据基本信息中的是否医药物料字段判断是否可以填写 -->
                           <template v-if="m.show">
@@ -2590,7 +2590,7 @@
     box-sizing: border-box;
 
     .el-card__body {
-      height: calc(100vh - 80px);
+      height: calc(100vh - 40px);
       // height: 100%;
       box-sizing: border-box;
       padding: 12px;

+ 6 - 13
src/views/material/basicFile/index.vue

@@ -3,9 +3,11 @@
 <template>
   <div class="material-basic" v-loading="failLoad">
 
-    <!-- 操作栏 -->
-    <div>
-    
+    <!-- 主体列表 -->
+    <el-card class="material-list" v-loading="loading">
+
+      <!-- 操作栏 -->
+    <div style="margin: 0 0 10px 0;">
       <!-- 查询条件 -->
       <el-row :gutter="10">
         <el-col :span="1.5">
@@ -39,12 +41,7 @@
         </el-col>
 
       </el-row>
-
-     
     </div>
-
-    <!-- 主体列表 -->
-    <el-card class="material-list" v-loading="loading">
       <el-row 
         :gutter="10" 
         class="mb10"
@@ -568,8 +565,7 @@
 
 <style lang="scss">
   .material-list {
-    // height: calc(100% - 100px);
-    // height: calc(100% - 70px);
+    height: calc(100vh - 70px);
 
 
     .el-card__body {
@@ -577,12 +573,9 @@
       box-sizing: border-box;
 
       .el-table {
-        // height: calc(100% - 35px);
         overflow: auto;
 
         .el-table__body-wrapper {
-          // height: calc(100% - 150px);
-          // height: calc(100% - 70px);
           overflow-y: auto !important;
           overflow-x: auto !important;
         }