Explorar el Código

Merge remote-tracking branch 'origin/purchaseDev' into purchaseDev

002637 hace 1 año
padre
commit
6bd5460b1a

+ 16 - 0
src/views/purchase/purchase-order/column.js

@@ -642,6 +642,22 @@ export const TabColumns = [
         },
       },
       { 
+        item:{
+          key: "nitemdiscountrate", 
+          title: "折扣(%)", 
+          width:80, 
+        },
+        attr:{},
+       },
+      { 
+        item:{
+          key: "ntaxnetprice", 
+          title: "含税净价", 
+          width:80, 
+        },
+        attr:{},
+       },
+      { 
         item:{key: "arrivalQty", title: "已到货数量" , width:80,},
         attr:{
           // is: "el-computed-input-v2",

+ 15 - 1
src/views/purchase/purchase-order/index.vue

@@ -62,6 +62,15 @@ export default {
         return this.dict.type;
       },
     },
+    tabHeight:{
+      get(){
+        return `${this.tabTableDatas['puOrderItemList'].length ? 
+                  (this.tabTableDatas['puOrderItemList'].length > 8 ? 500 :
+                   (this.tabTableDatas['puOrderItemList'].length *50) +100)
+                : 120}px`
+      },
+      set(){}
+    }
   },
   created() {
     if(this.$route.query.billCode) this.params.orderCode = this.$route.query.billCode 
@@ -778,7 +787,12 @@ export default {
           :label="column.title" 
           :name="column.key"
         >
-          <div style="height:580px;display:flex">
+          <div 
+            :style="{
+              height:tabHeight,
+              display:'flex'
+            }"
+          >
             <el-super-table
               v-model="tabTableDatas[column.key]"
               :ref="column.key"