样式调整

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -22,7 +22,7 @@
       </div>
       <div class="produtMag-panel">
       </div>
-      <tableLayout v-tableLoad="tableLoad" checkbox="true"  :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 300px)" :width="true" :custom="true" fixedName="operation amount" @selectionChange="selectionChange">
+      <tableLayout v-tableLoad="tableLoad" checkbox="true"  :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 356px)" :width="true" :custom="true" fixedName="operation amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
 <!--            <el-input-number size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="scope.column.data.qty" @change="qtyChange" :min="1" label="描述文字"></el-input-number>-->
@@ -80,8 +80,8 @@
         </template>
       </tableLayout>
     </div>
-    <!-- <div style="height: 35px;margin-top: 20px">
-      <div v-if="$route.query.type != '框架'" style="float: left">金额(元)：{{ data.signamount ? tool.formatAmount(data.signamount,2) : '0.00'}}</div>
+     <div style="height: 35px;margin-top: 16px">
+<!--      <div v-if="$route.query.type != '框架'" style="float: left">金额(元)：{{ data.signamount ? tool.formatAmount(data.signamount,2) : '0.00'}}</div>-->
       <div style="float: right">
         <el-pagination
             background
@@ -89,11 +89,12 @@
             @current-change="handleCurrentChange"
             :current-page="params.content.pageNumber"
             :page-sizes="[20, 50, 100, 200]"
-            :page-size="100"
+            :page-size="20"
             layout="total,sizes, prev, pager, next, jumper"
             :total="total">
         </el-pagination>
-      </div> -->
+      </div>
+     </div>
   </div>
 </template>
 
@@ -130,7 +131,7 @@ export default {
           "content": {
               "sa_contractid": this.$route.query.id,
               "pageNumber": 1,
-              "pageSize": 30,
+              "pageSize": 20,
               "where": {
                   "condition": "",
               }
@@ -173,7 +174,8 @@ export default {
       res.data.forEach((e,index)=>{
         res.data[index].discountrate = Math.round((e.discountrate * 100)*100)/100
       })
-      this.list = this.params.content.pageNumber == 1 ? res.data : this.list.concat(res.data)
+      /*this.list = this.params.content.pageNumber == 1 ? res.data : this.list.concat(res.data)*/
+      this.list = res.data
       console.log(this.list,res.data);
       this.total = res.total
       this.totalPage = res.pageTotal

src/SDrpManagement/QuotedPrice/detail/modules/historicalQuotation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableLayout :layout="tablecols" :data="list" fixedName="" :custom="true" >
+    <table-new-layout :layout="tablecols" :data="list" fixedName="" :custom="true" :height="list.length <= 5?'280px':'calc(100vh - 330px)'">
       <template v-slot:customcol="scope" >
         <div v-if="scope.column.columnname === 'billno'" >
             <el-button type="text" @click="detailGo(scope.column.data)">
@@ -28,7 +28,7 @@
       <template v-slot:opreation="scope">
         <el-button size="mini" type="text" @click="detailGo(scope.data)">详 情</el-button>
       </template>
-    </tableLayout>
+    </table-new-layout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -117,4 +117,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/index.vue

@@ -29,14 +29,14 @@
 
     </div>
     <div class="produtMag-panel">
-      <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
+      <table-new-layout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 388px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'discountrate'">
             <el-input v-model="scope.column.data.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.column.data.discountrate,scope.column.data,scope.$index)" :disabled="!tool.checkAuth($route.name,'itemClassDetails') || data.status !== '新建' || !disabled"></el-input>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
-      </tableLayout>
+      </table-new-layout>
       <div style="height: 35px;margin-top: 20px">
 <!--        <div style="float: left">总金额(元)：{{ totalPrice }}</div>-->
         <div style="float: right">

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -40,7 +40,7 @@
       </importFile>
     </div>
     <div class="produtMag-panel">
-      <tableLayout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
+      <table-new-layout :layout="tablecols" checkbox="true"  :data="list" :opwidth="200" height="calc(100vh - 400px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="selectionChange">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
             <el-input-number :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled" v-model="scope.column.data.qty" size="mini"  :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty"  label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
@@ -75,7 +75,7 @@
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
-      </tableLayout>
+      </table-new-layout>
       <div style="height: 35px;margin-top: 20px">
         <div style="float: left">总金额(元)：{{ tool.formatAmount(data.sumamount,2) }}</div>
         <div style="float: right">