Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -88,8 +88,12 @@
         </el-col>
       </el-row>
       <div v-if="contractNo != ''">
+        <span v-if="orderList.seller"
+          >卖方: {{ orderList.seller }} </span
+        >
+        <span v-else>卖方:--</span>
         <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
-        <span v-else>货名:——</span>
+        <span v-else>货名:--</span>
         
         <span v-if="orderList.weight"
           >合同重量: {{ orderList.weight }} 吨</span
@@ -530,6 +534,7 @@ export default {
     }
   },
   activated() {
+    this.getContractList()
     this.getList()
     this.showType = this.isShow
   },
@@ -649,7 +654,6 @@ export default {
     },
     //定金附件
     fujian() {
-      debugger
       if (this.orderList.depositUrl === null || this.orderList.depositUrl === '') {
         EventBus.$emit(
           'warning',
@@ -897,7 +901,6 @@ export default {
             }
           }
         }
-        console.log(this.addressUrlArray,'tyis')
       this.contractNo = e
       this.getList()
     },
@@ -962,7 +965,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // debugger
           this.payingMoney = 0
           this.payedMoney = 0
           this.payNotMoney = 0
@@ -975,7 +977,9 @@ export default {
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
-      getStockPurchaseContractNoList({
+    },
+    getContractList(){
+       getStockPurchaseContractNoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -986,7 +990,7 @@ export default {
         .then((response) => {
           this.contractNoList = response
           this.option = this.contractNoList
-        
+       this.contractNo = this.option[0].contractNo
         })
     },
     handleRemove(file) {