e订单样式调整

src/HDrpManagement/ProductMag/modules/saleClass.vue

@@ -16,7 +16,7 @@
       <slot name="addClass" :data="{checkArr:checkArr,data:data}"></slot>
     </div>
     <div style="margin-top: 15px">
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
+      <table-new-layout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'price'">
             <el-input size="small" v-if="currentProduct.sa_aftersalesmag_itemsid == scope.column.data.sa_aftersalesmag_itemsid" v-model="scope.column.data.price"></el-input>
@@ -38,7 +38,7 @@
         <template v-slot:opreation="scope">
           <slot name="delProduct" :data="scope.data"></slot>
         </template>
-      </tableLayout>
+      </table-new-layout>
     </div>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
@@ -60,7 +60,7 @@ export default {
   props:["data"],
   data () {
     return {
-      tableHieght:"calc(100vh - 380px)",
+      tableHieght:"calc(100vh - 371px)",
       tablecols:[],
       list:[],
       total:0,
@@ -119,4 +119,4 @@ export default {
 </script>
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/unit/components/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="unit container normal-panel">
-    <el-row style="display:flex;justify-content:space-between">
-      <el-col :span="11">
+    <el-row style="display:flex;justify-content:space-between" :gutter="20">
+      <el-col :span="12">
         <p class="normal-title normal-margin">计量单位</p>
         <slot name="unitAdd" :data="unitList"/>
         <table-new-layout v-if="unitList" :layout="tablecols1" :data="unitList" :custom="false" height="calc(100vh - 250px)">
@@ -13,7 +13,7 @@
           </template>
         </table-new-layout>
       </el-col>
-      <el-col :span="11">
+      <el-col :span="12">
         <p class="normal-title normal-margin">计量单位组</p>
         <slot name="unitGroupAdd" :data="unitList"/>
         <table-new-layout v-if="unitGroupList" :layout="tablecols2" :data="unitGroupList" :custom="false" height="calc(100vh - 250px)">

src/SDrpManagement/ProductGroup/index.vue

@@ -43,7 +43,7 @@
       </div>
     </div>
     <el-empty description="暂无数据" v-else></el-empty>
-     <div style="text-align:center;padding-top: 16px">
+     <div style="text-align:center;padding-top: 10px;margin-bottom: -6px">
       <el-pagination
         background
         small

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -47,8 +47,8 @@
         </span>
       </div>
 
-      <div class="type">
-        <div class="content" style="max-height:300px;width:calc(100vh - 420px);overflow-y:scroll;margin-bottom: 10px;">
+
+        <div class="content" style="max-height:300px;width:100%;overflow-y:scroll;margin-bottom: 20px;">
 <!--          <p class="inline-16">更多:</p>-->
           <el-tag class="inline-16" style="margin-top: 5px;margin-bottom: 5px;width: 120px" @click="typeClick(item)" v-for="(item,index) in details" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">
             {{item.spec?item.spec.length >14?item.spec.substring(0,13)+'...':item.spec:item.spec}}
@@ -57,7 +57,7 @@
               {{item.model}}
             </span>-->
         </div>
-      </div>
+
 <!--      <div class="type">
         <div class="content normal-margin">
           <p class="inline-16">领域:</p>
@@ -65,46 +65,49 @@
           </el-tag>
         </div>
       </div>-->
-      <div style="width: calc(100vh - 420px);background: #f6f6f6;margin-bottom: 20px" v-if="selectProduct.itemextend">
-        <el-row :gutter="20" style="margin-left: 10px" v-if="selectProduct.itemextend.length">
-          <el-col :span="8" style="margin-top: 10px; " v-if="selectProduct.itemextend[0].device">
-            <span class="search__label">装置:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].device}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].prodline">
-            <span class="search__label">产线:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].prodline}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].specalnote">
-            <span class="search__label">特殊说明:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].specalnote}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].pressure">
-            <span class="search__label">压力等级:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].pressure}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].butterflyplatedrive">
-            <span class="search__label">蝶板驱动:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].butterflyplatedrive}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].connection">
-            <span class="search__label">连接形式:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].connection}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px;margin-bottom: 10px" v-if="selectProduct.itemextend[0].valveplatematerial">
-            <span class="search__label">阀板材质:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].valveplatematerial}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px;margin-bottom: 10px" v-if="selectProduct.itemextend[0].actuatortype">
-            <span class="search__label">执行器类型:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].actuatortype}}</span>
-          </el-col>
-          <el-col :span="8" style="margin-top: 10px;margin-bottom: 20px" v-if="selectProduct.itemextend[0].actuatorbrand">
-            <span class="search__label">执行器品牌:</span>
-            <span class="tab-color">{{selectProduct.itemextend[0].actuatorbrand}}</span>
-          </el-col>
-        </el-row>
+      <div style="padding-right: 20px">
+        <div style="width:100%;background: #f6f6f6;margin-bottom: 20px;padding: 10px" v-if="selectProduct.itemextend">
+          <el-row :gutter="20"  v-if="selectProduct.itemextend.length">
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].device">
+              <span class="search__label">装置:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].device}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].prodline">
+              <span class="search__label">产线:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].prodline}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].specalnote">
+              <span class="search__label">特殊说明:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].specalnote}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].pressure">
+              <span class="search__label">压力等级:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].pressure}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].butterflyplatedrive">
+              <span class="search__label">蝶板驱动:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].butterflyplatedrive}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].connection">
+              <span class="search__label">连接形式:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].connection}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].valveplatematerial">
+              <span class="search__label">阀板材质:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].valveplatematerial}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].actuatortype">
+              <span class="search__label">执行器类型:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].actuatortype}}</span>
+            </el-col>
+            <el-col :span="8"  v-if="selectProduct.itemextend[0].actuatorbrand">
+              <span class="search__label">执行器品牌:</span>
+              <span class="tab-color">{{selectProduct.itemextend[0].actuatorbrand}}</span>
+            </el-col>
+          </el-row>
+        </div>
       </div>
+
       <el-button class="normal-margin" type="primary" style="width:200px" icon="el-icon-shopping-cart-full" @click="addCart"  :disabled="usertype === 0 || usertype === 1">加入购物车</el-button>
       <div style="display:flex">
         <p>相关链接:&emsp;</p>