前端

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
@@ -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/warehouseManagementGross.vue

@@ -452,6 +452,19 @@
                   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="车号"

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/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;