前端

src/views/outboundManagement/weighingManagementNew.vue

@@ -202,14 +202,14 @@
                       </ws-form-item>
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
                         <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
-                        <el-select :disabled="tpyeNo == 1" filterable clearable v-model="weighingList.shipName"
+                        <el-select :disabled="tpyeNo == 2" filterable clearable v-model="weighingList.shipName"
                           placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
                           <el-option v-for="item in shipInfoList" :key="item.id" :label="item.shipName"
                             :value="item.shipName" />
                         </el-select>
                       </ws-form-item>
                       <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
-                        <ws-inputc disabled v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                        <ws-input disabled v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 2" label="毛重(KG)" span="1" prop="grossWeight">
                         <ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo == 2"
@@ -1569,15 +1569,16 @@
                       id: response
                     })
                     .toPromise().then((response) => {
-                      this.weighingList = response
-                      this.inspect = JSON.parse(
-                        JSON.stringify(this.weighingList)
-                      )
+                      
                        if(this.warehouseName == '鲅鱼圈金信库' ||
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
                         .warehouseName == '山东园丰库'){
+                          this.weighingList = response
+                      this.inspect = JSON.parse(
+                        JSON.stringify(this.weighingList)
+                      )
                           if(this.weighingList.contractManagement){
                             let cang = {}
                             cang.value = this.weighingList.contractManagement.seller
@@ -1593,7 +1594,6 @@
                               }
                               this.myCompanyCustomer = this.weighingList.contractManagement.buyer
                           }
-                          console.log(11111111111111111111)
                           
                           this.isShowPrintType = true
                         }else{

src/views/statisticalReport/shippingList.vue

@@ -90,7 +90,6 @@
         <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
       </el-table>
-
       <!-- 页数 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
@@ -306,7 +305,7 @@
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
-        searchType: '1',
+        searchType: '',
         manualFlag: '',
         searchTypeText: '未完成',
         searchKeyWord: '',

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -90,11 +90,11 @@
           <el-row class="myTest">
 
             <!--当前运输总价-->
-            <el-form-item label="当前运输总价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
+            <el-form-item label="当前运输总价(元):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
             </el-form-item>
             <!--审核中的运输总价-->
-            <el-form-item label="审核中的运输总价(元/吨):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
+            <el-form-item label="审核中的运输总价(元):" prop="tranPriceIng" label-width="180px" class="input-item-margin">
               <el-input v-if="deptBudgetList.priceStatus=='审核中'" :disabled="readonly"
                 v-model="deptBudgetList.tranPriceIng" maxlength="70" />
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
@@ -213,11 +213,10 @@
             v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
             共{{ total }}/{{ deptBudgetList.weight }}
           </div>
-          <el-button class="add bg-bottom" type="primary" size="small" @click="add"
+          <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add"
             v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
-            <!-- <img width="22" height="22" src="../../../public/img/add.png" alt /> -->
             <div class="spans">添加仓位</div>
-          </el-button>
+          </el-button> -->
         </div>
       </el-form>
       <div style="text-align: right; padding: 10px">