前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -199,12 +199,12 @@
                     maxlength="10" size="small" />
                 </ws-form-item>
 
-                <ws-form-item v-if='deptBudgetList.outType == "移库入库" && serviceManagementType == 1' label="移库编号"
+                <ws-form-item v-if='deptBudgetList.inOutType == "移库入库" && serviceManagementType == 1' label="移库编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='deptBudgetList.outType != "移库入库" && serviceManagementType == 1' label="合同编号"
+                <ws-form-item v-if='deptBudgetList.inOutType != "移库入库" && serviceManagementType == 1' label="合同编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
@@ -276,10 +276,10 @@
                   </el-select>
                 </ws-form-item>
                 <ws-form-item v-if="serviceManagementType == 1&&deptBudgetList.outType != '散船'&&deptBudgetList.outType != '火运'" label="车牌号" span="1" prop="carNo">
-                  <ws-input :disabled="disabled2"
-                    v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
+                 <ws-input :disabled="disabled2"
+                    v-if="options2.length == 0 && serviceManagementType == 1&&deptBudgetList.inOutType!='移库入库' || serviceManagementType == 3 && carNumberList.length == 0"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                  <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3"
+                  <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3||carstatus && options2.length == 0 && serviceManagementType != 3&&deptBudgetList.inOutType=='移库入库' "
                     filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="(item, index) in options2" :key="index"
@@ -321,14 +321,14 @@
                   <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
                 </ws-form-item>
-                <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
+                <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'">
                   <el-select filterable clearable v-model="deptBudgetList.shipName"
                     placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
                     <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.shipName"
                       :value="item.shipName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
+                <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'">
                   <ws-input disabled v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo"

src/views/outboundManagement/weighingManagementNew.vue

@@ -200,7 +200,7 @@
                         <ws-input v-model="weighingList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
                       </ws-form-item>
-                      <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
+                      <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'||weighingList.outType == '集装箱船'">
                         <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
                         <el-select :disabled="tpyeNo == 2" filterable clearable v-model="weighingList.shipName"
                           placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
@@ -208,7 +208,7 @@
                             :value="item.shipName" />
                         </el-select>
                       </ws-form-item>
-                      <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
+                      <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'||weighingList.outType == '集装箱船'">
                         <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">

src/views/statisticalReport/shippingList.vue

@@ -72,7 +72,7 @@
       </div>
 
       <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px"
-        ref="warehouseList.records" border @row-click="handleRowClick" @selection-change="handleSelectionChange">
+        ref="warehouseList.records" @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <!-- <el-table-column
           :selectable="selectInit"
           type="selection"
@@ -83,6 +83,8 @@
         <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="table_td" prop="shipName" label="船名"></el-table-column>
+        <el-table-column class="table_td" prop="shipNumber" label="航次"></el-table-column>
         <el-table-column class="boxNo" prop="boxNo" label="箱号/仓位号"></el-table-column>
         <el-table-column class="table_td" prop="loadingWeight" label="装车净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重(吨)">