E订单样式调整

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
 <!--    <add-btn ref="add" :rowData="rowData" v-if="tool.checkAuth($route.name,'insert')" :disabled="disabled" @onSuccess="getDetail" style="margin-bottom:16px" />-->
-    <div style="float: left;margin-top: 5px;margin-bottom: 5px">
+    <div style="float: left;margin-top: -10px;margin-bottom: 10px">
       <addProduct class="inline-16"     ref="addProduct" v-if="tool.checkAuth($route.name,'insert') && !disabled"
                   :params="paramsAdd" :tablecolsAdd="tablecolsAdd" title="添 加"
                   @addSuccess="addProducts" @addProduct="addProduct" @uploadData="uploadData" @closeDrawer="getDetail" :querySa_brandid="rowData.sa_brandid"
@@ -47,9 +47,6 @@
           @keyup.enter.native="getDetail(params.content.pageNumber= 1)"
           @clear="getDetail(params.content.pageNumber= 1)"
           clearable></el-input>
-    </div>
-
-    <div style="float: left;margin-top: 5px;margin-bottom: 5px">
       <label class="search__label">材质:</label>
       <el-select v-model="params.content.where.material" size="small" placeholder="请选择材质" @change="getDetail(params.content.pageNumber= 1)"
                  @clear="getDetail(params.content.pageNumber= 1)"
@@ -62,7 +59,7 @@
         </el-option>
       </el-select>&nbsp;
     </div>
-    <tableList ref="table" height="600px"  style="margin-top: 10px"    :layout="tablecols" :data="list" :opwidth="200" :custom="true"
+    <table-new-layout ref="table" :height="list.length > 5 ?'calc(100vh - 340px)':'280px'"  style="margin-top: 10px"    :layout="tablecols" :data="list" :opwidth="200" :custom="true"
     >
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'itemclass'">
@@ -90,7 +87,7 @@
           <el-button slot="reference" type="text" size="mini">删 除</el-button>
         </el-popconfirm>
       </template>
-    </tableList>
+    </table-new-layout>
 <!--    <Table type="edit" :data="list" @deleteProduct="deleteProduct"></Table>-->
     <el-pagination
       background

src/HDrpManagement/prodectFileData/components/fileTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght">
+    <table-new-layout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght">
       <template v-slot:customcol="scope">
         <p >{{scope.column.data[scope.column.columnname]}}</p>
       </template>
@@ -9,7 +9,7 @@
           <slot name="del" :data="scope.data"></slot>
         </div>
       </template>
-    </tableLayout>
+    </table-new-layout>
   </div>
 </template>
 
@@ -19,7 +19,7 @@ export default {
   props:["id"],
   data(){
     return {
-      tableHieght:220,
+      tableHieght:'calc(100vh - 375px)',
       tablecols:[],
       list:[]
     }
@@ -41,7 +41,7 @@ export default {
 
       this.list = res.data
       console.log(this.list);
-      
+
     }
   },
   created() {
@@ -52,4 +52,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/prodectFileData/components/relationList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <search :placeholder="placeholder" @searchActive="searchActive"></search>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght">
+    <table-new-layout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length <= 5?'300px':tableHieght">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'isonsale' ">
           <span v-if="scope.column.data[scope.column.columnname] === 0"
@@ -32,7 +32,7 @@
           <slot name="del" :data="scope.data"></slot>
         </div>
       </template>
-    </tableLayout>
+    </table-new-layout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -56,7 +56,7 @@ export default {
   data(){
     return {
       placeholder:'商品名称',
-      tableHieght:420,
+      tableHieght:'calc(100vh - 210px)',
       list:[],
       tablecols:[],
       total:0,

src/HDrpManagement/prodectFileData/modules/add.vue

@@ -4,12 +4,12 @@
     <el-drawer
       title="新增资料"
       :visible.sync="drawer"
-      size="30%"
+      size="600px"
       direction="rtl"
       append-to-body
       @close="onCancel"
       >
-      <div class="drawer__panel">
+      <div class="drawer__panel" >
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="90px">
             <el-col :span="24">
@@ -167,7 +167,7 @@ export default {
         this.form.attinfos = this.form.attinfos.push(res.data.attachmentids)
         this.$refs['upload'].dialogUploadVisible = false
       }
-      
+
     },
     async bindEnclosure(attachmentids){
       console.log(attachmentids)
@@ -200,7 +200,7 @@ export default {
         console.log(this.linksids)
         this.$refs.list.listData()
         console.log('触发');
-        
+
       })
     },
     /*批量绑定*/
@@ -248,4 +248,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/prodectFileData/modules/relation.vue

@@ -3,7 +3,7 @@
     <div class="container normal-panel normal-margin">
       <add :plm_technicalinfoid="this.$route.query.id" @addSuccess="onSuccess"></add>
     </div>
-    <div class="container normal-panel ">
+    <div class="container normal-panel " style="padding-top: 0px">
       <relation_list ref="list" :id="this.$route.query.id">
         <template v-slot:del="scope">
           <relationDel v-if="tool.checkAuth($route.name,'delete')" :data="scope.data" :type="'text'" @deleteSuccess="onSuccess"></relationDel>
@@ -39,4 +39,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/unit/components/list.vue

@@ -4,26 +4,26 @@
       <el-col :span="11">
         <p class="normal-title normal-margin">计量单位</p>
         <slot name="unitAdd" :data="unitList"/>
-        <tableLayout v-if="unitList" :layout="tablecols1" :data="unitList" :custom="false" height="70vh">
+        <table-new-layout v-if="unitList" :layout="tablecols1" :data="unitList" :custom="false" height="calc(100vh - 250px)">
           <template v-slot:opreation="scope">
               <div style="display:flex">
                   <slot name="unitEdit" :data="scope.data" />
                   <slot name="unitDel" :data="scope" />
               </div>
           </template>
-        </tableLayout>
+        </table-new-layout>
       </el-col>
       <el-col :span="11">
         <p class="normal-title normal-margin">计量单位组</p>
         <slot name="unitGroupAdd" :data="unitList"/>
-        <tableLayout v-if="unitGroupList" :layout="tablecols2" :data="unitGroupList" :custom="false" height="70vh">
+        <table-new-layout v-if="unitGroupList" :layout="tablecols2" :data="unitGroupList" :custom="false" height="calc(100vh - 250px)">
           <template v-slot:opreation="scope">
               <div style="display:flex">
                   <slot name="unitGroupEdit" :data="{row:scope.data,unitList:unitList}" />
                   <slot name="unitGroupDel" :data="scope.data" />
               </div>
           </template>
-        </tableLayout>
+        </table-new-layout>
       </el-col>
     </el-row>
   </div>
@@ -84,7 +84,7 @@ export default {
       })
       this.unitGroupList = res.data
       console.log(res);
-      
+
     }
   },
 };

src/HManagement/clueManage/clue_import/detailPage/modules/billBody.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <!-- <add :data="list" @onSuccess="getList" :disabled="mainData.status !== '待审核'" v-if="tool.checkAuth($route.name,'update')"/> -->
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="40vh" fixedName="operation">
+    <table-new-layout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'province'">
           <span>{{scope.column.data['province']}}-{{scope.column.data['city']}}-{{scope.column.data['county']}}</span>
@@ -36,7 +36,7 @@
           @onSuccess="getList()"
         ></body-del>
       </template>
-    </tableLayout>
+    </table-new-layout>
     <el-pagination
       background
       small

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -25,7 +25,7 @@
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>
       </div>
-      <div slot="slot0" class="container normal-panel">
+      <div slot="slot0" class="container normal-panel" style="padding: 10px">
         <followDetail ref="followDetail" :disabled="true"/>
 <!--        <el-descriptions>
           <div slot="title">跟进记录 &nbsp;<i @click="followRecord(param.content.sort[0].reversed = param.content.sort[0].reversed == 1 ? 0 : 1)" :class="param.content.sort[0].reversed == 1?'fa fa-sort-amount-asc':'fa fa-sort-amount-desc'"></i></div>

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -26,7 +26,7 @@
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>
       </div>
-      <div slot="slot0" class="container normal-panel">
+      <div slot="slot0" class="container normal-panel" style="padding: 10px">
         <followDetail ref="followDetail" :disabled="!isHandle || mainData.status === '已无效' || mainData.status === '已过期'"/>
 <!--        <el-descriptions>
           <div slot="title">跟进记录 &nbsp;<i @click="followRecord(param.content.sort[0].reversed = param.content.sort[0].reversed == 1 ? 0 : 1)" :class="param.content.sort[0].reversed == 1?'fa fa-sort-amount-asc':'fa fa-sort-amount-desc'"></i></div>

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -12,7 +12,7 @@
       <el-input class="inline-16" type="text" v-model="params.content.where.condition" size="small" style="width:200px" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
       <slot name="addClue" />
     </div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="40vh" fixedName="operation">
+    <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="calc(100vh - 345px)" fixedName="operation">
       <template v-slot:customcol="scope">
           <span v-if="scope.column.columnname == 'province'">
             {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
@@ -47,7 +47,7 @@
         <slot name="editClue" :data="scope.data" />
         <slot name="delClue" :data="scope.data" />
       </template>
-    </tableLayout>
+    </tableNewLayout>
     <el-pagination
       background
       small

src/SDrpManagement/ProductGroup/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="group container normal-panel normal-margin">
+  <div class="group container normal-panel ">
     <div style="display:flex;align-items:center;margin-bottom:16px">
       <el-input
           placeholder="请输入搜索内容"
@@ -43,7 +43,7 @@
       </div>
     </div>
     <el-empty description="暂无数据" v-else></el-empty>
-     <div style="text-align:center;padding-top:36px">
+     <div style="text-align:center;padding-top: 16px">
       <el-pagination
         background
         small
@@ -262,6 +262,8 @@ export default {
 .group .group-list .group-item {
   width: 261px;
   max-width: 357px;
+  max-height: 270px;
+  min-height: 270px;
   background: #ffffff;
   transition: all 0.1s ease-in;
   cursor: pointer;

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

@@ -48,7 +48,7 @@
       </div>
 
       <div class="type">
-        <div class="content" style="max-height:300px;width:850px;overflow-y:scroll;margin-bottom: 10px;">
+        <div class="content" style="max-height:300px;width:calc(100vh - 420px);overflow-y:scroll;margin-bottom: 10px;">
 <!--          <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}}
@@ -65,7 +65,7 @@
           </el-tag>
         </div>
       </div>-->
-      <div style="width: 850px;background: #f6f6f6;margin-bottom: 20px" v-if="selectProduct.itemextend">
+      <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>

src/SDrpManagement/shopCart/modules/list.vue

@@ -16,7 +16,7 @@
       ref="multipleTable"
       :data="tableData"
       style="width: 100%;"
-      height="calc(100vh - 400px)"
+      height="calc(100vh - 325px)"
       :header-cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
       :cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
       @selection-change="selectionChange">

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <div class="select">
+    <div class="select" v-if="follow.length > 0" style="margin-top: -12px">
       <span class="demonstration">日期范围:</span>
       <time-select @clearSelect="clearSelect" @timeChange="timeChange"></time-select>
     </div>
-    <div style="height:calc(100vh - 300px);overflow: auto;">
-      <el-timeline v-if="follow.length > 0" style="margin: 10px" v-for="item in follow" :key="item.index">
+    <div style="height:calc(100vh - 340px);overflow: auto;margin-top: 10px" v-if="follow.length > 0">
+      <el-timeline  style="margin: 10px" v-for="item in follow" :key="item.index">
         <el-timeline-item :timestamp="item.createdate" placement="top"  color="#409eff">
           <el-card class="card-border">
             <el-row>
@@ -61,10 +61,8 @@
           </el-card>
         </el-timeline-item>
       </el-timeline>
-      <el-empty title="暂无数据" v-else></el-empty>
     </div>
-
-    <div style="margin-top:16px;text-align:right">
+    <div style="margin-top:16px;margin-bottom:-10px;text-align:right" v-if="follow.length > 0">
       <el-pagination
           background
           small
@@ -76,6 +74,7 @@
           :total="total">
       </el-pagination>
     </div>
+    <el-empty title="暂无数据" v-if="follow.length === 0"></el-empty>
   </div>
 </template>
 

src/SManagement/orderclue_detail/index.vue

@@ -34,7 +34,7 @@
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>
       </div>
-      <div slot="slot0">
+      <div slot="slot0" class="container normal-panel" style="padding: 10px">
         <followDetail ref="followDetail" :disabled="!isHandle || mainData.status === '已无效' || mainData.status === '已过期'"/>
       </div>
       <div slot="slot2" class="container normal-panel">

src/components/dynamic-newTable/index.vue

@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="height ? height : data.length <= 5?'280px':'calc(100vh - 268px)'"  @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
+      <el-table-column
+          type="selection"
+          width="35" fixed v-if="checkbox">
+      </el-table-column>
+      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+        <template v-slot:header="{ column,$index }" v-if="customHeader">
+          <slot name="header" :data="column"></slot>
+        </template>
+        <template slot-scope="scope">
+          <div class="table-panel">
+            <!-- 自定义表格显示内容 -->
+            <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <!-- 否则就是默认 -->
+            <span v-else>{{scope.row[col.columnname]}}</span>
+            <!-- 操作结构内容 -->
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','customHeader'],
+  data () {
+    return {
+      list:[],
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    selectionChange(row){
+      this.$emit('selectionChange',row)
+    }
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style>
+</style>

src/main.js

@@ -17,6 +17,7 @@ import upload from './api/upload'
 import './style/style.css'
 import './style/theme/index.css'
 import tableLayout from './components/dynamic-table'
+import tableNewLayout from './components/dynamic-newTable'
 import basicLayout from './components/normal-basic-layout'
 import normalLayout from './components/normal-basic-layout/normal.vue'
 import basicDetails from './components/normal-basic-layout/details'
@@ -50,6 +51,8 @@ Vue.config.productionTip = false;
 
 Vue.component('tableLayout', tableLayout)
 
+Vue.component('tableNewLayout',tableNewLayout)
+
 Vue.component('basicLayout', basicLayout)
 
 Vue.component('basicDetails', basicDetails)
@@ -64,8 +67,8 @@ Vue.component('tagPanl',tagPanl)
 Vue.use(ElementUI);
 ElementUI.TableColumn.props.showOverflowTooltip ={type:Boolean, default: true}
 
-ElementUI.Dialog.props.closeOnClickModal.default = false; 
-ElementUI.Drawer.props.showClose.default = false; 
+ElementUI.Dialog.props.closeOnClickModal.default = false;
+ElementUI.Drawer.props.showClose.default = false;
 
 /* table懒加载 */
 Vue.directive('tableLoad',{