Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/customer/customerList.vue

@@ -20,7 +20,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -2px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -217,7 +217,6 @@
         <el-table-column prop="seller" label="操作" width="280">
           <template slot-scope="scope">
             <el-button
-              class="find"
               type="primary"
               v-hasPermission="
             `customerManagement.customer.customerInfo.View`
@@ -226,7 +225,6 @@
               >增加定金</el-button
             >
             <el-button
-              class="find"
               v-hasPermission="
             `customerManagement.customer.customerInfo.View`
           "
@@ -650,7 +648,7 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+/deep/.base_header_layout .find.el-button--primary {
   width: 30px;
   margin-left: 0;
   border-top-left-radius: 0px;

src/views/customerFundManagement/customerFundList.vue

@@ -20,7 +20,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -2px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -318,7 +318,7 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+/deep/.base_header_layout .find.el-button--primary {
   width: 30px;
   margin-left: 0;
   border-top-left-radius: 0px;

src/views/financialManagement/collectionManagementList.vue

@@ -20,6 +20,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按合同编号、买方名称查找"
           clearable
@@ -34,7 +35,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -946,12 +947,15 @@ export default {
 .el-range-editor.el-input__inner {
   margin-left: 10px;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+/deep/.base_header_layout .find.el-button--primary {
   width: 30px;
-  margin-left: -10px;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;
@@ -1246,13 +1250,6 @@ export default {
   margin-left: 76%;
   margin-top: -7px;
 }
-.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-top: -1px;
-}
 .car {
   width: 100px;
   margin-left: 131px;
@@ -1296,13 +1293,6 @@ export default {
   position: relative;
   font-size: 14px;
 }
-.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: -10px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-top: 0px;
-}
 /deep/.el-upload--text{
   width:100px;
 }

src/views/houseSelfCollect/customerManagement.vue

@@ -7,11 +7,12 @@
         <ws-button type="primary" @click="createCustomer(1)">创建新客户</ws-button>
       </template>
       <template slot="right">
-        <ws-input v-model="searchKeyWord" placeholder="可按姓名、手机号查找" clearable maxlength="500" type="input"></ws-input>
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按姓名、手机号查找" clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
+              left:-8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
@@ -229,6 +230,15 @@
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
   }
+  /deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 //   /deep/.el-table--border{
 //   height: calc(100vh - 600px) !important;
 // }

src/views/houseSelfCollect/inspectionManagement.vue

@@ -13,13 +13,13 @@
 						style="color: #8890b1" />
 				</ws-select>
 				<div></div>
-				<ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+				<ws-input class='findinput' v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
 				</ws-input>
 				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              
+              left:-8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
@@ -413,6 +413,15 @@
 		width: 45%;
 		display: inline-block;
 	}
+	/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 // 	/deep/.el-table--border{
 //   height: calc(100vh - 600px) !important;
 // }

src/views/houseSelfCollect/paymentManagement.vue

@@ -46,11 +46,11 @@
           end-placeholder="结算时间止">
         </el-date-picker>
         <div></div>
-        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()">
-          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px"
+          <img width="16" height="16" style="vertical-align: text-top; position: relative; top: 0px;left:-8px;"
             src="../../../public/img/sousuo.png" alt />
         </ws-button>
       </template>
@@ -1601,4 +1601,14 @@
   .el-icon-delete {
     font-size: 20px;
   }
+  /deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  margin:0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/houseSelfCollect/weighingManagement.vue

@@ -24,12 +24,13 @@
           end-placeholder="截止时间">
         </el-date-picker>
         <div></div>
-        <ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号、货名查找" clearable maxlength="500" type="input">
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号、货名查找" clearable maxlength="500" type="input">
         </ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
+              left:-8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
@@ -763,4 +764,13 @@
   .show-excel {
     opacity: 0;
   }
+  /deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/outboundManagement/qualityInspectionManagement.vue

@@ -4,6 +4,7 @@
     <BaseHeaderLayout :leftSpan="12">
       <template slot="right">
         <ws-select
+        style='margin-right:10px;'
           v-model="warehouseName"
           placeholder=""
           @change="selecttaskType"
@@ -14,11 +15,12 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890b1"
+            style="color: #8890b1;"
           />
         </ws-select>
         <div></div>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按合同编号、车牌号查找"
           clearable
@@ -215,4 +217,13 @@ export default {
 /deep/.el-table--enable-row-transition .el-table__body td {
   text-align: center;
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/outboundManagement/weighingManagement.vue

@@ -13,7 +13,7 @@
 						style="color: #8890b1" />
 				</ws-select>
 				<div></div>
-				<ws-input v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找" clearable maxlength="500" type="input">
+				<ws-input class='findinput' v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找" clearable maxlength="500" type="input">
 				</ws-input>
 				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -301,4 +301,13 @@
 	.formItem {
 		width: 51% !important;
 	}
+	/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/platformaudit/driverreview.vue

@@ -20,6 +20,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按身份证号、手机号和姓名查找"
           clearable
@@ -34,7 +35,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -717,4 +718,13 @@ export default {
 /deep/.el-table td {
   border-right: 1px solid #eee;
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/platformaudit/grainPulseDynamic.vue

@@ -19,6 +19,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按账号、发布主体查找"
           clearable
@@ -33,7 +34,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -622,4 +623,13 @@ export default {
 .shade{
 background:rgba(0,0,0,0.1);
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/platformaudit/grainmerchantreview.vue

@@ -20,6 +20,7 @@
           />
         </ws-select>
         <ws-input
+        style='findinput'
           v-model="searchKeyWord"
           placeholder="可按身份证号、手机号和姓名查找"
           clearable
@@ -34,7 +35,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -714,4 +715,13 @@ overflow: scroll;
   right:0;
   margin:auto;
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 </style>

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -19,6 +19,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按账号、企业名称查找"
           clearable
@@ -33,7 +34,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -902,12 +903,15 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+/deep/.base_header_layout .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;

src/views/platformaudit/saletransactioninformationreview.vue

@@ -19,6 +19,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按编号、发布方和货名查找"
           clearable
@@ -33,7 +34,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -377,12 +378,15 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+/deep/.base_header_layout .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;

src/views/purchasingManagement/purchaseOrderList.vue

@@ -20,6 +20,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按合同编号或客户查找"
           clearable
@@ -34,7 +35,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -1960,9 +1961,14 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
+
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
+  margin: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
@@ -2010,6 +2016,9 @@ export default {
   height: 12px;
   // background: #e9ecf7;
 }
+.base_header_layout{
+  padding:10px;
+}
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
@@ -2173,14 +2182,6 @@ hr {
   text-align: justify;
   margin: 0 auto;
 }
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-top: -3px;
-  // margin-left: -10px;
-}
 /deep/.typeselect{
   margin-right:10px;
 }

src/views/salesManagement/salesPlanOrderList.vue

@@ -20,6 +20,7 @@
           />
         </ws-select>
         <ws-input
+        class='findinput'
           v-model="searchKeyWord"
           placeholder="可按照合同编号和任务编号进行查找"
           clearable
@@ -1910,13 +1911,18 @@ export default {
   color: #8890b1;
   border-color: #e8eaf1;
 }
+
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
   margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
   margin-top: -1px;
-  margin-left: -5px;
+  // margin-left: -5px;
 }
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
@@ -2121,7 +2127,7 @@ hr {
   border-bottom: 1px solid #ccc;
 }
 .base_header_layout {
-  padding: 10px 10px 0;
+  // padding: 10px 10px 0;
   background-color: #fff;
   height: 50px;
 }

src/views/statisticalReport/autoSettlementList.vue

@@ -1258,6 +1258,9 @@ export default {
         if (index === 0) {
           sums[index] = '合计'
         } else if (
+          index === 7 ||
+          index === 8 ||
+          index === 11 ||
           index === 13 ||
           index === 14 ||
           index === 15 ||
@@ -1284,6 +1287,9 @@ export default {
 			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
       sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+      sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+      sums[sums.length-12]=sums[sums.length-12].toFixed(2)
+      sums[sums.length-13]=sums[sums.length-13].toFixed(2)
       return sums
     },
     //列表

src/views/taskManagement/moveWarehouseTask.vue

@@ -36,7 +36,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -5px;
+              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -406,7 +406,6 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }

src/views/taskManagement/tranManagementTransport.vue

@@ -10,21 +10,10 @@
           v-hasPermission="
            `transportationTask.transportation.transportationInfo.add`
           "
-        ><img
-            width="13"
-            height="13"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button>
+        >添加</ws-button>
       </template>
       <template slot="right">
-        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">状态：</span>
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -40,9 +29,9 @@
             style="color: #8890B1;"
           />
         </ws-select>
-        <span style="width: 142px; display: inline-block;color: #8890B1;">起点：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">起点：</span>
         <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input" v-model="start"></el-input>
-        <span style="width: 142px; display: inline-block;color: #8890B1;">终点：</span>
+        <span style="width: 150px; display: inline-block;color: #8890B1;">终点：</span>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input" v-model="end"></el-input>
         <el-input
           v-model="searchKeyWord"
@@ -504,7 +493,6 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -5,13 +5,7 @@
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()" v-hasPermission="
             `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">
-          <img width="13" height="13" style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt />添加
+          ">添加
         </ws-button>
       </template>
       <template slot="right">
@@ -26,7 +20,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -7px;
+              left: -8px;
             " src="../../../public/img/sousuo.png" alt />
         </ws-button>
       </template>
@@ -60,7 +54,7 @@
             </div>
           </template> -->
         </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
+        <el-table-column prop="warehouseName" class="table_td" label="仓库名"></el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
         <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
@@ -471,7 +465,6 @@
 
   /deep/.base_header_layout .grid-content.right .find.el-button--primary {
     width: 30px;
-    margin-left: 0;
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
   }

src/views/tranManagement/tranManagementDriver.vue

@@ -35,9 +35,9 @@
           clearable
           maxlength="200"
           type="input"
-          class="findValue"
+          class="findValue findinput"
         ></ws-input>
-        <ws-button type="primary" @click="handleLook()">
+        <ws-button class='find' type="primary" @click="handleLook()">
           <img
             width="14"
             height="16"
@@ -682,6 +682,16 @@ export default {
 .findValue {
   margin: 0 10px;
 }
+/deep/.base_header_layout .find.el-button--primary {
+  width: 30px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-left:-10px;
+}
+/deep/.base_header_layout .findinput input {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
 /deep/.el-icon-arrow-right {
   display: none;
 }

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -86,9 +86,11 @@
               <el-input v-else v-model="deptBudgetList.tranPriceIng" maxlength="70" />
             </el-form-item>
             <div class="input-item-margin">
-              <el-button v-if="deptBudgetList.priceStatus=='审核中'" type="primary"
+              <div v-if="deptBudgetList.priceStatus=='审核中'">
+                <el-button type="primary"
                 v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small" @click="examine()">审核中
               </el-button>
+              </div>
               <el-button v-else type="primary" @click="priceSubmit()">提交</el-button>
             </div>
           </div>

src/views/warehouse/costmanagement.vue

@@ -36,19 +36,8 @@
           />
         </ws-select>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+        <ws-button type="primary" @click="find()"
+          >查找</ws-button>
       </template>
     </BaseHeaderLayout>
       <el-table

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -103,7 +103,7 @@
         <el-table-column
           prop="warehouseName"
           class="table_td"
-          label="库房名"
+          label="仓库名"
         ></el-table-column>
         <el-table-column
           prop="inOutType"

src/views/warehouse/warehouseManagementDelivery.vue

@@ -34,187 +34,263 @@
           <span v-show="this.deptBudgetList.warehouseType == 2">(临)</span>
         </h2>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select
-              v-model="deptBudgetList.contractNo"
-              placeholder="请选择合同编号或移库任务编号"
-              class="typeselect"
-              @change='contractNoChange'
-            >
-              <ws-option
-                v-for="item in outContractNo"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!-- 货名 -->
-          <ws-form-item label="货名" span="1">
-            <ws-select
-            disabled
-              v-model="deptBudgetList.goodsName"
-              placeholder
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-           <ws-form-item label="提示" span="1" prop="tips">
-           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
-              maxlength="20" size="small" />
-          </ws-form-item>
-          <ws-form-item label="类型" span="1" prop="type">
-              <ws-select disabled v-model="deptBudgetList.type"  @change="typeChange">
-                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
-              </ws-select>
-            </ws-form-item>
-          <!--毛重（吨）-->
-          <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
-            <ws-input
-              @input="grossWeightchange"
-              v-model="deptBudgetList.grossWeight"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--皮重（吨）-->
-          <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
-            <ws-input
-              @input="tarechange"
-              v-model="deptBudgetList.tare"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
-            <ws-input
-              @input='pureweight'
-              v-model="deptBudgetList.buckleWeightRatio"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入扣重比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="deptBudgetList.solidGrainWater"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入干粮水分占比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="deptBudgetList.tidalGrainWater"
-              type="number" @mousewheel.native.prevent
-              placeholder="请输入潮粮水分占比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
-            <ws-input
-              disabled
-              v-model="deptBudgetList.pureWeight"
-              type="number" @mousewheel.native.prevent
-              placeholder="不可编辑，自动计算"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!-- 品级 -->
-          <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              v-model="deptBudgetList.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!--经办人-->
-          <ws-form-item label="经办人" span="1" prop="agent">
-           <el-select
-              v-model="deptBudgetList.agent"
-              placeholder="请选择经办人"
-              filterable
-              clearable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="出库日期"
+        <div class="flex">
+          <div class="left" style='width:66.6666%'>
+            <ws-info-table>
+              <ws-form-item label="合同编号" span="1" prop="contractNo">
+                <ws-select
+                  v-model="deptBudgetList.contractNo"
+                  placeholder="请选择合同编号或移库任务编号"
+                  class="typeselect"
+                  @change='contractNoChange'
+                >
+                  <ws-option
+                    v-for="item in outContractNo"
+                    :key="item.constKey"
+                    :label="item.contractNo"
+                    :value="item.contractNo"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--毛重（吨）-->
+              <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
+                <ws-input
+                  @input="grossWeightchange"
+                  v-model="deptBudgetList.grossWeight"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="请输入毛重"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- 货名 -->
+              <ws-form-item label="货名" span="1">
+                <ws-select
+                disabled
+                  v-model="deptBudgetList.goodsName"
+                  placeholder
+                  class="typeselect"
+                  @change="selectgoodsName"
+                >
+                  <ws-option
+                    v-for="item in goodnameList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--皮重（吨）-->
+              <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
+                <ws-input
+                  @input="tarechange"
+                  v-model="deptBudgetList.tare"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="请输入皮重"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="提示" span="1" prop="tips">
+              <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <!--净重（吨）-->
+              <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+                <ws-input
+                  readonly="readonly"
+                  v-model="deptBudgetList.netWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="类型" span="1" prop="type">
+                  <ws-select disabled v-model="deptBudgetList.type"  @change="typeChange">
+                    <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
+                  </ws-select>
+                </ws-form-item>
+               <!--出库日期-->
+              <ws-form-item
+                label="出库日期"
+                span="1"
+                prop="inOutDate"
+                class="deliverydate"
+              >
+                <ws-date-picker
+                  v-model="deptBudgetList.inOutDate"
+                  type="date"
+                  placeholder="请选择出库日期"
+                  value-format="yyyy-MM-dd"
+                />
+              </ws-form-item>
+              <!-- <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
+                <ws-input
+                  @input='pureweight'
+                  v-model="deptBudgetList.buckleWeightRatio"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="请输入扣重比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
+                <ws-input
+                @input='pureweight'
+                  v-model="deptBudgetList.solidGrainWater"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="请输入干粮水分占比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
+                <ws-input
+                @input='pureweight'
+                  v-model="deptBudgetList.tidalGrainWater"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="请输入潮粮水分占比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='deptBudgetList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
+                <ws-input
+                  disabled
+                  v-model="deptBudgetList.pureWeight"
+                  type="number" @mousewheel.native.prevent
+                  placeholder="不可编辑，自动计算"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item> -->
+              <!-- 品级 -->
+              <ws-form-item label="品级" span="1" class="readonly">
+                <ws-select
+                  v-model="deptBudgetList.grade"
+                  placeholder=""
+                  class="typeselect"
+                  @change="selectpackingMethod"
+                >
+                  <ws-option
+                    v-for="item in gradeList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--经办人-->
+              <ws-form-item label="经办人" span="1" prop="agent">
+              <el-select
+                  v-model="deptBudgetList.agent"
+                  placeholder="请选择经办人"
+                  filterable
+                  clearable
+                  @change="selectstaff"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.staffName"
+                    :value="item.staffName"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- 出库类型 -->
+              <ws-form-item label="出库类型" span="1">
+                <ws-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType" placeholder='暂无' />
+                <!-- <ws-select
+                  v-model="deptBudgetList.deliveryType"
+                  placeholder=""
+                  class="typeselect"
+                  @change="selectstorageType"
+                >
+                  <ws-option
+                    v-for="item in deliveryType"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select> -->
+              </ws-form-item>
+            </ws-info-table>
+          </div>
+          <div class="right" style='width:33.3333%'>
+            <ws-info-table>
+             <ws-form-item label="运输方式" span="1" prop="outType">
+                <el-select
+                  v-model="deptBudgetList.outType"
+                  placeholder="请选择运输方式"
+                >
+                  <el-option
+                    v-for="item in multiSelector"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- <ws-form-item label="车牌号" span="1" prop="carNo">
+                <ws-input
+                  v-if="!carstatus"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small"
+                />
+                <el-select
+                  v-if="carstatus"
+                  filterable
+                  clearable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <ws-form-item label="箱号-1" span="1" prop="boxNo">
+                <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+                <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+                <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item> -->
+              <!--车牌号  -->
+              <ws-form-item
+            label="车牌号"
             span="1"
-            prop="inOutDate"
-            class="deliverydate"
+            prop="carNo"
+            v-if="
+              deptBudgetList.outType == '汽运' ||
+              deptBudgetList.outType == '集装箱船'
+            "
           >
-            <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
-              type="date"
-              placeholder="请选择出库日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
-          <!-- 出库类型 -->
-          <ws-form-item label="出库类型" span="1">
-            <ws-input v-model='deptBudgetList.inOutType' class="right-bottom" :disabled="isSelectType" placeholder='暂无' />
-            <!-- <ws-select
-              v-model="deptBudgetList.deliveryType"
-              placeholder=""
-              class="typeselect"
-              @change="selectstorageType"
-            >
-              <ws-option
-                v-for="item in deliveryType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select> -->
-          </ws-form-item>
-          <!--车牌号-->
-         <ws-form-item label="车牌号" span="1" prop="carNo">
             <ws-input
               v-if="!carstatus"
               v-model="deptBudgetList.carNo"
@@ -240,39 +316,138 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item label="箱号-1" span="1" prop="boxNo">
-            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
-            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
-            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
-            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="航次" span="1" prop="shipNumber">
-            <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="船名" span="1" prop="shipName">
-            <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20"
-              size="small" />
-          </ws-form-item>
-        </ws-info-table>
+              <!--船名  -->
+              <ws-form-item
+                label="船名"
+                span="1"
+                prop="carNo"
+                v-if="deptBudgetList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入船名"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="航次"
+                span="1"
+                prop="shipNumber"
+                v-if="deptBudgetList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.shipNumber"
+                  placeholder="请输入航次"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--车号  -->
+              <ws-form-item
+                label="车号"
+                span="1"
+                prop="carNo"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车号"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-1"
+                span="1"
+                prop="boxNo"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.boxNo"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-2"
+                span="1"
+                prop="boxNoOther"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.boxNoOther"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-1"
+                span="1"
+                prop="titleNo"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.titleNo"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-2"
+                span="1"
+                prop="titleNoOther"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.titleNoOther"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-1"
+                span="1"
+                prop="wingNumber"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.wingNumber"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-2"
+                span="1"
+                prop="wingNumberOther"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.wingNumberOther"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+            </ws-info-table>
+          </div>
+        </div>
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
@@ -474,6 +649,24 @@ export default {
           },
         ],
       },
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
       size: 10,
       compId: localStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -525,6 +718,7 @@ export default {
       this.$router.push({ path: 'warehouseManagementList' })
     },
         carChange(e) {
+          console.log(e)
       for (let i = 0; i < this.tranCarInfoList.length; i++) {
         if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
           this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
@@ -554,10 +748,10 @@ export default {
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
                if(this.outContractNo[i].unitContractPrice){
-                   this.deptBudgetList.tips='入货库'+data.receiveWarehouse+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+                   this.deptBudgetList.tips='入货库'+this.outContractNo[i].receiveWarehouse+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               }
               else{
-                this.deptBudgetList.tips='入货库'+data.receiveWarehouse
+                this.deptBudgetList.tips='入货库'+this.outContractNo[i].receiveWarehouse
               }
               this.deptBudgetList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
@@ -1527,18 +1721,39 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .left{
   .el-form-item {
-    width: 33.3333%;
+    width: 50%;
+    // width: 33.3333%;
     border: none;
+
     .el-form-item__label {
       background: transparent;
       border: none;
     }
+
     .el-form-item__content {
       border: none;
     }
   }
 }
+.right{
+  .el-form-item {
+    width: 100%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+}
 .el-button--default {
   color: #5473e8;
   border-color: #5473e8;

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -225,6 +225,7 @@ export default {
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
+            outType:row.outType,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,
@@ -265,6 +266,7 @@ export default {
             contractNo: row.contractNo,
             goodsName: row.goodsName,
             goodsNameKey: row.goodsNameKey,
+            outType:row.outType,
             grade: row.grade,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -40,8 +40,10 @@
           <div class="car-no">{{ dataList.carNo }}</div>
         </div>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-          <!--任务编号-->
+        <div class="flex">
+          <div class="left" style='width:66.6666%;'>
+            <ws-info-table>
+         <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
             <el-select
               filterable
@@ -59,6 +61,18 @@
               />
             </el-select>
           </ws-form-item>
+           <!--毛重（公斤）-->
+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
+            <ws-input
+              :disabled="allowEdit"
+              @input="grossWeightchange"
+              v-model="dataList.grossWeight"
+              placeholder="请输入毛重"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <el-select
               disabled
@@ -77,6 +91,23 @@
               />
             </el-select>
           </ws-form-item>
+          <!--皮重（公斤）-->
+          <ws-form-item
+            label="皮重（公斤）"
+            span="1"
+            prop="tare"
+            class="readonly"
+          >
+            <ws-input
+              :disabled="allowEdit"
+              @input="tarechange"
+              v-model="dataList.tare"
+              placeholder="请输入皮重"
+              maxlength="100"
+              size="small"
+            />
+            <el-button type="primary" @click="openPort">重新获取</el-button>
+          </ws-form-item>
           <ws-form-item label="提示" span="1" prop="tips">
             <ws-input
               onmouseover="this.title=this.value"
@@ -85,6 +116,21 @@
               size="small"
             />
           </ws-form-item>
+          <ws-form-item
+            label="扣重（公斤）"
+            span="1"
+            prop="deductionWeight"
+            class="readonly"
+          >
+            <ws-input
+              @input="tarechange"
+              v-model="dataList.deductionWeight"
+              placeholder="请输入扣重"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select
@@ -102,6 +148,16 @@
               />
             </ws-select>
           </ws-form-item>
+          <!--净重（公斤）-->
+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
+            <ws-input
+              disabled
+              v-model="dataList.netWeight"
+              placeholder="不可编辑，自动计算"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
             <ws-select disabled v-model="dataList.type" @change="typeChange">
               <ws-option
@@ -112,59 +168,80 @@
               />
             </ws-select>
           </ws-form-item>
-          <!--毛重（公斤）-->
-          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
+          <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
             <ws-input
-              :disabled="allowEdit"
-              @input="grossWeightchange"
-              v-model="dataList.grossWeight"
-              placeholder="请输入毛重"
-              maxlength="20"
+              @input="kkInput(dataList.deductionAmount)"
+              v-model="dataList.deductionAmount"
+              placeholder="请输入扣款金额"
+              maxlength="120"
               size="small"
             />
           </ws-form-item>
-
-          <!--皮重（公斤）-->
-          <ws-form-item
-            label="皮重（公斤）"
-            span="1"
-            prop="tare"
-            class="readonly"
-          >
-            <ws-input
-              :disabled="allowEdit"
-              @input="tarechange"
-              v-model="dataList.tare"
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-            <el-button type="primary" @click="openPort">重新获取</el-button>
+         
+           <!-- 品级 -->
+          <ws-form-item label="品级" span="1" class="readonly">
+            <ws-select
+              v-model="dataList.grade"
+              placeholder
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <ws-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
           </ws-form-item>
           <ws-form-item
-            label="扣重（公斤）"
+            label="入库日期"
             span="1"
-            prop="deductionWeight"
-            class="readonly"
+            prop="inOutDate"
+            class="deliverydate"
           >
-            <ws-input
-              @input="tarechange"
-              v-model="dataList.deductionWeight"
-              placeholder="请输入扣重"
-              maxlength="100"
-              size="small"
-            />
+            <el-date-picker
+              v-model="dataList.inOutDate"
+              placeholder="请选择入库日期"
+              type="date"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
           </ws-form-item>
-          <!--净重（公斤）-->
-          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
-            <ws-input
-              disabled
-              v-model="dataList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
+          <!--经办人-->
+          <ws-form-item label="经办人" span="1" prop="agent">
+            <el-select
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
           </ws-form-item>
+          <!-- 入库类型 -->
+          <ws-form-item label="入库类型" span="1">
+            <ws-select
+              v-model="dataList.inOutType"
+              placeholder
+              class="typeselect"
+              @change="selectstorageType"
+              :disabled="isSelectType"
+            >
+              <ws-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+<!--           
           <ws-form-item
             v-if="dataList.type == '潮粮'"
             label="扣重比"
@@ -225,86 +302,48 @@
               size="small"
             />
           </ws-form-item>
-          <!--净重（公斤）-->
-          <ws-form-item label="扣款（元/公斤）" span="1" prop="deductionAmount">
+           -->
+        </ws-info-table>
+          </div>
+          <div class="right" style='width:33.3333%;'>
+            <ws-info-table>
+          <ws-form-item label="成本" span="1" prop="cost">
             <ws-input
-              @input="kkInput(dataList.deductionAmount)"
-              v-model="dataList.deductionAmount"
-              placeholder="请输入扣款金额"
-              maxlength="120"
+              :disabled="disabled1"
+              v-model="dataList.cost"
+              placeholder="请输入成本"
               size="small"
             />
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick(1)"
+              alt=""
+            />
           </ws-form-item>
-          <!-- 品级 -->
-          <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-
-          <!--经办人-->
-          <ws-form-item label="经办人" span="1" prop="agent">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="入库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
-            <el-date-picker
-              v-model="dataList.inOutDate"
-              placeholder="请选择入库日期"
-              type="date"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
-          </ws-form-item>
-          <!-- 入库类型 -->
-          <ws-form-item label="入库类型" span="1">
-            <ws-select
-              v-model="dataList.inOutType"
-              placeholder
-              class="typeselect"
-              @change="selectstorageType"
-              :disabled="isSelectType"
-            >
-              <ws-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
+          <ws-form-item label="运费" span="1" prop="freight">
+            <ws-input
+              :disabled="disabled2"
+              v-model="dataList.freight"
+              placeholder="请输入运费"
+              size="small"
+            />
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick(2)"
+              alt=""
+            />
           </ws-form-item>
           <!--入库方式-->
-          <ws-form-item label="入库方式" span="1" prop="outType">
+          <ws-form-item label="运输方式" span="1" prop="outType">
             <el-select
               v-model="deptBudgetList.outType"
-              placeholder="请选择入库方式"
+              placeholder="请选择运输方式"
             >
               <el-option
                 v-for="item in multiSelector"
@@ -465,39 +504,11 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="成本" span="1" prop="cost">
-            <ws-input
-              :disabled="disabled1"
-              v-model="dataList.cost"
-              placeholder="请输入成本"
-              size="small"
-            />
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="editClick(1)"
-              alt=""
-            />
-          </ws-form-item>
-          <ws-form-item label="运费" span="1" prop="freight">
-            <ws-input
-              :disabled="disabled2"
-              v-model="dataList.freight"
-              placeholder="请输入运费"
-              size="small"
-            />
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="editClick(2)"
-              alt=""
-            />
-          </ws-form-item>
+         
         </ws-info-table>
+          </div>
+        </div>
+        
         <div
           v-show="
             this.$route.query.warehouseType == 2 &&
@@ -2098,8 +2109,26 @@ export default {
     border: none;
   }
 
+  .left{
+  .el-form-item {
+    width: 50%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.right{
   .el-form-item {
-    width: 33.3333%;
+    width: 100%;
+    // width: 33.3333%;
     border: none;
 
     .el-form-item__label {
@@ -2112,6 +2141,7 @@ export default {
     }
   }
 }
+}
 
 .title {
   position: relative;

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -41,8 +41,10 @@
           <div class="car-no">{{ dataList.carNo }}</div>
         </div>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-          <!--任务编号-->
+        <div class="flex">
+          <div class="left" style='width:66.6666%;'>
+            <ws-info-table>
+               <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
             <el-select
               filterable
@@ -59,6 +61,18 @@
                 :value="item.inOutTaskNo"
               />
             </el-select>
+          </ws-form-item>
+           <!--毛重（公斤）-->
+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
+            <ws-input
+              :disabled="allowEdit"
+              @input="grossWeightchange"
+              v-model="dataList.grossWeight"
+              placeholder="请输入毛重"
+              maxlength="20"
+              size="small"
+            />
+            <el-button type="primary" @click="openPort">重新获取</el-button>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-select
@@ -76,6 +90,22 @@
               />
             </ws-select>
           </ws-form-item>
+          <!--皮重（公斤）-->
+          <ws-form-item
+            label="皮重（公斤）"
+            span="1"
+            prop="tare"
+            class="readonly"
+          >
+            <ws-input
+              :disabled="allowEdit"
+              @input="tarechange"
+              v-model="dataList.tare"
+              placeholder="请输入皮重"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
           <ws-form-item label="提示" span="1" prop="tips">
             <ws-input
               onmouseover="this.title=this.value"
@@ -84,6 +114,16 @@
               size="small"
             />
           </ws-form-item>
+          <!--净重（公斤）-->
+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
+            <ws-input
+              readonly="readonly"
+              v-model="dataList.netWeight"
+              placeholder="不可编辑，自动计算"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select
@@ -101,7 +141,20 @@
               />
             </ws-select>
           </ws-form-item>
-
+          <!--出库日期-->
+          <ws-form-item
+            label="出库日期"
+            span="1"
+            prop="inOutDate"
+            class="deliverydate"
+          >
+            <ws-date-picker
+              v-model="dataList.inOutDate"
+              type="date"
+              placeholder="请选择出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
             <ws-select disabled v-model="dataList.type" @change="typeChange">
               <ws-option
@@ -112,46 +165,23 @@
               />
             </ws-select>
           </ws-form-item>
-          <!--毛重（公斤）-->
-          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
-            <ws-input
-              :disabled="allowEdit"
-              @input="grossWeightchange"
-              v-model="dataList.grossWeight"
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-            <el-button type="primary" @click="openPort">重新获取</el-button>
-          </ws-form-item>
-
-          <!--皮重（公斤）-->
-          <ws-form-item
-            label="皮重（公斤）"
-            span="1"
-            prop="tare"
-            class="readonly"
-          >
-            <ws-input
-              :disabled="allowEdit"
-              @input="tarechange"
-              v-model="dataList.tare"
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（公斤）-->
-          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
-            <ws-input
-              readonly="readonly"
-              v-model="dataList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
+           <!-- 出库类型 -->
+          <ws-form-item label="出库类型" span="1">
+            <ws-select
+              v-model="dataList.inOutType"
+              placeholder=""
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <ws-option
+                v-for="item in deliveryType"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
           </ws-form-item>
-          <ws-form-item
+          <!-- <ws-form-item
             v-if="dataList.type == '潮粮'"
             label="扣重比"
             span="1"
@@ -210,7 +240,7 @@
               maxlength="100"
               size="small"
             />
-          </ws-form-item>
+          </ws-form-item> -->
           <!-- 品级 -->
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
@@ -244,44 +274,37 @@
               />
             </el-select>
           </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="出库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="dataList.inOutDate"
-              type="date"
-              placeholder="请选择出库日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
-          <!-- 出库类型 -->
-          <ws-form-item label="出库类型" span="1">
-            <ws-select
-              v-model="dataList.inOutType"
-              placeholder=""
-              class="typeselect"
-              @change="selectstorageType"
+        </ws-info-table>
+          </div>
+          <div class="right" style='width:33.3333%'>
+              <ws-info-table>
+          <ws-form-item label="运输方式" span="1" prop="outType">
+            <el-select
+              v-model="dataList.outType"
+              placeholder="请选择运输方式"
             >
-              <ws-option
-                v-for="item in deliveryType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+              <el-option
+                v-for="item in multiSelector"
+                :key="item.value"
+                :label="item.name"
+                :value="item.name"
               />
-            </ws-select>
+            </el-select>
           </ws-form-item>
-
-          <!--车牌号-->
-          <ws-form-item label="车牌号" span="1" prop="carNo">
+          <ws-form-item
+            label="车牌号"
+            span="1"
+            prop="carNo"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
+          >
             <ws-input
               v-if="!carstatus"
               v-model="dataList.carNo"
               placeholder="请输入车牌号"
-              maxlength="20"
+              maxlength="7"
               size="small"
             />
             <el-select
@@ -289,7 +312,7 @@
               filterable
               clearable
               :filter-method="dataFilter2"
-              v-model="deptBudgetList.carNo"
+              v-model="dataList.carNo"
               placeholder="请选择车牌号"
               class="typeselect"
               @change="carChange"
@@ -302,7 +325,28 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+
+          <ws-form-item
+            label="车号"
+            span="1"
+            prop="carNo"
+            v-if="dataList.outType == '火运'"
+          >
+            <ws-input
+              v-model="dataList.carNo"
+              placeholder="请输入车号"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="箱号-1"
+            span="1"
+            prop="boxNo"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
+          >
             <ws-input
               v-model="dataList.boxNo"
               placeholder="请输入箱号"
@@ -310,7 +354,15 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+          <ws-form-item
+            label="箱号-2"
+            span="1"
+            prop="boxNoOther"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
+          >
             <ws-input
               v-model="dataList.boxNoOther"
               placeholder="请输入箱号"
@@ -318,7 +370,15 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
+          <ws-form-item
+            label="封号-1"
+            span="1"
+            prop="titleNo"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
+          >
             <ws-input
               v-model="dataList.titleNo"
               placeholder="请输入封号"
@@ -326,7 +386,15 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+          <ws-form-item
+            label="封号-2"
+            span="1"
+            prop="titleNoOther"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
+          >
             <ws-input
               v-model="dataList.titleNoOther"
               placeholder="请输入封号"
@@ -334,7 +402,12 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+          <ws-form-item
+            label="车厢号-1"
+            span="1"
+            prop="wingNumber"
+            v-if="dataList.outType == '火运'"
+          >
             <ws-input
               v-model="dataList.wingNumber"
               placeholder="请输入车厢号"
@@ -342,7 +415,12 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+          <ws-form-item
+            label="车厢号-2"
+            span="1"
+            prop="wingNumberOther"
+            v-if="dataList.outType == '火运'"
+          >
             <ws-input
               v-model="dataList.wingNumberOther"
               placeholder="请输入车厢号"
@@ -350,7 +428,35 @@
               size="small"
             />
           </ws-form-item>
+          <ws-form-item
+            label="船名"
+            span="1"
+            prop="shipName"
+            v-if="dataList.outType == '散船'"
+          >
+            <ws-input
+              v-model="dataList.shipName"
+              placeholder="请输入船名"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item
+            label="航次"
+            span="1"
+            prop="shipNumber"
+            v-if="dataList.outType == '散船'"
+          >
+            <ws-input
+              v-model="dataList.shipNumber"
+              placeholder="请输入航次"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
         </ws-info-table>
+          </div>
+        </div>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
@@ -524,6 +630,24 @@ export default {
       showType: true,
       // 年
       year: '',
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
       readonly: true,
       typeList: ['干粮', '潮粮'],
       qualityInspectorList: [],
@@ -1643,8 +1767,26 @@ export default {
     border: none;
   }
 
+  .left{
+  .el-form-item {
+    width: 50%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.right{
   .el-form-item {
-    width: 33.3333%;
+    width: 100%;
+    // width: 33.3333%;
     border: none;
 
     .el-form-item__label {
@@ -1657,6 +1799,7 @@ export default {
     }
   }
 }
+}
 
 .title {
   position: relative;

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -33,190 +33,265 @@
           <span v-show="this.$route.query.warehouseType == 2"> (临) </span>
         </h2>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-         <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select
-              v-model="dataList.contractNo"
-              placeholder="请选择合同编号或移库任务编号"
-              class="typeselect"
-              @change='contractNoChange'
-            >
-              <ws-option
-                v-for="item in outContractNo"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!-- 货名 -->
-          <ws-form-item label="货名" span="1">
-            <ws-select
-            disabled
-              v-model="dataList.goodsName"
-              placeholder
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <ws-form-item label="类型" span="1" prop="type">
-              <ws-select disabled v-model="dataList.type"  @change="typeChange">
-                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
-              </ws-select>
-            </ws-form-item>
-          <!--毛重（吨）-->
-          <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
-            <ws-input
-              @input="grossWeightchange"
-              v-model="dataList.grossWeight"
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--皮重（吨）-->
-          <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
-            <ws-input
-              @input="tarechange"
-              v-model="dataList.tare"
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
-            <ws-input
-              readonly="readonly"
-              v-model="dataList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
-            <ws-input
-              @input='pureweight'
-              v-model="dataList.buckleWeightRatio"
-              placeholder="请输入扣重比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='dataList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="dataList.solidGrainWater"
-              placeholder="请输入干粮水分占比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='dataList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
-            <ws-input
-            @input='pureweight'
-              v-model="dataList.tidalGrainWater"
-              placeholder="请输入潮粮水分占比"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='dataList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
-            <ws-input
-              disabled
-              v-model="dataList.pureWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!-- 品级 -->
-          <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              v-model="dataList.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!--经办人-->
-          <ws-form-item label="经办人" span="1" prop="agent">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              clearable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="出库日期"
+        <div class="flex">
+          <div class="left" style='width:66.6666%;'>
+            <ws-info-table>
+              <ws-form-item label="合同编号" span="1" prop="contractNo">
+                <ws-select
+                  v-model="dataList.contractNo"
+                  placeholder="请选择合同编号或移库任务编号"
+                  class="typeselect"
+                  @change='contractNoChange'
+                >
+                  <ws-option
+                    v-for="item in outContractNo"
+                    :key="item.constKey"
+                    :label="item.contractNo"
+                    :value="item.contractNo"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--毛重（吨）-->
+              <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
+                <ws-input
+                  @input="grossWeightchange"
+                  v-model="dataList.grossWeight"
+                  placeholder="请输入毛重"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- 货名 -->
+              <ws-form-item label="货名" span="1">
+                <ws-select
+                disabled
+                  v-model="dataList.goodsName"
+                  placeholder
+                  class="typeselect"
+                  @change="selectgoodsName"
+                >
+                  <ws-option
+                    v-for="item in goodnameList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--皮重（吨）-->
+              <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
+                <ws-input
+                  @input="tarechange"
+                  v-model="dataList.tare"
+                  placeholder="请输入皮重"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="类型" span="1" prop="type">
+                  <ws-select disabled v-model="dataList.type"  @change="typeChange">
+                    <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
+                  </ws-select>
+                </ws-form-item>
+              <!--净重（吨）-->
+              <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+                <ws-input
+                  readonly="readonly"
+                  v-model="dataList.netWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
+                <ws-input
+                  @input='pureweight'
+                  v-model="dataList.buckleWeightRatio"
+                  placeholder="请输入扣重比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='dataList.type=="潮粮"' label="干粮水分占比" span="1" prop="solidGrainWater" class="readonly">
+                <ws-input
+                @input='pureweight'
+                  v-model="dataList.solidGrainWater"
+                  placeholder="请输入干粮水分占比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='dataList.type=="潮粮"' label="潮粮水分占比" span="1" prop="tidalGrainWater" class="readonly">
+                <ws-input
+                @input='pureweight'
+                  v-model="dataList.tidalGrainWater"
+                  placeholder="请输入潮粮水分占比"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item v-if='dataList.type=="潮粮"' label="纯重" span="1" prop="pureWeight" class="readonly">
+                <ws-input
+                  disabled
+                  v-model="dataList.pureWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item> -->
+              <!-- 品级 -->
+              <ws-form-item label="品级" span="1" class="readonly">
+                <ws-select
+                  v-model="dataList.grade"
+                  placeholder=""
+                  class="typeselect"
+                  @change="selectpackingMethod"
+                >
+                  <ws-option
+                    v-for="item in gradeList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--出库日期-->
+              <ws-form-item
+                label="出库日期"
+                span="1"
+                prop="inOutDate"
+                class="deliverydate"
+              >
+                <ws-date-picker
+                  v-model="dataList.inOutDate"
+                  type="date"
+                  placeholder="请选择出库日期"
+                  value-format="yyyy-MM-dd"
+                />
+              </ws-form-item>
+              <!--经办人-->
+              <ws-form-item label="经办人" span="1" prop="agent">
+                <el-select
+                  v-model="dataList.agent"
+                  placeholder="请选择经办人"
+                  filterable
+                  clearable
+                  @change="selectstaff"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.staffName"
+                    :value="item.staffName"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- 出库类型 -->
+              <ws-form-item label="出库类型" span="1">
+                <ws-select
+                  v-model="dataList.inOutType"
+                  placeholder=""
+                  class="typeselect"
+                  @change="selectstorageType"
+                >
+                  <ws-option
+                    v-for="item in deliveryType"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+            </ws-info-table>
+          </div>
+          <div class="right" style='width:33.3333%;'>
+            <ws-info-table>
+              <ws-form-item label="运输方式" span="1" prop="outType">
+                <el-select
+                  v-model="dataList.outType"
+                  placeholder="请选择运输方式"
+                >
+                  <el-option
+                    v-for="item in multiSelector"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- <ws-form-item label="车牌号" span="1" prop="carNo">
+                <ws-input
+                  v-if="!carstatus"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small"
+                />
+                <el-select
+                  v-if="carstatus"
+                  filterable
+                  clearable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <ws-form-item label="箱号-1" span="1" prop="boxNo">
+                <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+                <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+                <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item> -->
+              <!--车牌号  -->
+              <ws-form-item
+            label="车牌号"
             span="1"
-            prop="inOutDate"
-            class="deliverydate"
+            prop="carNo"
+            v-if="
+              dataList.outType == '汽运' ||
+              dataList.outType == '集装箱船'
+            "
           >
-            <ws-date-picker
-              v-model="dataList.inOutDate"
-              type="date"
-              placeholder="请选择出库日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
-          <!-- 出库类型 -->
-          <ws-form-item label="出库类型" span="1">
-            <ws-select
-              v-model="dataList.inOutType"
-              placeholder=""
-              class="typeselect"
-              @change="selectstorageType"
-            >
-              <ws-option
-                v-for="item in deliveryType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-
-          <!--车牌号-->
-          <ws-form-item label="车牌号" span="1" prop="carNo">
             <ws-input
               v-if="!carstatus"
               v-model="dataList.carNo"
               placeholder="请输入车牌号"
-              maxlength="20"
+              maxlength="7"
               size="small"
             />
-             <el-select
+            <el-select
               v-if="carstatus"
               filterable
               clearable
               :filter-method="dataFilter2"
-              v-model="deptBudgetList.carNo"
+              v-model="dataList.carNo"
               placeholder="请选择车牌号"
               class="typeselect"
               @change="carChange"
@@ -229,39 +304,138 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item label="箱号-1" span="1" prop="boxNo">
-            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
-            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
-            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
-            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="航次" span="1" prop="shipNumber">
-            <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="船名" span="1" prop="shipName">
-            <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20"
-              size="small" />
-          </ws-form-item>
-        </ws-info-table>
+              <!--船名  -->
+              <ws-form-item
+                label="船名"
+                span="1"
+                prop="carNo"
+                v-if="dataList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="dataList.carNo"
+                  placeholder="请输入船名"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="航次"
+                span="1"
+                prop="shipNumber"
+                v-if="dataList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="dataList.shipNumber"
+                  placeholder="请输入航次"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--车号  -->
+              <ws-form-item
+                label="车号"
+                span="1"
+                prop="carNo"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.carNo"
+                  placeholder="请输入车号"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-1"
+                span="1"
+                prop="boxNo"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.boxNo"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-2"
+                span="1"
+                prop="boxNoOther"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.boxNoOther"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-1"
+                span="1"
+                prop="titleNo"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.titleNo"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-2"
+                span="1"
+                prop="titleNoOther"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.titleNoOther"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-1"
+                span="1"
+                prop="wingNumber"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.wingNumber"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-2"
+                span="1"
+                prop="wingNumberOther"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.wingNumberOther"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+            </ws-info-table>
+          </div>
+        </div>
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
@@ -411,6 +585,24 @@ export default {
       showType: true,
       // 年
       year: '',
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
       readonly: true,
       typeList:['干粮','潮粮'],
       deptBudgetTotal: 0,
@@ -468,7 +660,7 @@ export default {
         netWeight: '',
         grade: '',
         agent: '',
-        
+        outType:'',
         carNo: '',
         inOutDate: '',
         inOutType: '',
@@ -507,10 +699,11 @@ export default {
     this.dataList.warehouseName = this.$route.query.warehouseName
     this.dataList.binNumber = this.$route.query.binNumber
     this.dataList.tare = this.$route.query.tare
-    this.dataList.netWeight = this.$route.query.netWeight.toFixed(2)
+    this.dataList.netWeight = Number(this.$route.query.netWeight).toFixed(2)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
+    this.dataList.outType = this.$route.query.outType
     this.dataList.inOutDate = this.$route.query.inOutDate
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.inOutType = this.$route.query.inOutType
@@ -1181,18 +1374,39 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .left{
+  .el-form-item {
+    width: 50%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.right{
   .el-form-item {
-    width: 33.3333%;
+    width: 100%;
+    // width: 33.3333%;
     border: none;
+
     .el-form-item__label {
       background: transparent;
       border: none;
     }
+
     .el-form-item__content {
       border: none;
     }
   }
 }
+}
 .title {
   position: relative;
   padding-left: 10px;

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -32,87 +32,97 @@
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <el-select
-            filterable
-            :filter-method="dataFilter1"
-              v-model="dataList.contractNo"
-              placeholder="请选择合同编号或移库任务编号"
-              class="typeselect"
-              @change='contractNoChange'
-            >
-              <el-option
-                v-for="item in options1"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              />
-            </el-select>
-          </ws-form-item>
-          <!-- 货名 -->
-          <ws-form-item label="货名" span="1">
-            <ws-select
-            disabled
-              v-model="dataList.goodsName"
-              placeholder
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-          <ws-form-item label="类型" span="1" prop="type">
-              <ws-select disabled v-model="dataList.type"  @change="typeChange">
-                <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
-              </ws-select>
-            </ws-form-item>
-          <!--毛重（吨）-->
-          <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
-            <ws-input
-              @input="grossWeightchange"
-              v-model="dataList.grossWeight"
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--皮重（吨）-->
-          <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
-            <ws-input
-              @input="tarechange"
-              v-model="dataList.tare"
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="扣重（吨）" span="1" prop="deductionWeight" class="readonly">
-            <ws-input
-            @input="tarechange"
-              v-model="dataList.deductionWeight"
-              placeholder="请输入扣重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
-            <ws-input
-              readonly="readonly"
-              v-model="dataList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
+        <div class="flex">
+          <div class="left" style='width:66.6666%;'>
+            <ws-info-table>
+              <ws-form-item label="合同编号" span="1" prop="contractNo">
+                <el-select
+                filterable
+                :filter-method="dataFilter1"
+                  v-model="dataList.contractNo"
+                  placeholder="请选择合同编号或移库任务编号"
+                  class="typeselect"
+                  @change='contractNoChange'
+                >
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.constKey"
+                    :label="item.contractNo"
+                    :value="item.contractNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!--毛重（吨）-->
+              <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
+                <ws-input
+                  @input="grossWeightchange"
+                  v-model="dataList.grossWeight"
+                  placeholder="请输入毛重"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- 货名 -->
+              <ws-form-item label="货名" span="1">
+                <ws-select
+                disabled
+                  v-model="dataList.goodsName"
+                  placeholder
+                  class="typeselect"
+                  @change="selectgoodsName"
+                >
+                  <ws-option
+                    v-for="item in goodnameList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--皮重（吨）-->
+              <ws-form-item label="皮重（吨）" span="1" prop="tare" class="readonly">
+                <ws-input
+                  @input="tarechange"
+                  v-model="dataList.tare"
+                  placeholder="请输入皮重"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="类型" span="1" prop="type">
+                  <ws-select disabled v-model="dataList.type"  @change="typeChange">
+                    <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
+                  </ws-select>
+              </ws-form-item>
+              <ws-form-item label="扣重（吨）" span="1" prop="deductionWeight" class="readonly">
+                <ws-input
+                @input="tarechange"
+                  v-model="dataList.deductionWeight"
+                  placeholder="请输入扣重"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+               <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
+                <ws-input
+                @input="kkInput(dataList.deductionAmount)"
+                  v-model="dataList.deductionAmount"
+                  placeholder="请输入扣款金额"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--净重（吨）-->
+              <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+                <ws-input
+                  readonly="readonly"
+                  v-model="dataList.netWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+          <!-- <ws-form-item v-if='dataList.type=="潮粮"' label="扣重比" span="1" prop="buckleWeightRatio" class="readonly">
             <ws-input
               @input='pureweight'
               v-model="dataList.buckleWeightRatio"
@@ -147,160 +157,69 @@
               maxlength="100"
               size="small"
             />
-          </ws-form-item>
+          </ws-form-item> -->
           <!--净重（吨）-->
-          <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
-            <ws-input
-            @input="kkInput(dataList.deductionAmount)"
-              v-model="dataList.deductionAmount"
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <!-- 品级 -->
-          <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-
-          <!--经办人-->
-          <ws-form-item label="经办人" span="1" prop="agent">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              clearable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item label="入库日期" span="1" prop="inOutDate" class="deliverydate">
-            <el-date-picker
-              v-model="dataList.inOutDate"
-              placeholder="请选择入库日期"
-              type="date"
-              value-format="yyyy-MM-dd"
-            ></el-date-picker>
-          </ws-form-item>
-          <!-- 入库类型 -->
-          <ws-form-item label="入库类型" span="1">
-            <ws-select
-              v-model="dataList.inOutType"
-              placeholder
-              class="typeselect"
-              @change="selectstorageType"
-               :disabled="isSelectType"
-            >
-              <ws-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
+         
+            <!-- 品级 -->
+            <ws-form-item label="品级" span="1" class="readonly">
+              <ws-select
+                v-model="dataList.grade"
+                placeholder
+                class="typeselect"
+                @change="selectpackingMethod"
+              >
+                <ws-option
+                  v-for="item in gradeList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
 
-          <!--车牌号  -->
-          <ws-form-item label="车牌号" span="1" prop="carNo">
-            <ws-input
-            v-if='!carstatus'
-              v-model="dataList.carNo"
-              placeholder="请输入车牌号"
-              maxlength="7"
-              size="small"
-            />
-            <el-select
-            v-if='carstatus'
-            filterable
-            :filter-method="dataFilter2"
-              v-model="dataList.carNo"
-              placeholder="请选择车牌号"
-              class="typeselect"
-              @change='carChange'
-            >
-              <el-option
-                v-for="item in options2"
-                :key="item.constKey"
-                :label="item.carNo+'('+item.tranCarNo+')'"
-                :value="item.carNo"
-              />
-            </el-select>
-          </ws-form-item>
-          <ws-form-item label="箱号-1" span="1" prop="boxNo">
-            <ws-input v-model="dataList.boxNo" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-            <ws-input v-model="dataList.boxNoOther" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
-            <ws-input v-model="dataList.titleNo" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-            <ws-input v-model="dataList.titleNoOther" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
-            <ws-input v-model="dataList.wingNumber" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
-            <ws-input v-model="dataList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="成本" span="1" prop="cost">
-            <ws-input
-            :disabled='disabled1'
-              v-model="dataList.cost"
-              placeholder="请输入成本"
-              size="small"
-            />
-            <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(1)"
-            alt=""
-          />
-          </ws-form-item>
-          <ws-form-item label="运费" span="1" prop="freight">
-            <ws-input
-            :disabled='disabled2'
-              v-model="dataList.freight"
-              placeholder="请输入运费"
-              size="small"
-            />
-            <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(2)"
-            alt=""
-          />
-          </ws-form-item>
+            <!--经办人-->
+            <ws-form-item label="经办人" span="1" prop="agent">
+              <el-select
+                v-model="dataList.agent"
+                placeholder="请选择经办人"
+                filterable
+                clearable
+                @change="selectstaff"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.staffName"
+                  :value="item.staffName"
+                />
+              </el-select>
+            </ws-form-item>
+            <!--出库日期-->
+            <ws-form-item label="入库日期" span="1" prop="inOutDate" class="deliverydate">
+              <el-date-picker
+                v-model="dataList.inOutDate"
+                placeholder="请选择入库日期"
+                type="date"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </ws-form-item>
+            <!-- 入库类型 -->
+            <ws-form-item label="入库类型" span="1">
+              <ws-select
+                v-model="dataList.inOutType"
+                placeholder
+                class="typeselect"
+                @change="selectstorageType"
+                :disabled="isSelectType"
+              >
+                <ws-option
+                  v-for="item in storageType"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
         </ws-info-table>
         <div  v-show="this.$route.query.warehouseType == 2 && this.$route.query.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
@@ -336,6 +255,291 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
+          </div>
+          </div>
+          <div class="right"  style='width:33.3333%;'>
+            <ws-info-table>
+
+         <ws-form-item label="成本" span="1" prop="cost">
+                <ws-input
+                  :disabled="disabled1"
+                  v-model="dataList.cost"
+                  placeholder="请输入成本"
+                  size="small"
+                  type="number"
+                  @mousewheel.native.prevent
+                />
+                <img
+                  width="17"
+                  height="18"
+                  style="vertical-align: text-top; position: relative; top: -1px"
+                  src="../../../public/img/edit.png"
+                  @click="editClick(1)"
+                  alt=""
+                />
+              </ws-form-item>
+              <ws-form-item label="运费" span="1" prop="freight">
+                <ws-input
+                  :disabled="disabled2"
+                  v-model="dataList.freight"
+                  placeholder="请输入运费"
+                  size="small"
+                  type="number"
+                  @mousewheel.native.prevent
+                />
+                <img
+                  width="17"
+                  height="18"
+                  style="vertical-align: text-top; position: relative; top: -1px"
+                  src="../../../public/img/edit.png"
+                  @click="editClick(2)"
+                  alt=""
+                />
+              </ws-form-item>
+               <ws-form-item label="运输方式" span="1" prop="outType">
+                <el-select
+                  v-model="dataList.outType"
+                  placeholder="请选择运输方式"
+                >
+                  <el-option
+                    v-for="item in multiSelector"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- <ws-form-item label="车牌号" span="1" prop="carNo">
+                <ws-input
+                  v-if="!carstatus"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small"
+                />
+                <el-select
+                  v-if="carstatus"
+                  filterable
+                  clearable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <ws-form-item label="箱号-1" span="1" prop="boxNo">
+                <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+                <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+                <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item> -->
+              <!--车牌号  -->
+              <ws-form-item
+                label="车牌号"
+                span="1"
+                prop="carNo"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-if="options2.length==0"
+                  v-model="dataList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small" 
+                />
+                <el-select
+                  v-if='carstatus&&options2.length>0'
+                  filterable
+                  :filter-method="dataFilter2"
+                  v-model="dataList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+                <el-select
+                  v-if='!carstatus&&options2.length>0'
+                  filterable
+                  :filter-method="dataFilter2"
+                  v-model="dataList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!--船名  -->
+              <ws-form-item
+                label="船名"
+                span="1"
+                prop="carNo"
+                v-if="dataList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="dataList.carNo"
+                  placeholder="请输入船名"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="航次"
+                span="1"
+                prop="shipNumber"
+                v-if="dataList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="dataList.shipNumber"
+                  placeholder="请输入航次"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--车号  -->
+              <ws-form-item
+                label="车号"
+                span="1"
+                prop="carNo"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.carNo"
+                  placeholder="请输入车号"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-1"
+                span="1"
+                prop="boxNo"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.boxNo"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-2"
+                span="1"
+                prop="boxNoOther"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.boxNoOther"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-1"
+                span="1"
+                prop="titleNo"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.titleNo"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-2"
+                span="1"
+                prop="titleNoOther"
+                v-if="
+                  dataList.outType == '汽运' ||
+                  dataList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="dataList.titleNoOther"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-1"
+                span="1"
+                prop="wingNumber"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.wingNumber"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-2"
+                span="1"
+                prop="wingNumberOther"
+                v-if="dataList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="dataList.wingNumberOther"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+        </ws-info-table>
+        </div>
         </div>
       </div>
       <div class="small-title">上传磅单照片</div>
@@ -584,6 +788,24 @@ export default {
         deductionAmount:'',
         deductionWeigh:'',
       },
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -609,6 +831,7 @@ export default {
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
+    this.dataList.outType = this.$route.query.outType
     this.dataList.inOutDate = this.$route.query.inOutDate
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.inOutType = this.$route.query.inOutType
@@ -1532,18 +1755,39 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .left{
   .el-form-item {
-    width: 33.3333%;
+    width: 50%;
+    // width: 33.3333%;
     border: none;
+
     .el-form-item__label {
       background: transparent;
       border: none;
     }
+
     .el-form-item__content {
       border: none;
     }
   }
 }
+.right{
+  .el-form-item {
+    width: 100%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+}
 .title {
   position: relative;
   padding-left: 10px;

src/views/warehouse/warehouseManagementPut.vue

@@ -39,343 +39,538 @@
           >
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
-        <ws-info-table>
-          <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <el-select
-              filterable
-              :filter-method="dataFilter1"
-              v-model="deptBudgetList.contractNo"
-              placeholder="请选择合同编号或移库任务编号"
-              class="typeselect"
-              @change="contractNoChange"
-            >
-              <el-option
-                v-for="item in options1"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              />
-            </el-select>
-          </ws-form-item>
-          <!-- 货名 -->
-          <ws-form-item label="货名" span="1">
-            <ws-select
-              disabled
-              v-model="deptBudgetList.goodsName"
-              placeholder
-              class="typeselect"
-              @change="selectgoodsName"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-           <ws-form-item label="提示" span="1" prop="tips">
-           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
-              maxlength="20" size="small" />
-          </ws-form-item>
-          <ws-form-item label="类型" span="1" prop="type">
-            <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
-              <ws-option
-                v-for="item in typeList"
-                :key="item"
-                :label="item"
-                :value="item"
-              />
-            </ws-select>
-          </ws-form-item>
-          <!--毛重（吨）-->
-          <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
-            <ws-input
-              @input="grossWeightchange"
-              v-model="deptBudgetList.grossWeight"
-              placeholder="请输入毛重"
-              maxlength="20"
-              type="number"
-              @mousewheel.native.prevent
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--皮重（吨）-->
-          <ws-form-item
-            label="皮重（吨）"
-            span="1"
-            prop="tare"
-            class="readonly"
-          >
-            <ws-input
-              @input="tarechange"
-              v-model="deptBudgetList.tare"
-              placeholder="请输入皮重"
-              type="number"
-              @mousewheel.native.prevent
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            label="扣重（吨）"
-            span="1"
-            prop="deductionWeight"
-            class="readonly"
-          >
-            <ws-input
-              @input="tarechange"
-              v-model="deptBudgetList.deductionWeight"
-              placeholder="请输入扣重"
-              type="number"
-              @mousewheel.native.prevent
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="净重（吨）" span="1" prop="netWeight">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            v-if="deptBudgetList.type == '潮粮'"
-            label="扣重比"
-            span="1"
-            prop="buckleWeightRatio"
-            class="readonly"
-          >
-            <ws-input
-              @input="pureweight"
-              v-model="deptBudgetList.buckleWeightRatio"
-              placeholder="请输入扣重比"
-              type="number"
-              @mousewheel.native.prevent
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            v-if="deptBudgetList.type == '潮粮'"
-            label="干粮水分占比"
-            span="1"
-            prop="solidGrainWater"
-            class="readonly"
-          >
-            <ws-input
-              @input="pureweight"
-              v-model="deptBudgetList.solidGrainWater"
-              placeholder="请输入干粮水分占比"
-              maxlength="100"
-              type="number"
-              @mousewheel.native.prevent
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            v-if="deptBudgetList.type == '潮粮'"
-            label="潮粮水分占比"
-            span="1"
-            prop="tidalGrainWater"
-            class="readonly"
-          >
-            <ws-input
-              @input="pureweight(1)"
-              v-model="deptBudgetList.tidalGrainWater"
-              placeholder="请输入潮粮水分占比"
-              maxlength="100"
-              type="number"
-              @mousewheel.native.prevent
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item
-            v-if="deptBudgetList.type == '潮粮'"
-            label="纯重"
-            span="1"
-            prop="pureWeight"
-            class="readonly"
-          >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.pureWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-          <!--净重（吨）-->
-          <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
-            <ws-input
-            @input="kkInput(deptBudgetList.deductionAmount)"
-              v-model="deptBudgetList.deductionAmount"
-              placeholder="请输入扣款金额"
-              maxlength="120"
-              size="small"
-            />
-          </ws-form-item>
-          <!-- 品级 -->
-          <ws-form-item label="品级" span="1" class="readonly">
-            <ws-select
-              v-model="deptBudgetList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-
-          <!--经办人-->
-          <ws-form-item label="经办人" span="1" prop="agent">
-            <el-select
-              v-model="deptBudgetList.agent"
-              placeholder="请选择经办人"
-              filterable
-              clearable
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-            </el-select>
-          </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="入库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
-            <el-date-picker
-              v-model="deptBudgetList.inOutDate"
-              placeholder="请选择入库日期"
-              type="date"
-              value-format="yyyy-MM-dd"
-            ></el-date-picker>
-          </ws-form-item>
-          <!-- 入库类型 -->
-          <ws-form-item label="入库类型" span="1">
-            <ws-select
-              v-model="deptBudgetList.inOutType"
-              placeholder
-              class="typeselect"
-              @change="selectstorageType"
-              :disabled="isSelectType"
-            >
-              <ws-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-          </ws-form-item>
-
-          <!--车牌号  -->
-          <ws-form-item label="车牌号" span="1" prop="carNo">
-            <ws-input
-              v-if="!carstatus"
-              v-model="deptBudgetList.carNo"
-              placeholder="请输入车牌号"
-              maxlength="7"
-              size="small"
-            />
-            <el-select
-              v-if="carstatus"
-              filterable
-              clearable
-              :filter-method="dataFilter2"
-              v-model="deptBudgetList.carNo"
-              placeholder="请选择车牌号"
-              class="typeselect"
-              @change="carChange"
-            >
-              <el-option
-                v-for="item in options2"
-                :key="item.constKey"
-                :label="item.carNo + '(' + item.tranCarNo + ')'"
-                :value="item.carNo"
-              />
-            </el-select>
-          </ws-form-item>
-          <ws-form-item label="箱号-1" span="1" prop="boxNo">
-            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
-            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
-            <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
-            <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="成本" span="1" prop="cost">
-            <ws-input
-              :disabled="disabled1"
-              v-model="deptBudgetList.cost"
-              placeholder="请输入成本"
-              size="small"
-              type="number"
-              @mousewheel.native.prevent
-            />
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="editClick(1)"
-              alt=""
-            />
-          </ws-form-item>
-          <ws-form-item label="运费" span="1" prop="freight">
-            <ws-input
-              :disabled="disabled2"
-              v-model="deptBudgetList.freight"
-              placeholder="请输入运费"
-              size="small"
-              type="number"
-              @mousewheel.native.prevent
-            />
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="editClick(2)"
-              alt=""
-            />
-          </ws-form-item>
-          <!-- onkeyup="value=value.replace(/[^\A-\Z0-9\u4E00-\u9FA5\.]/g,'')" -->
+        <div class="flex">
+          <div class="left" style='width:66.6666%;'>
+            <ws-info-table>
+              <!--合同编号-->
+              <ws-form-item label="合同编号" span="1" prop="contractNo">
+                <el-select
+                  filterable
+                  :filter-method="dataFilter1"
+                  v-model="deptBudgetList.contractNo"
+                  placeholder="请选择合同编号或移库任务编号"
+                  class="typeselect"
+                  @change="contractNoChange"
+                >
+                  <el-option
+                    v-for="item in options1"
+                    :key="item.constKey"
+                    :label="item.contractNo"
+                    :value="item.contractNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!--毛重（吨）-->
+              <ws-form-item label="毛重（吨）" span="1" prop="grossWeight">
+                <ws-input
+                  @input="grossWeightchange"
+                  v-model="deptBudgetList.grossWeight"
+                  placeholder="请输入毛重"
+                  maxlength="20"
+                  type="number"
+                  @mousewheel.native.prevent
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- 货名 -->
+              <ws-form-item label="货名" span="1">
+                <ws-select
+                  disabled
+                  v-model="deptBudgetList.goodsName"
+                  placeholder
+                  class="typeselect"
+                  @change="selectgoodsName"
+                >
+                  <ws-option
+                    v-for="item in goodnameList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--皮重（吨）-->
+              <ws-form-item
+                label="皮重（吨）"
+                span="1"
+                prop="tare"
+                class="readonly"
+              >
+                <ws-input
+                  @input="tarechange"
+                  v-model="deptBudgetList.tare"
+                  placeholder="请输入皮重"
+                  type="number"
+                  @mousewheel.native.prevent
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="提示" span="1" prop="tips">
+              <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item
+                label="扣重（吨）"
+                span="1"
+                prop="deductionWeight"
+                class="readonly"
+              >
+                <ws-input
+                  @input="tarechange"
+                  v-model="deptBudgetList.deductionWeight"
+                  placeholder="请输入扣重"
+                  type="number"
+                  @mousewheel.native.prevent
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item label="类型" span="1" prop="type">
+                <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
+                  <ws-option
+                    v-for="item in typeList"
+                    :key="item"
+                    :label="item"
+                    :value="item"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--净重（吨）-->
+              <ws-form-item label="净重（吨）" span="1" prop="netWeight">
+                <ws-input
+                  readonly="readonly"
+                  v-model="deptBudgetList.netWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- <ws-form-item
+                v-if="deptBudgetList.type == '潮粮'"
+                label="扣重比"
+                span="1"
+                prop="buckleWeightRatio"
+                class="readonly"
+              >
+                <ws-input
+                  @input="pureweight"
+                  v-model="deptBudgetList.buckleWeightRatio"
+                  placeholder="请输入扣重比"
+                  type="number"
+                  @mousewheel.native.prevent
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                v-if="deptBudgetList.type == '潮粮'"
+                label="干粮水分占比"
+                span="1"
+                prop="solidGrainWater"
+                class="readonly"
+              >
+                <ws-input
+                  @input="pureweight"
+                  v-model="deptBudgetList.solidGrainWater"
+                  placeholder="请输入干粮水分占比"
+                  maxlength="100"
+                  type="number"
+                  @mousewheel.native.prevent
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                v-if="deptBudgetList.type == '潮粮'"
+                label="潮粮水分占比"
+                span="1"
+                prop="tidalGrainWater"
+                class="readonly"
+              >
+                <ws-input
+                  @input="pureweight(1)"
+                  v-model="deptBudgetList.tidalGrainWater"
+                  placeholder="请输入潮粮水分占比"
+                  maxlength="100"
+                  type="number"
+                  @mousewheel.native.prevent
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                v-if="deptBudgetList.type == '潮粮'"
+                label="纯重"
+                span="1"
+                prop="pureWeight"
+                class="readonly"
+              >
+                <ws-input
+                  disabled
+                  v-model="deptBudgetList.pureWeight"
+                  placeholder="不可编辑，自动计算"
+                  maxlength="100"
+                  size="small"
+                />
+              </ws-form-item> -->
+              <!-- 品级 -->
+              <ws-form-item label="品级" span="1" class="readonly">
+                <ws-select
+                  v-model="deptBudgetList.grade"
+                  placeholder
+                  class="typeselect"
+                  @change="selectpackingMethod"
+                >
+                  <ws-option
+                    v-for="item in gradeList"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
+              <!--净重（吨）-->
+              <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
+                <ws-input
+                @input="kkInput(deptBudgetList.deductionAmount)"
+                  v-model="deptBudgetList.deductionAmount"
+                  placeholder="请输入扣款金额"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--经办人-->
+              <ws-form-item label="经办人" span="1" prop="agent">
+                <el-select
+                  v-model="deptBudgetList.agent"
+                  placeholder="请选择经办人"
+                  filterable
+                  clearable
+                  @change="selectstaff"
+                >
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.staffName"
+                    :value="item.staffName"
+                  />
+                </el-select>
+              </ws-form-item>
+              <ws-form-item
+                label="入库日期"
+                span="1"
+                prop="inOutDate"
+                class="deliverydate"
+              >
+                <el-date-picker
+                  v-model="deptBudgetList.inOutDate"
+                  placeholder="请选择入库日期"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </ws-form-item>
+              <!-- 入库类型 -->
+              <ws-form-item label="入库类型" span="1">
+                <ws-select
+                  v-model="deptBudgetList.inOutType"
+                  placeholder
+                  class="typeselect"
+                  @change="selectstorageType"
+                  :disabled="isSelectType"
+                >
+                  <ws-option
+                    v-for="item in storageType"
+                    :key="item.constKey"
+                    :label="item.constValue"
+                    :value="item.constValue"
+                  />
+                </ws-select>
+              </ws-form-item>
         </ws-info-table>
+          </div>
+          <div class="right"  style='width:33.3333%;'>
+            <ws-info-table>
+              <ws-form-item label="成本" span="1" prop="cost">
+                <ws-input
+                  :disabled="disabled1"
+                  v-model="deptBudgetList.cost"
+                  placeholder="请输入成本"
+                  size="small"
+                  type="number"
+                  @mousewheel.native.prevent
+                />
+                <img
+                  width="17"
+                  height="18"
+                  style="vertical-align: text-top; position: relative; top: -1px"
+                  src="../../../public/img/edit.png"
+                  @click="editClick(1)"
+                  alt=""
+                />
+              </ws-form-item>
+              <ws-form-item label="运费" span="1" prop="freight">
+                <ws-input
+                  :disabled="disabled2"
+                  v-model="deptBudgetList.freight"
+                  placeholder="请输入运费"
+                  size="small"
+                  type="number"
+                  @mousewheel.native.prevent
+                />
+                <img
+                  width="17"
+                  height="18"
+                  style="vertical-align: text-top; position: relative; top: -1px"
+                  src="../../../public/img/edit.png"
+                  @click="editClick(2)"
+                  alt=""
+                />
+              </ws-form-item>
+               <ws-form-item label="运输方式" span="1" prop="outType">
+                <el-select
+                  v-model="deptBudgetList.outType"
+                  placeholder="请选择运输方式"
+                >
+                  <el-option
+                    v-for="item in multiSelector"
+                    :key="item.value"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!-- <ws-form-item label="车牌号" span="1" prop="carNo">
+                <ws-input
+                  v-if="!carstatus"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small"
+                />
+                <el-select
+                  v-if="carstatus"
+                  filterable
+                  clearable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <ws-form-item label="箱号-1" span="1" prop="boxNo">
+                <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-1" span="1" prop="wingNumber">
+                <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item>
+              <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther">
+                <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+                  size="small" />
+              </ws-form-item> -->
+              <!--车牌号  -->
+              <ws-form-item
+                label="车牌号"
+                span="1"
+                prop="carNo"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-if="options2.length==0"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车牌号"
+                  maxlength="7"
+                  size="small" 
+                />
+                <el-select
+                  v-if='carstatus&&options2.length>0'
+                  filterable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo + '(' + item.tranCarNo + ')'"
+                    :value="item.carNo"
+                  />
+                </el-select>
+                <el-select
+                  v-if='!carstatus&&options2.length>0'
+                  filterable
+                  :filter-method="dataFilter2"
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请选择车牌号"
+                  class="typeselect"
+                  @change="carChange"
+                >
+                  <el-option
+                    v-for="item in options2"
+                    :key="item.constKey"
+                    :label="item.carNo"
+                    :value="item.carNo"
+                  />
+                </el-select>
+              </ws-form-item>
+              <!--船名  -->
+              <ws-form-item
+                label="船名"
+                span="1"
+                prop="carNo"
+                v-if="deptBudgetList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入船名"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="航次"
+                span="1"
+                prop="shipNumber"
+                v-if="deptBudgetList.outType == '散船'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.shipNumber"
+                  placeholder="请输入航次"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--车号  -->
+              <ws-form-item
+                label="车号"
+                span="1"
+                prop="carNo"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.carNo"
+                  placeholder="请输入车号"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-1"
+                span="1"
+                prop="boxNo"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.boxNo"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="箱号-2"
+                span="1"
+                prop="boxNoOther"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.boxNoOther"
+                  placeholder="请输入箱号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-1"
+                span="1"
+                prop="titleNo"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.titleNo"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="封号-2"
+                span="1"
+                prop="titleNoOther"
+                v-if="
+                  deptBudgetList.outType == '汽运' ||
+                  deptBudgetList.outType == '集装箱船'
+                "
+              >
+                <ws-input
+                  v-model="deptBudgetList.titleNoOther"
+                  placeholder="请输入封号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-1"
+                span="1"
+                prop="wingNumber"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.wingNumber"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <ws-form-item
+                label="车厢号-2"
+                span="1"
+                prop="wingNumberOther"
+                v-if="deptBudgetList.outType == '火运'"
+              >
+                <ws-input
+                  v-model="deptBudgetList.wingNumberOther"
+                  placeholder="请输入车厢号"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
+              <!-- onkeyup="value=value.replace(/[^\A-\Z0-9\u4E00-\u9FA5\.]/g,'')" -->
+            </ws-info-table>
+          </div>
+        </div>
         <div
           v-show="
             this.$route.query.warehouseType == 2 &&
@@ -621,6 +816,24 @@ export default {
       options: [],
       options1: [],
       options2: [],
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
       outContractNo1: [],
       outContractNo: [],
 
@@ -2090,18 +2303,39 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .left{
+  .el-form-item {
+    width: 50%;
+    // width: 33.3333%;
+    border: none;
+
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.right{
   .el-form-item {
-    width: 33.3333%;
+    width: 100%;
+    // width: 33.3333%;
     border: none;
+
     .el-form-item__label {
       background: transparent;
       border: none;
     }
+
     .el-form-item__content {
       border: none;
     }
   }
 }
+}
 
 .title {
   position: relative;

src/views/warehouse/warehouseManagementPutOut.vue

@@ -62,7 +62,7 @@
         <el-table-column class="table_td" prop="contractNo" label="合同编号">
 
         </el-table-column>
-        <el-table-column class="table_td"  prop="warehouseName" label="库房名" >
+        <el-table-column class="table_td"  prop="warehouseName" label="仓库名" >
          
         </el-table-column>
         <el-table-column class="table_td"  prop="inOutType" label="出入库类型">

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -55,8 +55,8 @@
               ></el-option>
             </el-input>
           </el-form-item>
-          <!-- 库房名 -->
-          <el-form-item label="库房名">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
             <el-input
               disabled
               v-model="dataList.warehouseName"

src/views/warehouse/warehouseManagementTare.vue

@@ -42,9 +42,10 @@
           <div class="car-no">{{ deptBudgetList.carNo }}</div>
         </div>
         <div class="small-title">基本信息</div>
-        <ws-info-table>
-          <!--任务编号-->
-          <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
+        <div class='flex'>
+        <div class='left' style='width:66.6666%;'>
+         <ws-info-table>
+           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
             <el-select
               filterable
               clearable
@@ -61,6 +62,24 @@
               />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
+            <ws-input
+              :disabled="allowEdit"
+              @input="grossWeightchange"
+              v-model="deptBudgetList.grossWeight"
+              type="number"
+              @mousewheel.native.prevent
+              placeholder="请输入毛重"
+              maxlength="20"
+              size="small"
+            />
+            <el-button
+              type="primary"
+              v-if="information == '毛重检斤'"
+              @click="openPort"
+              >重新获取</el-button
+            >
+          </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-select
               disabled
@@ -76,6 +95,29 @@
               />
             </ws-select>
           </ws-form-item>
+          <ws-form-item
+            label="皮重（公斤）"
+            span="1"
+            prop="tare"
+            class="readonly"
+          >
+            <ws-input
+              :disabled="allowEdit"
+              @input="tarechange"
+              v-model="deptBudgetList.tare"
+              type="number"
+              @mousewheel.native.prevent
+              placeholder="请输入皮重"
+              maxlength="100"
+              size="small"
+            />
+            <el-button
+              type="primary"
+              v-if="information == '皮重检斤'"
+              @click="openPort"
+              >重新获取</el-button
+            >
+          </ws-form-item>
           <ws-form-item label="提示" span="1" prop="tips">
             <ws-input
               onmouseover="this.title=this.value"
@@ -84,7 +126,15 @@
               size="small"
             />
           </ws-form-item>
-          <!-- 货名 -->
+          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
+            <ws-input
+              disabled
+              v-model="deptBudgetList.netWeight"
+              placeholder="不可编辑，自动计算"
+              maxlength="120"
+              size="small"
+            />
+          </ws-form-item>
           <ws-form-item label="货名" span="1">
             <ws-select
               disabled
@@ -101,6 +151,19 @@
               />
             </ws-select>
           </ws-form-item>
+          <ws-form-item
+            label="出库日期"
+            span="1"
+            prop="inOutDate"
+            class="deliverydate"
+          >
+            <ws-date-picker
+              v-model="deptBudgetList.inOutDate"
+              type="date"
+              placeholder="请选择出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
             <ws-select
               disabled
@@ -115,59 +178,15 @@
               />
             </ws-select>
           </ws-form-item>
-          <!--毛重（公斤）-->
-          <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
-            <ws-input
-              :disabled="allowEdit"
-              @input="grossWeightchange"
-              v-model="deptBudgetList.grossWeight"
-              type="number"
-              @mousewheel.native.prevent
-              placeholder="请输入毛重"
-              maxlength="20"
-              size="small"
-            />
-            <el-button
-              type="primary"
-              v-if="information == '毛重检斤'"
-              @click="openPort"
-              >重新获取</el-button
-            >
-          </ws-form-item>
 
-          <!--皮重（公斤）-->
-          <ws-form-item
-            label="皮重（公斤）"
-            span="1"
-            prop="tare"
-            class="readonly"
-          >
-            <ws-input
-              :disabled="allowEdit"
-              @input="tarechange"
-              v-model="deptBudgetList.tare"
-              type="number"
-              @mousewheel.native.prevent
-              placeholder="请输入皮重"
-              maxlength="100"
-              size="small"
-            />
-            <el-button
-              type="primary"
-              v-if="information == '皮重检斤'"
-              @click="openPort"
-              >重新获取</el-button
-            >
-          </ws-form-item>
-          <!--净重（公斤）-->
-          <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
+          <ws-form-item label="出库类型" span="1">
             <ws-input
-              disabled
-              v-model="deptBudgetList.netWeight"
-              placeholder="不可编辑，自动计算"
-              maxlength="120"
-              size="small"
+              v-model="deptBudgetList.inOutType"
+              class="right-bottom"
+              :disabled="isSelectType"
+              placeholder="暂无"
             />
+           
           </ws-form-item>
           <ws-form-item
             v-if="deptBudgetList.type == '潮粮'"
@@ -186,7 +205,7 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item
+          <!-- <ws-form-item
             v-if="deptBudgetList.type == '潮粮'"
             label="干粮水分占比"
             span="1"
@@ -236,8 +255,8 @@
               maxlength="100"
               size="small"
             />
-          </ws-form-item>
-          <!-- 品级 -->
+          </ws-form-item> -->
+
           <ws-form-item label="品级" span="1" class="readonly">
             <ws-select
               v-model="deptBudgetList.grade"
@@ -253,7 +272,7 @@
               />
             </ws-select>
           </ws-form-item>
-          <!--经办人-->
+
           <ws-form-item label="经办人" span="1" prop="agent">
             <el-select
               v-model="deptBudgetList.agent"
@@ -270,47 +289,14 @@
               />
             </el-select>
           </ws-form-item>
-          <!--出库日期-->
-          <ws-form-item
-            label="出库日期"
-            span="1"
-            prop="inOutDate"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.inOutDate"
-              type="date"
-              placeholder="请选择出库日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
-          <!-- 出库类型 -->
-          <ws-form-item label="出库类型" span="1">
-            <ws-input
-              v-model="deptBudgetList.inOutType"
-              class="right-bottom"
-              :disabled="isSelectType"
-              placeholder="暂无"
-            />
-            <!-- <ws-select
-              v-model="deptBudgetList.deliveryType"
-              placeholder=""
-              class="typeselect"
-              @change="selectstorageType"
-            >
-              <ws-option
-                v-for="item in deliveryType"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select> -->
-          </ws-form-item>
-          <!--出库方式-->
-          <ws-form-item label="出库方式" span="1" prop="outType">
+        </ws-info-table>
+        </div>
+        <div class='right' style='width:33.3333%;'>
+         <ws-info-table>
+          <ws-form-item label="运输方式" span="1" prop="outType">
             <el-select
               v-model="deptBudgetList.outType"
-              placeholder="请选择出库方式"
+              placeholder="请选择运输方式"
             >
               <el-option
                 v-for="item in multiSelector"
@@ -320,7 +306,7 @@
               />
             </el-select>
           </ws-form-item>
-          <!--车牌号-->
+
           <ws-form-item
             label="车牌号"
             span="1"
@@ -355,7 +341,7 @@
               />
             </el-select>
           </ws-form-item>
-          <!--车号  -->
+
           <ws-form-item
             label="车号"
             span="1"
@@ -485,6 +471,8 @@
             />
           </ws-form-item>
         </ws-info-table>
+        </div>
+        </div>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
@@ -992,6 +980,11 @@ export default {
         ) {
           this.weightbills.goodsName=this.outContractNo[i].goodsName
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+          if(this.deptBudgetList.goodsName=='玉米（潮粮）'){
+            this.deptBudgetList.type='潮粮'
+          }else{
+            this.deptBudgetList.type='干粮'
+          }
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
@@ -2123,9 +2116,26 @@ export default {
   .ws-info-table {
     border: none;
   }
+.left{
+  .el-form-item {
+    width: 50%;
+    // width: 33.3333%;
+    border: none;
 
+    .el-form-item__label {
+      background: transparent;
+      border: none;
+    }
+
+    .el-form-item__content {
+      border: none;
+    }
+  }
+}
+.right{
   .el-form-item {
-    width: 33.3333%;
+    width: 100%;
+    // width: 33.3333%;
     border: none;
 
     .el-form-item__label {
@@ -2138,6 +2148,8 @@ export default {
     }
   }
 }
+  
+}
 
 .el-button--default {
   color: #5473e8;