前端

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -45,7 +45,7 @@
       <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
       <el-table-column prop="saleLimit" label="销量上限(吨/年)"></el-table-column>
       <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column prop="approveStatus" label="状态">
         
       </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
@@ -55,7 +55,7 @@
           <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
           <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
-            @click="newAcquisition(scope.$index, scope.row,'审核中')">{{scope.row.approveStatus}}</el-button>
+            @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
           <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`">删除</el-button>
           <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>

src/views/statisticalReport/shippingList.vue

@@ -46,6 +46,16 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
+      <el-row>
+        <el-col style="padding-left: 15px" :span="6">
+          
+        </el-col>
+        <el-col :span="18">
+          <div v-if="contractNo!='全部合同'">
+            船名： 航次：
+          </div>
+        </el-col>
+      </el-row>
       <div class="freightSet" v-if="processNo">
         <div style="display: flex; width: 200px; line-height: 30px">
           预计运费（元）：{{ tranPriceIng }}元
@@ -366,7 +376,8 @@
           paymentScreenshot: '',
           id: '',
         },
-
+        shipName:'',
+        shipNo:'',
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -922,6 +933,9 @@
                 taskNoValue: response[i].taskNo,
                 processNo: response[i].tranProcessInfoList,
               })
+              this.taskNo=response[0].taskNo
+              this.shipName=response[0].shipName
+              this.shipNo=response[0].shipNo
               this.getList()
             }
           })
@@ -929,22 +943,23 @@
       },
       taskNochange(e) {
         this.taskNo = e
-        this.processNoList = []
-        this.processNo = ''
-        for (let i = 0; i < this.taskNoList.length; i++) {
-          if (e == this.taskNoList[i].taskNoValue) {
-            for (let j = 0; j < this.taskNoList.length; j++) {
-              this.processNoList.push({
-                processNoKey: i,
-                processNoValue: this.taskNoList[i].processNo[j].processNo,
-                actualFreight: this.taskNoList[i].processNo[j].actualFreight,
-                id: this.taskNoList[i].processNo[j].id,
-                tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
-                priceStatus: this.taskNoList[i].processNo[j].priceStatus,
-              })
-            }
-          }
-        }
+        this.getList()
+        // this.processNoList = []
+        // this.processNo = ''
+        // for (let i = 0; i < this.taskNoList.length; i++) {
+        //   if (e == this.taskNoList[i].taskNoValue) {
+        //     for (let j = 0; j < this.taskNoList.length; j++) {
+        //       this.processNoList.push({
+        //         processNoKey: i,
+        //         processNoValue: this.taskNoList[i].processNo[j].processNo,
+        //         actualFreight: this.taskNoList[i].processNo[j].actualFreight,
+        //         id: this.taskNoList[i].processNo[j].id,
+        //         tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
+        //         priceStatus: this.taskNoList[i].processNo[j].priceStatus,
+        //       })
+        //     }
+        //   }
+        // }
       },
       processNochange(e) {
         this.processNo = e