前端

src/views/statisticalReport/shippingList.vue

@@ -52,7 +52,10 @@
         </el-col>
         <el-col :span="18">
           <div v-if="contractNo!='全部合同'">
-            <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  <div style="display:inline-block;margin-right:10px;"> 水单装船重量（吨）：<ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
+            <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> 
+            <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  
+            <div style="display:inline-block;margin-right:10px;"> 水单装船重量（吨）：<span v-if="shippedWeight>0">{{shippedWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian1(scope.row)" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
           </div>
         </el-col>
       </el-row>
@@ -93,7 +96,10 @@
         <el-table-column class="table_td" prop="taskNo" label="运输任务"></el-table-column>
         <el-table-column class="table_td" prop="shipType" label="类型"></el-table-column>
         <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-        <el-table-column class="boxNo" prop="boxNo" label="箱号/仓位号"></el-table-column>
+        <el-table-column class="boxNo" prop="boxNo" label="箱号-1"></el-table-column>
+        <el-table-column class="boxNo" prop="boxNoOther" label="箱号-2"></el-table-column>
+        <el-table-column class="boxNo" prop="titleNo" label="封号-1"></el-table-column>
+        <el-table-column class="boxNo" prop="titleNoOther" label="封号-2"></el-table-column>
         <el-table-column class="table_td" prop="loadingWeight" label="装车净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
         </el-table-column>
@@ -231,6 +237,11 @@
         <el-button @click="taskconfirm">确定</el-button>
       </div>
     </WinseaContentModal>
+    <WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
+      @on-cancel="accessoryTFs1 = false">
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
       <div v-for="(item, index) in paymentScreenshotList" :key="index">
@@ -451,6 +462,9 @@
         }
         // this.appendixIdss = row.addressUrl
       },
+      fujian1() {
+          this.accessoryTFs1 = true
+      },
       cur(status) {
         if (status == 0) {
           this.currect = true

src/views/warehousenew/warehousingOrder.vue

@@ -9,6 +9,13 @@
         </el-date-picker>
   
           </div>
+          <div style='width:50%;margin-right:10px;'>
+            <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType"
+          style="margin: 0 10px">
+          <el-option v-for="item in warehouseList" :key="'cangku' + item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
+            style="color: #8890b1" />
+        </el-select>
+          </div>
       </template>
       <template slot="right">
         <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源查找" clearable maxlength="300" type="input"></ws-input>
@@ -606,6 +613,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         spanArr: [],
         options1:[],
         id:'',
+        
         customerInfo:{},
         appendixIdss:[],
         paymentScreenshot:'',
@@ -626,6 +634,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return time.getTime() > Date.now()
           },
         },
+        warehouseList:[],
         currectfocusdata:{},
         customershow:false,
         interestratevalue:'',
@@ -642,10 +651,21 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
     // },
     activated() {
       this.value2=this.getNowTime()
+      selectWarehouseSelf({
+        compId: localStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList=response
+          
+        })
       this.getList()
       this.showType = this.isShow
     },
     methods: {
+      warehousechange(){
+        this.getList()
+      },
       handleClose5(){
         this.dialogVisiblecontent=false
       },