qinbai 3 gadi atpakaļ
vecāks
revīzija
8246dc1fec

+ 5 - 4
src/views/purchase/contract/index.vue

@@ -34,11 +34,11 @@
             <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
             <el-table-column  label="货物品种" prop="priceCategoryNames" align="center" show-overflow-tooltip width="180"></el-table-column>
             <el-table-column  label="件数" prop="purchaseQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="发票重量" prop="grossWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="码单重量" prop="netWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
-            <el-table-column  label="已发件数" prop="isArrival" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="已收件数" prop="actualQuantity" align="center" show-overflow-tooltip width="200"></el-table-column>
           </el-table>
         </template>
         <template slot="menuLeft">
@@ -287,8 +287,9 @@ export default {
     },
     //表格展开触发
     expandChange(row, expendList) {
-      if(row.hasItem){
+      if(row){
         getItemByPid(row.id).then(res =>{
+          console.log(res.data.data)
           this.$set(this.dataList[row.$index],"insideList", res.data.data)
           row.loading = false
         })

+ 9 - 10
src/views/salesManagement/salesContract/index.vue

@@ -30,16 +30,15 @@
       </template>
       <template slot-scope="scope" slot="expand" width="48px">
         <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
-          <el-table-column   align="center"  width="60"></el-table-column>
-          <el-table-column  label="#" type="index" align="center"  width="50"></el-table-column>
-          <el-table-column  label="提单号" prop="billNO" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="货物名称" prop="cname" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="销售价格" prop="price" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="销售数量" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="码单数量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="是否发货" prop="isSend" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="付款金额" prop="amount" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column   align="center"  width="40"></el-table-column>
+          <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="合同号" prop="orgOrderNo" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="货物名称" prop="priceCategory" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="已发件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
         </el-table>
       </template>
       <template slot="menuLeft">