前端

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -106,7 +106,12 @@
           </template>
         </el-table-column>
         <el-table-column key="18" width='120' class="table_td" prop="feedbackWeight" label="卸车净重（吨）"
-          v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
+          v-if="this.tranType=='汽运'||this.tranType=='火运'">
+          <template slot-scope="scope">
+            <span v-if="scope.row.processNo!='退库'">{{scope.row.feedbackWeight }}</span>
+            <span v-else>{{scope.row.netWeight }}</span>
+          </template>
+        </el-table-column>
         <el-table-column key="19" v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
           label="卸船净重（吨）"></el-table-column>
         <!-- <el-table-column key="20" width='120' class="table_td" prop="feedbackWeight" label="反馈重量（吨）">
@@ -586,6 +591,7 @@
       date = date.toString().padStart(2, '0');
       this.collectionDate = `${year}-${month}-${date}`;
       this.getPassYearFormatDate()
+      this.getContract()
       this.getList()
       this.showType = this.isShow
     },
@@ -616,6 +622,7 @@
           this.startDate = ''
           this.endDate = ''
         }
+        this.getContract()
         this.getList()
       },
 
@@ -749,6 +756,7 @@
           }
         }
         this.contractNo = e
+        console.log( this.contractNo)
         // this.$refs.saleList.doLayout();
         this.getList(this.orderList.deliverType)
       },
@@ -1276,6 +1284,19 @@
             })
         })
       },
+      getContract(){
+        getStockSaleContractNoList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            startDate: this.startDate,
+            endDate: this.endDate,
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+            // this.contractNoList.unshift({})
+            this.options = this.contractNoList
+          })
+      },
       //列表
       getList(type) {
         // 1自运2他运
@@ -1333,17 +1354,7 @@
             this.deptBudgetTotal = response.total
             this.saleList = response
           })
-        getStockSaleContractNoList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            startDate: this.startDate,
-            endDate: this.endDate,
-          })
-          .toPromise()
-          .then((response) => {
-            this.contractNoList = response
-            // this.contractNoList.unshift({})
-            this.options = this.contractNoList
-          })
+        
       },
       getPassYearFormatDate() {
       // if (!localStorage.getItem('startDate') && !localStorage.getItem('endDate')) {