zhongtianhaoyuan 3 years ago
parent
commit
451a901c93

+ 15 - 42
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -47,7 +47,6 @@
           <div class="left1">
             <div class="titlesign weightTitle">
               <span class="word_css">检斤信息</span>
-
             </div>
             <div class="weightInfo">
               <div class="tab">
@@ -740,7 +739,6 @@
             this.setCurrent(this.mList[0])
 
             this.weighingList = this.mList[0]
-            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.mList[0].carNumber,
               type: this.information,
@@ -757,6 +755,7 @@
             this.weighingList.inOutType = this.pList[0].qualityInspectionManagement.inOutType
             this.weighingList.inOutTypeKey = this.pList[0].qualityInspectionManagement.inOutTypeKey
             this.weighingList.deductionAmount = this.pList[0].qualityInspectionManagement.deductionAmount
+            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.pList[0].carNumber,
               type: this.information,
@@ -1400,47 +1399,21 @@
                       id: this.weighingList.warehouseInOutId
                     }).toPromise().then((response) => {
                       that.inOutDate = response
-                      that.$set(that.inOutDate,'statusFlag',3)
-                      that.$set(that.inOutDate,'grossWeight',warehousing.grossWeight /1000)
-                      that.$set(that.inOutDate,'tare',warehousing.grossWeight /1000)
-                      that.$set(that.inOutDate,'netWeight',warehousing.netWeight /1000)
-
-                      // that.$set(that.inOutDate,'pureWeight',warehousing.pureWeight /1000)
-                      that.$set(that.inOutDate,'deductionAmount',Number(warehousing.deductionAmount) * 1000)
-                      that.$set(that.inOutDate,'deductionWeight',warehousing.deductionWeight /1000)
-                      that.$set(that.inOutDate,'inOutFlag',2)
-                      // that.inOutDate = response
-                      // that.$set(that.inOutDate)
-                      // .statusFlag = 3
-                      // that.inOutDate.grossWeight=warehousing.grossWeight /1000
-                      // that.inOutDate.tare=warehousing.tare /1000
-                      // that.inOutDate.netWeight=warehousing.netWeight /1000
-                      // that.inOutDate.pureWeight=warehousing.pureWeight /1000
-                      // that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
-                      // that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
-                      // that.inOutDate.inOutFlag = 2
-                      console.log(that.inOutDate)
-                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      // warehousing.inOutType = that.weighingList.inOutType
-                      // warehousing.deductionAmount = that.weighingList.deductionAmount
-                      // warehousing.positionId = that.weighingList.positionId
-                      // warehousing.id = warehousing.warehouseInOutId
-                      // warehousing.statusFlag = 3
-                      // warehousing.grossWeight /= 1000
-                      // warehousing.tare /= 1000
-                      // warehousing.netWeight /= 1000
-                      // warehousing.pureWeight = 1000
-                      // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
-                      // warehousing.deductionWeight /= 1000
-                      // warehousing.inOutFlag = 2
-                      // console.log(that.inOutDate)
-                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      // warehousing.inOutType = that.weighingList.inOutType
-                      // warehousing.deductionAmount = that.weighingList.deductionAmount
-                      // // warehousing.positionId = that.weighingList.positionId
-                      // warehousing.id = warehousing.warehouseInOutId
+                      warehousing.statusFlag = 3
+                      warehousing.grossWeight /= 1000
+                      warehousing.tare /= 1000
+                      warehousing.netWeight /= 1000
+                      warehousing.pureWeight = 1000
+                      warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
+                      warehousing.deductionWeight /= 1000
+                      warehousing.inOutFlag = 2
+                      console.log(that.weighingList)
+                      warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      warehousing.inOutType = that.weighingList.inOutType
+                      warehousing.deductionAmount = that.weighingList.deductionAmount
+                      warehousing.id = warehousing.warehouseInOutId
                       // delete that.inOutDate.status
-                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
                     })
                   }

+ 273 - 279
src/views/outboundManagement/weighingManagementNew.vue

@@ -2,240 +2,225 @@
   <div class="center">
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <!-- <ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加皮重
-				</ws-button>
-				<ws-button type="primary" @click="weighing(4)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加毛重
-				</ws-button> -->
       </template>
-      <!-- <template slot="left"> </template> -->
       <template slot="right">
         <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
           <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </el-select>
-        <!-- <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找"
-				clearable maxlength="500" type="input">
-				</ws-input>
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
-					vertical-align: text-top;
-					position: relative;
-					top: 0px;
-					left: -8px;
-					" src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
       </template>
     </BaseHeaderLayout>
-
-    <el-row :gutter="20" class="size_css">
-      <el-col :span="8" class="call-show">
-        <div style="background: #f6f7fc; padding: 10px" class="grid-content bg-purple " >
-          <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList"
-            :information="information" v-on:balanceListen="setVal" class="zujian">
-          </BalanceAlert>
-          <div class="top">
-            <div class="confirmWeight">
-              <div class="titleWeight">确认重量</div>
-              <div v-if="index == 0" class="weight">
-                {{ weighingList.tare }} <span class="kg-style">kg</span>
-              </div>
-              <div v-else class="weight">
-                {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
-              </div>
+    <div style="display: flex;">
+      <div style="background: #f6f7fc; padding: 10px" class="grid-content bg-purple size_css">
+        <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList" :information="information"
+          v-on:balanceListen="setVal" class="zujian">
+        </BalanceAlert>
+        <div class="top">
+          <div class="confirmWeight">
+            <div class="titleWeight">确认重量</div>
+            <div v-if="index == 0" class="weight">
+              {{ weighingList.tare }} <span class="kg-style">kg</span>
             </div>
-            <div class="confirmInfo">
-              <div class="car-type">车牌号</div>
-              <div class="car-no">{{ weighingList.carNumber }}</div>
+            <div v-else class="weight">
+              {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
             </div>
-            <!-- <el-button @click="weightweight" type="success" plain>确定</el-button> -->
           </div>
-          <div class="bg-left titleup">
-            <span class="word_css">实时监控</span>
-          </div>
-          <div class="bottom">
-            <div v-if="!monitorUrl1" class="video1">
-              <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
-              <div>监控视频未连接</div>
-            </div>
-            <div v-else class="video1">
-              <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
-                mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
-            </div>
-            <div v-if="!monitorUrl2" class="video1">
-              <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
-              <div>监控视频未连接</div>
-            </div>
-            <div v-else class="video2">
-              <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
-                mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
-            </div>
+          <div class="confirmInfo">
+            <div class="car-type">车牌号</div>
+            <div class="car-no">{{ weighingList.carNumber }}</div>
           </div>
+          <!-- <el-button @click="weightweight" type="success" plain>确定</el-button> -->
+        </div>
+        <div class="bg-left titleup">
+          <span class="word_css">实时监控</span>
         </div>
-      </el-col>
-      <el-col :span="8">
-        <div class="grid-content bg-purple">
-          <div class="tab weigh_btn">
-            <el-button :type="tpyeNo == 1 ? 'primary' : ''">
-              <!-- <el-badge :value="mListTop.length" class="badge_item"> -->
-              <div @click="tabClick(0)">称皮重</div>
-            </el-button>
-            <!-- </el-badge> -->
-            <el-button :type="tpyeNo == 2 ? 'primary' : ''">
-              <!-- <el-badge :value="pListTop.length" class="badge_item"> -->
-              <div @click="tabClick(1)">称毛重</div>
-              <!-- </el-badge> -->
-            </el-button>
+        <div class="bottom">
+          <div v-if="!monitorUrl1" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+            <div>监控视频未连接</div>
           </div>
-          <ws-form class="right-content">
-            <div class="left1">
-              <div class="weightInfo">
-                <ws-info-table>
-                  <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
-                    <el-select v-if="tpyeNo == 1" :disabled="recheck" filterable clearable
-                      v-model="weighingList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                      @change="contractNoChange">
-                      <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
-                        :value="item.inOutTaskNo" />
-                    </el-select>
-                    <ws-input v-else v-model="weighingList.inOutTaskNo" placeholder="自动获取,不可编辑" maxlength="100" disabled
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="业务编号" span="1" prop="number">
-                    <ws-input v-model="weighingList.number" placeholder="自动获取,不可编辑" maxlength="100" disabled
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="合同编号" span="1" prop="contractNo" v-show="inWarehouseType == 1"
-                    v-if="weighingList.contractNo && tpyeNo == 1">
-                    <ws-input v-model="weighingList.contractNo" placeholder="自动获取,不可编辑" maxlength="100" disabled
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="移库编号" span="1" prop="moveTaskNo" v-show="inWarehouseType == 1"
-                    v-if="!weighingList.contractNo && tpyeNo == 1">
-                    <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取,不可编辑" maxlength="100" size="small"
-                      disabled />
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 1" label="提示" span="1" prop="tips">
-                    <ws-input v-model="weighingList.tips" placeholder="自动获取,不可编辑" maxlength="100" disabled
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="货名" span="1" prop="goodsName">
-                    <ws-input v-model="weighingList.goodsName" placeholder="自动获取,不可编辑" maxlength="100" disabled
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 1 && warehouseType == 1" label="仓位号" span="1" prop="inOutTaskNo">
-                    <el-select @change="binNumberchange" :disabled="recheck" filterable clearable
-                      v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
-                      <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
-                        :value="item.binNumber" />
-                    </el-select>
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 1 && warehouseType == 1" label="囤位号" span="1" prop="storageNumber">
-                    <ws-input :disabled="recheck" v-model="weighingList.storageNumber" placeholder="选填,1-10个字符"
-                      maxlength="10" size="small" />
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 1" label="出库类型" span="1">
-                    <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
-                      placeholder="暂无" />
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 1" label="出库日期" span="1" prop="inOutDate" class="deliverydate">
-                    <ws-date-picker v-model="weighingList.inOutDate" type="date" placeholder="请选择出库日期"
-                      value-format="yyyy-MM-dd" />
-                  </ws-form-item>
-                  <ws-form-item label="运输方式" span="1" prop="outType">
-                    <el-select :disabled="tpyeNo == 2" v-model="weighingList.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 v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
-                    <el-select :disabled="recheck" v-model="deptBudgetList.fleet" placeholder="非车队车辆">
-                      <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
-                        :value="item.fleetName" />
-                    </el-select>
-                  </ws-form-item>
-                  <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
+          <div v-else class="video1">
+            <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+            <div>监控视频未连接</div>
+          </div>
+          <div v-else class="video2">
+            <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <div class="grid-content bg-purple">
+              <div class="tab weigh_btn">
+                <el-button :type="tpyeNo == 1 ? 'primary' : ''">
+                  <!-- <el-badge :value="mListTop.length" class="badge_item"> -->
+                  <div @click="tabClick(0)">称皮重</div>
+                </el-button>
+                <!-- </el-badge> -->
+                <el-button :type="tpyeNo == 2 ? 'primary' : ''">
+                  <!-- <el-badge :value="pListTop.length" class="badge_item"> -->
+                  <div @click="tabClick(1)">称毛重</div>
+                  <!-- </el-badge> -->
+                </el-button>
+              </div>
+              <ws-form class="right-content">
+                <div class="left1">
+                  <div class="weightInfo">
+                    <ws-info-table>
+                      <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
+                        <el-select v-if="tpyeNo == 1" :disabled="recheck" filterable clearable
+                          v-model="weighingList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
+                          @change="contractNoChange">
+                          <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
+                            :value="item.inOutTaskNo" />
+                        </el-select>
+                        <ws-input v-else v-model="weighingList.inOutTaskNo" placeholder="自动获取,不可编辑" maxlength="100"
+                          disabled size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="业务编号" span="1" prop="number">
+                        <ws-input v-model="weighingList.number" placeholder="自动获取,不可编辑" maxlength="100" disabled
+                          size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="合同编号" span="1" prop="contractNo" v-show="inWarehouseType == 1"
+                        v-if="weighingList.contractNo && tpyeNo == 1">
+                        <ws-input v-model="weighingList.contractNo" placeholder="自动获取,不可编辑" maxlength="100" disabled
+                          size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="移库编号" span="1" prop="moveTaskNo" v-show="inWarehouseType == 1"
+                        v-if="!weighingList.contractNo && tpyeNo == 1">
+                        <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取,不可编辑" maxlength="100" size="small"
+                          disabled />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 1" label="提示" span="1" prop="tips">
+                        <ws-input v-model="weighingList.tips" placeholder="自动获取,不可编辑" maxlength="100" disabled
+                          size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="货名" span="1" prop="goodsName">
+                        <ws-input v-model="weighingList.goodsName" placeholder="自动获取,不可编辑" maxlength="100" disabled
+                          size="small" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 1 && warehouseType == 1" label="仓位号" span="1" prop="inOutTaskNo">
+                        <el-select @change="binNumberchange" :disabled="recheck" filterable clearable
+                          v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
+                          <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
+                            :value="item.binNumber" />
+                        </el-select>
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 1 && warehouseType == 1" label="囤位号" span="1" prop="storageNumber">
+                        <ws-input :disabled="recheck" v-model="weighingList.storageNumber" placeholder="选填,1-10个字符"
+                          maxlength="10" size="small" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 1" label="出库类型" span="1">
+                        <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
+                          placeholder="暂无" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 1" label="出库日期" span="1" prop="inOutDate" class="deliverydate">
+                        <ws-date-picker v-model="weighingList.inOutDate" type="date" placeholder="请选择出库日期"
+                          value-format="yyyy-MM-dd" />
+                      </ws-form-item>
+                      <ws-form-item label="运输方式" span="1" prop="outType">
+                        <el-select :disabled="tpyeNo == 2" v-model="weighingList.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 v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
+                        <el-select :disabled="recheck" v-model="deptBudgetList.fleet" placeholder="非车队车辆">
+                          <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
+                            :value="item.fleetName" />
+                        </el-select>
+                      </ws-form-item>
+                      <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                    <ws-input v-if="!carstatus || carjudge" :disabled="tpyeNo == 2" v-model="weighingList.carNo"
-                      placeholder="请输入车牌号" maxlength="7" size="small" />
-                    <el-select v-else filterable clearable v-model="weighingList.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-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{ carChange1 }}</el-button>
-                  </ws-form-item>
-                  <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="
+                        <ws-input v-if="!carstatus || carjudge" :disabled="tpyeNo == 2" v-model="weighingList.carNo"
+                          placeholder="请输入车牌号" maxlength="7" size="small" />
+                        <el-select v-else filterable clearable v-model="weighingList.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-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{ carChange1 }}</el-button>
+                      </ws-form-item>
+                      <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20"
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNo" placeholder="请输入箱号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNoOther" placeholder="请输入箱号"
-                      maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.boxNoOther" placeholder="请输入箱号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20"
-                      size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNo" placeholder="请输入封号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNoOther" placeholder="请输入封号"
-                      maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumber" placeholder="请输入车厢号"
-                      maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
-                    <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
-                      maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
-                    <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
-                    <ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
-                  </ws-form-item>
-                  <ws-form-item v-if="tpyeNo == 2" label="毛重(KG)" span="1" prop="grossWeight">
-                    <ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo == 2"
-                      v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重" maxlength="100"
-                      size="small" :disabled="disabled" />
-                    <el-button v-if="tpyeNo == 2 && warehouseType == 1" @click="openPort">重新获取</el-button>
-                    <el-button v-if="tpyeNo == 2 && warehouseType == 2" @click="disabled = false">编辑</el-button>
-                  </ws-form-item>
-                  <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '毛重'">
-                    <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
-                      placeholder="未获取到皮重" maxlength="100" size="small" disabled />
-                  </ws-form-item>
-                  <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '皮重'">
-                    <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
-                      placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
-                    <el-button v-if="tpyeNo == 1 && warehouseType == 1" @click="openPort">重新获取</el-button>
-                    <el-button v-if="tpyeNo == 1 && warehouseType == 2" @click="disabled = false">编辑</el-button>
-                  </ws-form-item>
-                  <div class="formItem">
-                    <!-- <ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous" v-if="
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.titleNoOther" placeholder="请输入封号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumber" placeholder="请输入车厢号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
+                        <ws-input :disabled="tpyeNo == 2" v-model="weighingList.wingNumberOther" placeholder="请输入车厢号"
+                          maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
+                        <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
+                        <ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 2" label="毛重(KG)" span="1" prop="grossWeight">
+                        <ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo == 2"
+                          v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重" maxlength="100"
+                          size="small" :disabled="disabled" />
+                        <el-button v-if="tpyeNo == 2 && warehouseType == 1" @click="openPort">重新获取</el-button>
+                        <el-button v-if="tpyeNo == 2 && warehouseType == 2" @click="disabled = false">编辑</el-button>
+                      </ws-form-item>
+                      <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '毛重'">
+                        <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare"
+                          @input="calculation" placeholder="未获取到皮重" maxlength="100" size="small" disabled />
+                      </ws-form-item>
+                      <ws-form-item label="皮重(KG)" span="1" prop="tare" v-if="information == '皮重'">
+                        <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare"
+                          @input="calculation" placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
+                        <el-button v-if="tpyeNo == 1 && warehouseType == 1" @click="openPort">重新获取</el-button>
+                        <el-button v-if="tpyeNo == 1 && warehouseType == 2" @click="disabled = false">编辑</el-button>
+                      </ws-form-item>
+                      <div class="formItem">
+                        <!-- <ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous" v-if="
                         information == '毛重' &&
                         (paramType == '2' || inWarehouseType == 1)
                       ">
                       <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
                         @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
                     </ws-form-item> -->
-                    <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '毛重'">
-                      <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
-                        placeholder="自动计算,不可编辑" maxlength="100" size="small" disabled />
-                    </ws-form-item>
-                    <!-- <ws-form-item label="应收卸车过磅费(元)" span="1" prop="receivableWeighingFee" v-if="index == 1">
+                        <ws-form-item label="净重(KG)" span="1" prop="netWeight" v-if="information == '毛重'">
+                          <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
+                            placeholder="自动计算,不可编辑" maxlength="100" size="small" disabled />
+                        </ws-form-item>
+                        <!-- <ws-form-item label="应收卸车过磅费(元)" span="1" prop="receivableWeighingFee" v-if="index == 1">
 										<ws-input type="number" v-model="weighingList.receivableWeighingFee" placeholder="未获取到卸车过磅费金额"
 											maxlength="100" size="small" disabled />
 										</ws-form-item>
@@ -243,49 +228,57 @@
 										<ws-input type="number" v-model="weighingList.actualWeighingFee" placeholder="输入卸车过磅费" maxlength="100"
 											size="small" />
 										</ws-form-item> -->
+                      </div>
+                    </ws-info-table>
+                    <div class="but">
+                      <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
+                      <el-button @click="print" v-if="information == '毛重'" type="primary">提交</el-button>
+                      <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">提交
+                      </el-button>
+                    </div>
+                    <!-- </div> -->
                   </div>
-                </ws-info-table>
-                <div class="but">
-                  <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
-                  <el-button @click="print" v-if="information == '毛重'" type="primary">提交</el-button>
-                  <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">提交
+                </div>
+              </ws-form>
+            </div>
+          </el-col>
+          <el-col :span="12">
+            <div class="list-info">
+              <div style="justify-content: space-between" class="flex">
+                <div>
+                  <el-button v-if="tpyeNo == 1" @click="add" type="primary">新增</el-button>
+                  <el-button v-if="tpyeNo == 1" @click="deletelist" type="danger">删除</el-button>
+                  <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)"
+                    :type="statusType == 3 ? 'primary' : ''">未称毛重
+                  </el-button>
+                  <el-button v-if="tpyeNo == 2" @click="statustypechangelist(2)"
+                    :type="statusType == 2 ? 'primary' : ''">已称毛重
                   </el-button>
                 </div>
-                <!-- </div> -->
+                <div>
+                  <el-button @click="record" type="primary">记录</el-button>
+                </div>
               </div>
+
+              <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
+                ref="deliveryList" border>
+                <el-table-column prop="number" width="120" label="业务编号"></el-table-column>
+                <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+                <el-table-column prop="status" label="状态"></el-table-column>
+              </el-table>
+              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="deptBudgetTotal">
+              </el-pagination>
             </div>
-          </ws-form>
-        </div>
-      </el-col>
-      <el-col :span="8">
-        <div class="list-info">
-          <div style="justify-content: space-between" class="flex">
-          <div>
-            <el-button v-if="tpyeNo == 1" @click="add" type="primary">新增</el-button>
-            <el-button v-if="tpyeNo == 1" @click="deletelist" type="danger">删除</el-button>
-            <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)" :type="statusType == 3 ? 'primary' : ''">未称毛重
-            </el-button>
-            <el-button v-if="tpyeNo == 2" @click="statustypechangelist(2)" :type="statusType == 2 ? 'primary' : ''">已称毛重
-            </el-button>
-          </div>
-          <div>
-            <el-button @click="record" type="primary">记录</el-button>
-          </div>
-        </div>
 
-        <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px" ref="deliveryList"
-          border>
-          <el-table-column prop="number" width="120" label="业务编号"></el-table-column>
-          <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-          <el-table-column prop="status" label="状态"></el-table-column>
-        </el-table>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-        </el-pagination>
-        </div>
-        
-      </el-col>
-    </el-row>
+          </el-col>
+        </el-row>
+      </div>
+
+
+    </div>
+
     <el-dialog width="70%" class="title_css" center :visible.sync="isShowPrint" title="出库检斤单" @opened="opendBtn"
       @close="closeDialog" :close-on-click-modal="false">
       <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
@@ -403,7 +396,7 @@
           type: '',
           weight: '',
         },
-        deptBudgetList:{},
+        deptBudgetList: {},
         multiSelector: [{
             name: '汽运',
             value: '0',
@@ -877,7 +870,7 @@
                         })
                         toPromise().then((response) => {
                           if (this.reader) {
-    	                   this.reader.cancel()
+                            this.reader.cancel()
                           }
                           this.$notify({
                             title: '成功',
@@ -1042,17 +1035,17 @@
                   grossWeight(this.weighingList)
                     .toPromise()
                     .then((response) => {
-						 getweighing({
-                            id: response
-                          })
-                          .toPromise()
-                          .then((response) => {
-                            this.weighingList = response
-                            this.inspect = JSON.parse(
-                              JSON.stringify(this.weighingList)
-                            )
-                            this.isShowPrint = true
-                          })
+                      getweighing({
+                          id: response
+                        })
+                        .toPromise()
+                        .then((response) => {
+                          this.weighingList = response
+                          this.inspect = JSON.parse(
+                            JSON.stringify(this.weighingList)
+                          )
+                          this.isShowPrint = true
+                        })
                       if (this.reader) {
                         this.reader.cancel()
                       }
@@ -1117,26 +1110,26 @@
       },
       tabClick(val) {
         this.weighingList = {
-            grossWeight: 0,
-            tare: 0,
-            tips: '',
-            buckleMiscellaneous: 0,
-            netWeight: 0,
-            receivableWeighingFee: '',
-            warehouseInOutDetail: {
-				grade: '',
-				imperfectGrain: '',
-				impurity: '',
-				jiaorenli: '',
-				bulkDensity: '',
-				mildewGrain: '',
-            },
-			qualityInspectionManagement: {
-                boxNo: '暂无',
-                boxNoOther: '暂无',
-                titleNo: '暂无',
-                titleNoOther: '暂无',
-			},
+          grossWeight: 0,
+          tare: 0,
+          tips: '',
+          buckleMiscellaneous: 0,
+          netWeight: 0,
+          receivableWeighingFee: '',
+          warehouseInOutDetail: {
+            grade: '',
+            imperfectGrain: '',
+            impurity: '',
+            jiaorenli: '',
+            bulkDensity: '',
+            mildewGrain: '',
+          },
+          qualityInspectionManagement: {
+            boxNo: '暂无',
+            boxNoOther: '暂无',
+            titleNo: '暂无',
+            titleNoOther: '暂无',
+          },
         }
         this.index = val
         // this.disabled=true
@@ -1592,10 +1585,12 @@
   .center {
     background: #fff;
   }
-  .size_css{
-    width: 100%;
-    min-width: 1930px;
+
+  .size_css {
+    width: 540px;
+    min-width: 540px;
     overflow-x: scroll;
+    position: relative;
   }
 
   .ws-info-table {
@@ -1749,12 +1744,11 @@
     color: #2aff7c;
     width: 50%;
   }
-  .call-show{
+
+  .call-show {
     width: 540px;
   }
-  // .list-info{
-  //   min-width: 561px;
-  // }
+
   .top {
     background: black;
     color: #2aff7c;
@@ -1763,9 +1757,9 @@
     padding: 0 10px 0 20px;
     border-radius: 10px;
     margin: 0 20px 20px 20px;
-      position: absolute;
-        top: 140px;
-        width:445px;
+    position: absolute;
+    top: 140px;
+    width: 465px;
 
     .zujian {
       position: relative;