zhongtianhaoyuan 3 years ago
parent
commit
2cf971e3a2

+ 1 - 1
src/views/contractManagement/purchaseContractCost.vue

@@ -534,7 +534,7 @@
               this.deptBudgetList.costType=this.costType
               this.deptBudgetList.compId=this.compId
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
-              this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
+              // this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
             if(this.status==1||this.status==2){
               this.deptBudgetList.type=this.status
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')

+ 1 - 1
src/views/contractManagement/salesContractCost.vue

@@ -533,7 +533,7 @@
               this.deptBudgetList.costType=this.costType
               this.deptBudgetList.compId=this.compId
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
-              this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
+              // this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
             if(this.status==1||this.status==2){
               this.deptBudgetList.type=this.status
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')

+ 1996 - 1528
src/views/outboundManagement/weighingManagementNew.vue

@@ -1,19 +1,30 @@
 <template>
-	<div class="center">
-		<BaseHeaderLayout :leftSpan="12">
-			<template slot="left">
-				<!-- <ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加皮重
+  <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="可按合同编号、车牌号查找"
+      </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="
@@ -22,193 +33,553 @@
 					top: 0px;
 					left: -8px;
 					" src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
-			</template>
-		</BaseHeaderLayout>
-		
-		<el-row :gutter="20">
-			<el-col :span="8">
-				<div style='background:#f6f7fc;padding:10px;' class="grid-content bg-purple">
-					<div class="top">
-						<div>{{tpyeNo == 1?'皮重':'毛重'}} </div>
-						<div class="confirmInfo">
-							<div class="car-type">车牌号</div>
-							<div class="car-no">{{ weighingList.carNumber }}</div>
-						</div>
-						<div class="confirmInfo">
-							<div class="car-type">浮动重量</div>
-							<div class="car-no">{{ weighingList.weight }}kg</div>
-						</div>
-						<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>
-						<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>
-				</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>
-					<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="
-									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="
-									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="
-									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="
-									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="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">
+      </template>
+    </BaseHeaderLayout>
+
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <div
+          style="background: #f6f7fc; padding: 10px"
+          class="grid-content bg-purple"
+        >
+          <div class="top">
+            <div>{{ tpyeNo == 1 ? '皮重' : '毛重' }}</div>
+            <div class="confirmInfo">
+              <div class="car-type">车牌号</div>
+              <div class="car-no">{{ weighingList.carNumber }}</div>
+            </div>
+            <div class="confirmInfo">
+              <div class="car-type">浮动重量</div>
+              <div class="car-no">{{ weighingList.weight }}kg</div>
+            </div>
+            <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>
+            <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>
+        </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>
+          <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="
+                      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="
+                      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="
+                      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="
+                      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="
+                        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-input type="number" v-model="weighingList.receivableWeighingFee" placeholder="未获取到卸车过磅费金额"
 											maxlength="100" size="small" disabled />
 										</ws-form-item>
@@ -216,46 +587,82 @@
 										<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>	
-					</div>
-				</ws-form>
-				</div>
-			</el-col>
-			<el-col :span="8">
-				<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>
-			</el-col>
-		</el-row>
-		<el-dialog
+                  </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>
+            </div>
+          </ws-form>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <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>
+      </el-col>
+    </el-row>
+    <el-dialog
       width="70%"
       class="table-content"
       center
@@ -272,1342 +679,1403 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
-	</div>
+  </div>
 </template>
 <script>
-	import {
-		grossWeight,
-		getbinNumber,
-		contractListWeighing,
-		tareAdd,
-		tareEdit,
-		getweighing,
-		getweighingList,
-		selectWarehouseSelf,
-		
-		delelteWeighing,
-	} from '@/model/outboundManagement/index'
-	import {
-    pullDown,
-    addstorageputList,
-    xialaNo,
-    getstaff,
-    getReceiptTaskNo,
-  } from '@/model/warehouse/index'
-  import weightCheckPrint from './component/weightCheckPrint.vue'
-  import inspectInfoPrint from './component/inspectInfoPrint.vue'
-   import html2canvas from 'html2canvas'
-	import WsUpload from '@/components/WsUpload'
-	import {EventBus} from 'base-core-lib'
-	export default {
-		components: {
-			WsUpload,
-			inspectInfoPrint,
-			weightCheckPrint
-		},
-		data() {
-			return {
-				isShowPrint:false,
-				warehouseName:'',
-				warehouseList:[],
-				warehouseList1:[],
-				currentPage: 1,
-        		pageSize: 10,
-				submitAllow:false,
-				deliveryList:[],
-				positionInfos:[],
-				searchKeyWord:'',
-				paramType:'',
-				deptBudgetTotal:0,
-				monitorUrl1:'',
-				monitorUrl2:'',
-				index: 0,
-				inspect:{},
-				id:0,
-				options2:[],
-				isSelectType:false,
-				recheck:false,
-				disabled:true,
-				pListTop:[],
-				tpyeNo:1,
-				types:null,
-				information: '皮重',
-				carChange1: '手动填写',
-				inWarehouseType: 1, //入库类型
-				outContractNo: [],
-				mListTop: [],
-				searchType:'',
-				taskNolist:[],
-				storageType:[],
-				fleetNameList:[],
-				carstatus:false,
-				carjudge: false,
-				warehouseCount:0,
-                warehouseNo:'',
-				statusType:'3',
-				warehouseType:1,
-				weighingList: {
-					weight:'',
-					tips:'',
-					// contractNo:'',
-					// inOutTaskNo:'',
-					buckleMiscellaneous: 0,
-					netWeight: 0,
-					receivableWeighingFee: '',
-					warehouseInOutDetail: {
-						grade:'',
-						imperfectGrain:'',
-						impurity:'',
-						jiaorenli:'',
-						bulkDensity:'',
-						mildewGrain:'',
-					},
-					qualityInspectionManagement: {
-						boxNo: "暂无",
-						boxNoOther: "暂无",
-						titleNo: "暂无",
-						titleNoOther: "暂无",
-					}
-				},
-				carWeightInfo: {
-					carNumber: '',
-					type: '',
-					weight: '',
-				},
-				multiSelector: [{
-						name: '汽运',
-						value: '0',
-					},
-					{
-						name: '火运',
-						value: '1',
-					},
-					{
-						name: '集装箱船',
-						value: '2',
-					},
-					{
-						name: '散船',
-						value: '3',
-					},
-				],
-			}
-    },
-    mounted() {
-		this.selectWarehouse()
-      	this.showType = this.isShow
-	  	this.openPort()
-		this.getNowTime()
-		if(	localStorage.getItem('houseSelfCollect_house1').allowEdit == 1){
-			this.disabled = false
-		}else{
-			this.disabled = true
-		}		
-	},
-	activated() {
-		
-	},
-	methods: {
-		statustypechangelist(status){
-			this.statusType=status
-			this.getList()
-		},
-		getNowTime() {
-       var now = new Date();
-       var year = now.getFullYear(); //得到年份
-       var month = now.getMonth(); //得到月份
-       var date = now.getDate(); //得到日期
-       month = month + 1;
-       month = month.toString().padStart(2, "0");
-       date = date.toString().padStart(2, "0");
-       var defaultDate = `${year}-${month}-${date}`;
-       this.$set(this.weighingList, "inOutDate", defaultDate);
-   },
-		record(){
-			this.$router.push({path: 'weighingManagementrecord' })
-		},
-		closePrint() {
-        	this.isShowPrint = false
-      	},
-		printSmall() {
-			localStorage.setItem('inspect',JSON.stringify(this.inspect))
-        window.open('../../../static/weightChecknew.html?type=1' )
-		// window.open('../../../static/weightChecknew.html?type=1&dataList=' + JSON.stringify(this.inspect))
+import {
+  grossWeight,
+  getbinNumber,
+  contractListWeighing,
+  tareAdd,
+  tareEdit,
+  getweighing,
+  getweighingList,
+  selectWarehouseSelf,
+  delelteWeighing,
+} from '@/model/outboundManagement/index'
+import {
+  pullDown,
+  addstorageputList,
+  xialaNo,
+  getstaff,
+  getReceiptTaskNo,
+} from '@/model/warehouse/index'
+import weightCheckPrint from './component/weightCheckPrint.vue'
+import inspectInfoPrint from './component/inspectInfoPrint.vue'
+import html2canvas from 'html2canvas'
+import WsUpload from '@/components/WsUpload'
+import { EventBus } from 'base-core-lib'
+export default {
+  components: {
+    WsUpload,
+    inspectInfoPrint,
+    weightCheckPrint,
+  },
+  data() {
+    return {
+      isShowPrint: false,
+      warehouseName: '',
+      warehouseList: [],
+      warehouseList1: [],
+      currentPage: 1,
+      pageSize: 10,
+      submitAllow: false,
+      deliveryList: [],
+      positionInfos: [],
+      searchKeyWord: '',
+      paramType: '',
+      deptBudgetTotal: 0,
+      monitorUrl1: '',
+      monitorUrl2: '',
+      index: 0,
+      inspect: {},
+      id: 0,
+      options2: [],
+      isSelectType: false,
+      recheck: false,
+      disabled: true,
+      pListTop: [],
+      tpyeNo: 1,
+      types: null,
+      information: '皮重',
+      carChange1: '手动填写',
+      inWarehouseType: 1, //入库类型
+      outContractNo: [],
+      mListTop: [],
+      searchType: '',
+      taskNolist: [],
+      storageType: [],
+      fleetNameList: [],
+      carstatus: false,
+      carjudge: false,
+      warehouseCount: 0,
+      warehouseNo: '',
+      statusType: '3',
+      warehouseType: 1,
+      weighingList: {
+        weight: '',
+        tips: '',
+        // contractNo:'',
+        // inOutTaskNo:'',
+        buckleMiscellaneous: 0,
+        netWeight: 0,
+        receivableWeighingFee: '',
+        warehouseInOutDetail: {
+          grade: '',
+          imperfectGrain: '',
+          impurity: '',
+          jiaorenli: '',
+          bulkDensity: '',
+          mildewGrain: '',
+        },
+        qualityInspectionManagement: {
+          boxNo: '暂无',
+          boxNoOther: '暂无',
+          titleNo: '暂无',
+          titleNoOther: '暂无',
+        },
       },
-      printBig() {
-		  localStorage.setItem('inspect',JSON.stringify(this.inspect))
-        window.open('../../../static/weightChecknew.html?type=2' )
-        // window.open('../../../static/weightChecknew.html?type=2&dataList=' + JSON.stringify(this.inspect))
+      carWeightInfo: {
+        carNumber: '',
+        type: '',
+        weight: '',
       },
-		opendBtn(){
-           html2canvas(this.$refs.saveImg.$el).then(canvas => {
-          let dataURL = canvas.toDataURL('image/png');
-          this.imgUrl = dataURL;
-          if (this.imgUrl !== '') {
-            let b = this.dataURLtoFile(this.imgUrl, 'printImg')
-            let formdata = new FormData();
-            formdata.append('file', b);
-            axios({
-              method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
-              data: formdata
-            }).then((response) => {
-              //编辑接口
-              this.weighingList.pictureAddress = response.data.url
-              console.log(this.types)
-              if (this.types == 3) {
-                this.weighingList.flag = 0
-              } else if (this.types == 4) {
-                this.weighingList.flag = 1
-              }
-              grossWeight(this.weighingList)
+      multiSelector: [
+        {
+          name: '汽运',
+          value: '0',
+        },
+        {
+          name: '火运',
+          value: '1',
+        },
+        {
+          name: '集装箱船',
+          value: '2',
+        },
+        {
+          name: '散船',
+          value: '3',
+        },
+      ],
+    }
+  },
+  mounted() {
+    this.selectWarehouse()
+    this.showType = this.isShow
+    this.openPort()
+    this.getNowTime()
+    if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
+      this.disabled = false
+    } else {
+      this.disabled = true
+    }
+  },
+  activated() {},
+  methods: {
+    statustypechangelist(status) {
+      this.statusType = status
+      this.getList()
+    },
+    getNowTime() {
+      var now = new Date()
+      var year = now.getFullYear() //得到年份
+      var month = now.getMonth() //得到月份
+      var date = now.getDate() //得到日期
+      month = month + 1
+      month = month.toString().padStart(2, '0')
+      date = date.toString().padStart(2, '0')
+      var defaultDate = `${year}-${month}-${date}`
+      this.$set(this.weighingList, 'inOutDate', defaultDate)
+    },
+    record() {
+      this.$router.push({
+        path: 'weighingManagementrecord',
+        query: { warehouseName: this.warehouseName },
+      })
+    },
+    closePrint() {
+      this.isShowPrint = false
+    },
+    printSmall() {
+      localStorage.setItem('inspect', JSON.stringify(this.inspect))
+      window.open('../../../static/weightChecknew.html?type=1')
+      // window.open('../../../static/weightChecknew.html?type=1&dataList=' + JSON.stringify(this.inspect))
+    },
+    printBig() {
+      localStorage.setItem('inspect', JSON.stringify(this.inspect))
+      window.open('../../../static/weightChecknew.html?type=2')
+      // window.open('../../../static/weightChecknew.html?type=2&dataList=' + JSON.stringify(this.inspect))
+    },
+    opendBtn() {
+      html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+        let dataURL = canvas.toDataURL('image/png')
+        this.imgUrl = dataURL
+        if (this.imgUrl !== '') {
+          let b = this.dataURLtoFile(this.imgUrl, 'printImg')
+          let formdata = new FormData()
+          formdata.append('file', b)
+          axios({
+            method: 'post',
+            url: 'https://www.zthymaoyi.com/upload/admin',
+            data: formdata,
+          }).then((response) => {
+            //编辑接口
+            this.weighingList.pictureAddress = response.data.url
+            console.log(this.types)
+            if (this.types == 3) {
+              this.weighingList.flag = 0
+            } else if (this.types == 4) {
+              this.weighingList.flag = 1
+            }
+            grossWeight(this.weighingList)
+              .toPromise()
+              .then((response) => {
+                this.types = ''
+                // this.inspect = []
+              })
+          })
+        }
+      })
+    },
+    closeDialog() {
+      html2canvas(this.$refs.saveImg.$el).then((canvas) => {
+        let dataURL = canvas.toDataURL('image/png')
+        this.imgUrl = dataURL
+        if (this.imgUrl !== '') {
+          let b = this.dataURLtoFile(this.imgUrl, 'printImg')
+          let formdata = new FormData()
+          formdata.append('file', b)
+          axios({
+            method: 'post',
+            url: 'https://www.zthymaoyi.com/upload/admin',
+            data: formdata,
+          }).then((response) => {
+            //编辑接口
+            this.weighingList.pictureAddress = response.data.url
+            console.log(this.types)
+            if (this.types == 3) {
+              this.weighingList.flag = 0
+            } else if (this.types == 4) {
+              this.weighingList.flag = 1
+            }
+            grossWeight(this.weighingList)
+              .toPromise()
+              .then((response) => {
+                this.types = ''
+                // this.inspect = []
+                this.isShowPrint = false
+              })
+          })
+          this.dialogTableVisible = true
+        }
+      })
+    },
+    weightweight() {
+      if (this.tpyeNo == 1) {
+        this.weighingList.grossWeight = this.weighingList.weight
+      } else {
+        this.weighingList.tare = this.weighingList.weight
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    listclick(row) {
+      this.id = row.id
+      getweighing({
+        id: row.id,
+      })
+        .toPromise()
+        .then((response) => {
+          this.weighingList = response
+          this.weighingList.grossWeight = this.weighingList.grossWeight * 1000
+          this.weighingList.tare = this.weighingList.tare * 1000
+          this.weighingList.netWeight = this.weighingList.netWeight * 1000
+          this.weighingList.buckleMiscellaneous =
+            this.weighingList.buckleMiscellaneous * 1000
+          this.weighingList.carNo =
+            response.qualityInspectionManagement.carNumber
+          this.weighingList.boxNo = response.boxNo
+          this.weighingList.boxNoOther = response.boxNoOther
+          this.weighingList.titleNo = response.titleNo
+          this.weighingList.titleNoOther = response.titleNoOther
+          this.weighingList.wingNumber =
+            response.qualityInspectionManagement.wingNumber
+          this.weighingList.wingNumberOther =
+            response.qualityInspectionManagement.wingNumberOther
+          this.weighingList.warehouseInOutDetail = {
+            grade: '',
+            imperfectGrain: '',
+            impurity: '',
+            jiaorenli: '',
+            bulkDensity: '',
+            mildewGrain: '',
+          }
+        })
+      // if(){
+
+      // }
+      // this.deptBudgetList=row
+      // console.log(row)
+    },
+    add() {
+      this.information = '皮重'
+      this.weighingList = {
+        grossWeight: 0,
+        tare: 0,
+        tips: '',
+        // contractNo:'',
+        // inOutTaskNo:'',
+        buckleMiscellaneous: 0,
+        netWeight: 0,
+        receivableWeighingFee: '',
+        warehouseInOutDetail: {
+          grade: '',
+          imperfectGrain: '',
+          impurity: '',
+          jiaorenli: '',
+          bulkDensity: '',
+          mildewGrain: '',
+        },
+        qualityInspectionManagement: {
+          boxNo: '暂无',
+          boxNoOther: '暂无',
+          titleNo: '暂无',
+          titleNoOther: '暂无',
+        },
+      }
+    },
+    deletelist() {
+      if (this.id) {
+        delelteWeighing({
+          id: this.id,
+        })
+          .toPromise()
+          .then((response) => {
+            this.$message({
+              message: '删除成功!',
+              type: 'success',
+            })
+            this.id = ''
+            this.weighingList = {
+              grossWeight: 0,
+              tare: 0,
+              tips: '',
+              // contractNo:'',
+              // inOutTaskNo:'',
+              buckleMiscellaneous: 0,
+              netWeight: 0,
+              receivableWeighingFee: '',
+              warehouseInOutDetail: {
+                grade: '',
+                imperfectGrain: '',
+                impurity: '',
+                jiaorenli: '',
+                bulkDensity: '',
+                mildewGrain: '',
+              },
+              qualityInspectionManagement: {
+                boxNo: '暂无',
+                boxNoOther: '暂无',
+                titleNo: '暂无',
+                titleNoOther: '暂无',
+              },
+            }
+            this.getList()
+          })
+      }
+    },
+    binNumberchange(e) {
+      for (let i = 0; i < this.positionInfos.length; i++) {
+        if (this.positionInfos[i].binNumber == e) {
+          this.weighingList.positionId = this.positionInfos[i].id
+        }
+      }
+    },
+    print() {
+      this.weighingList.carNumber = this.weighingList.carNo
+      if (this.types == 1 || this.types == 2) {
+        if (!this.weighingList.contractNo) {
+          this.$message({
+            message: '合同编号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.weighingList.binNumber) {
+          this.$message({
+            message: '仓位号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.weighingList.storageNumber) {
+          this.$message({
+            message: '囤位号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.weighingList.storageNumber.length < 1 ||
+          this.weighingList.storageNumber.length > 10
+        ) {
+          this.$message({
+            message: '囤位号不超过10个字符!',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.weighingList.carNumber) {
+          this.$message({
+            message: '车牌号不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.weighingList.carNumber.length != 7) {
+          this.$message({
+            message: '车牌号输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.weighingList.inOutType) {
+          this.$message({
+            message: '出库类型不能为空',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (this.tpyeNo == 1) {
+        if (!this.weighingList.tare) {
+          this.$message({
+            message: '皮重不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.weighingList.tare) ||
+          (String(this.weighingList.tare).indexOf('.') != -1 &&
+            String(this.weighingList.tare).length -
+              (String(this.weighingList.tare).indexOf('.') + 1) >
+              1) ||
+          this.weighingList.tare < 1 ||
+          this.weighingList.tare > 100000
+        ) {
+          this.$message({
+            message: '皮重输入错误!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (this.types == 2) {
+        if (!this.weighingList.grossWeight) {
+          this.$message({
+            message: '毛重不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.weighingList.grossWeight) ||
+          (String(this.weighingList.grossWeight).indexOf('.') != -1 &&
+            String(this.weighingList.grossWeight).length -
+              (String(this.weighingList.grossWeight).indexOf('.') + 1) >
+              1) ||
+          this.weighingList.grossWeight < 1 ||
+          this.weighingList.grossWeight > 100000
+        ) {
+          this.$message({
+            message: '毛重输入错误!',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.weighingList.netWeight < 0) {
+          this.$message({
+            message: '净重不能为负',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      this.weighingList.compId = localStorage.getItem('ws-pf_compId')
+      this.weighingList.warehouseName = this.warehouseName
+      this.weighingList.warehouseType = this.warehouseTyp
+      this.$confirm('确定保存检斤信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.weighingList.inOutFlag = 1
+          this.weighingList.statusFlag = 3
+          this.weighingList.grossWeight = this.weighingList.grossWeight / 1000
+          this.weighingList.tare = this.weighingList.tare / 1000
+          this.weighingList.netWeight = this.weighingList.netWeight / 1000
+          this.weighingList.buckleMiscellaneous =
+            this.weighingList.buckleMiscellaneous / 1000
+          if (this.tpyeNo == 1) {
+            this.weighingList.relationId = this.relationId
+            this.weighingList.warehouseId = this.warehouseId
+            this.weighingList.baseId = this.warehouseId
+            this.weighingList.skinInspector =
+              localStorage.getItem('ws-pf_staffName')
+            if (this.weighingList.id) {
+              addstorageputList(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  this.types = ''
-                  // this.inspect = [] 
+                  this.weighingList.warehouseInOutId = response
+                  tareEdit(this.weighingList)
+                    .toPromise()
+                    .then((response) => {
+                      getweighing({ id: this.weighingList.id })
+                      toPromise().then((response) => {
+                        if (this.reader) {
+                          this.reader.cancel()
+                        }
+                        this.$notify({
+                          title: '成功',
+                          message: '提交成功',
+                          type: 'success',
+                        })
+                        this.getList()
+                        this.weighingList = response
+                        this.warehouseCount += 1
+                        this.weighingList.grossWeight =
+                          this.weighingList.grossWeight * 1000
+                        this.weighingList.tare = this.weighingList.tare * 1000
+                        this.weighingList.netWeight =
+                          this.weighingList.netWeight * 1000
+                        this.weighingList.buckleMiscellaneous =
+                          this.weighingList.buckleMiscellaneous * 1000
+                        this.inspect = JSON.parse(
+                          JSON.stringify(this.weighingLis)
+                        )
+                        this.isShowPrint = true
+                        this.weighingList = {
+                          grossWeight: 0,
+                          tare: 0,
+                          tips: '',
+                          // contractNo:'',
+                          // inOutTaskNo:'',
+                          buckleMiscellaneous: 0,
+                          netWeight: 0,
+                          receivableWeighingFee: '',
+                          warehouseInOutDetail: {
+                            grade: '',
+                            imperfectGrain: '',
+                            impurity: '',
+                            jiaorenli: '',
+                            bulkDensity: '',
+                            mildewGrain: '',
+                          },
+                          qualityInspectionManagement: {
+                            boxNo: '暂无',
+                            boxNoOther: '暂无',
+                            titleNo: '暂无',
+                            titleNoOther: '暂无',
+                          },
+                        }
+                      })
+                    })
                 })
-            })
-          }
-        })
-      },
-      closeDialog() {
-        html2canvas(this.$refs.saveImg.$el).then(canvas => {
-          let dataURL = canvas.toDataURL('image/png');
-          this.imgUrl = dataURL;
-          if (this.imgUrl !== '') {
-            let b = this.dataURLtoFile(this.imgUrl, 'printImg')
-            let formdata = new FormData();
-            formdata.append('file', b);
-            axios({
-              method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
-              data: formdata
-            }).then((response) => {
-              //编辑接口
-              this.weighingList.pictureAddress = response.data.url
-              console.log(this.types)
-              if (this.types == 3) {
-                this.weighingList.flag = 0
-              } else if (this.types == 4) {
-                this.weighingList.flag = 1
-              }
-              grossWeight(this.weighingList)
+                .catch((response) => {
+                  this.$notify.warning(response)
+                })
+            } else {
+              this.weighingList.relationId = this.relationId
+              this.weighingList.warehouseId = this.warehouseId
+              this.weighingList.baseId = this.warehouseId
+              console.log(this.weighingList)
+              addstorageputList(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  this.types = ''
-                  // this.inspect = [] 
-                  this.isShowPrint = false
+                  this.weighingList.warehouseInOutId = response
+                  tareAdd(this.weighingList)
+                    .toPromise()
+                    .then((response) => {
+                      getweighing({ id: response })
+                        .toPromise()
+                        .then((response) => {
+                          this.weighingList = response
+                          this.warehouseCount += 1
+                          this.weighingList.grossWeight =
+                            this.weighingList.grossWeight * 1000
+                          this.weighingList.tare = this.weighingList.tare * 1000
+                          this.weighingList.netWeight =
+                            this.weighingList.netWeight * 1000
+                          this.weighingList.buckleMiscellaneous =
+                            this.weighingList.buckleMiscellaneous * 1000
+                          this.inspect = JSON.parse(
+                            JSON.stringify(this.weighingList)
+                          )
+                          this.isShowPrint = true
+                        })
+
+                      if (this.reader) {
+                        this.reader.cancel()
+                      }
+                      this.$notify({
+                        title: '成功',
+                        message: '提交成功',
+                        type: 'success',
+                      })
+                      this.getList()
+                      this.weighingList = {
+                        grossWeight: 0,
+                        tare: 0,
+                        tips: '',
+                        // contractNo:'',
+                        // inOutTaskNo:'',
+                        buckleMiscellaneous: 0,
+                        netWeight: 0,
+                        receivableWeighingFee: '',
+                        warehouseInOutDetail: {
+                          grade: '',
+                          imperfectGrain: '',
+                          impurity: '',
+                          jiaorenli: '',
+                          bulkDensity: '',
+                          mildewGrain: '',
+                        },
+                        qualityInspectionManagement: {
+                          boxNo: '暂无',
+                          boxNoOther: '暂无',
+                          titleNo: '暂无',
+                          titleNoOther: '暂无',
+                        },
+                      }
+                      // 	if (this.reader) {
+                      // 		this.reader.cancel()
+                      // 	}
+                      // 	this.$notify.success({
+                      // 	title: '成功',
+                      // 	message: '提交成功',
+                      // })
+                      // 	this.isShowPrint=true
+                      // 	this.weighingList.grossWeight=this.weighingList.grossWeight*1000
+                      // 	this.weighingList.tare=this.weighingList.tare*1000
+                      // 	this.weighingList.netWeight=this.weighingList.netWeight*1000
+                      // 	this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
+                      // 	this.inspect=JSON.parse(JSON.stringify(this.weighingList))
+                      // 	this.weighingList= {
+                      // 		grossWeight: 0,
+                      // 		tare: 0,
+                      // 		tips:'',
+                      // 			// contractNo:'',
+                      // 			// inOutTaskNo:'',
+                      // 		buckleMiscellaneous: 0,
+                      // 		netWeight: 0,
+                      // 		receivableWeighingFee: '',
+                      // 		warehouseInOutDetail: {
+                      // 			grade:'',
+                      // 			imperfectGrain:'',
+                      // 			impurity:'',
+                      // 			jiaorenli:'',
+                      // 			bulkDensity:'',
+                      // 			mildewGrain:'',
+                      // 		},
+                      // 		qualityInspectionManagement: {
+                      // 			boxNo: "暂无",
+                      // 			boxNoOther: "暂无",
+                      // 			titleNo: "暂无",
+                      // 			titleNoOther: "暂无",
+                      // 		}
+                      // 	}
+                    })
                 })
-            })
-            this.dialogTableVisible = true;
+                .catch((response) => {})
+            }
+          } else if (this.tpyeNo == 2) {
+            this.weighingList.secretaryWeigher =
+              localStorage.getItem('ws-pf_staffName')
+            this.weighingList.warehouseId = this.warehouseId
+            this.weighingList.baseId = this.warehouseId
+            addstorageputList(this.weighingList)
+              .toPromise()
+              .then((response) => {
+                this.weighingList.warehouseInOutId = response
+                grossWeight(this.weighingList)
+                  .toPromise()
+                  .then((response) => {
+                    if (this.reader) {
+                      this.reader.cancel()
+                    }
+                    // 	this.$notify.success({
+                    // 	title: '成功',
+                    // 	message: '提交成功',
+                    // })
+                    this.$notify({
+                      title: '成功',
+                      message: '提交成功',
+                      type: 'success',
+                    })
+                    this.weighingList.grossWeight =
+                      this.weighingList.grossWeight * 1000
+                    this.weighingList.tare = this.weighingList.tare * 1000
+                    this.weighingList.netWeight =
+                      this.weighingList.netWeight * 1000
+                    this.weighingList.buckleMiscellaneous =
+                      this.weighingList.buckleMiscellaneous * 1000
+                    this.inspect = JSON.parse(JSON.stringify(this.weighingList))
+                    this.isShowPrint = true
+                    this.weighingList = {
+                      grossWeight: 0,
+                      selfLoading: 0,
+                      tare: 0,
+                      tips: '',
+                      // contractNo:'',
+                      // inOutTaskNo:'',
+                      buckleMiscellaneous: 0,
+                      netWeight: 0,
+                      receivableWeighingFee: '',
+                      warehouseInOutDetail: {
+                        grade: '',
+                        imperfectGrain: '',
+                        impurity: '',
+                        jiaorenli: '',
+                        bulkDensity: '',
+                        mildewGrain: '',
+                      },
+                      qualityInspectionManagement: {
+                        boxNo: '暂无',
+                        boxNoOther: '暂无',
+                        titleNo: '暂无',
+                        titleNoOther: '暂无',
+                      },
+                    }
+                    this.getList()
+                  })
+              })
+              .catch((response) => {})
           }
         })
-
-      },
-		weightweight(){
-			if(this.tpyeNo==1){
-				this.weighingList.grossWeight=this.weighingList.weight
-			}else{
-				this.weighingList.tare=this.weighingList.weight
-			}
-		},
-		handleSizeChange(val) {
-			console.log(`每页 ${val} 条`)
-			this.pageSize = val
-			this.getList()
-		},
-		handleCurrentChange(val) {
-			this.currentPage = val
-			console.log(`当前页: ${val}`)
-			this.getList()
-		},
-		listclick(row){
-			this.id=row.id
-			getweighing({
-				id: row.id
-				})
-				.toPromise()
-				.then((response) => {
-					this.weighingList=response
-					this.weighingList.grossWeight=this.weighingList.grossWeight*1000
-					this.weighingList.tare=this.weighingList.tare*1000
-					this.weighingList.netWeight=this.weighingList.netWeight*1000
-					this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
-					this.weighingList.carNo=response.qualityInspectionManagement.carNumber
-					this.weighingList.boxNo=response.boxNo
-					this.weighingList.boxNoOther=response.boxNoOther
-					this.weighingList.titleNo=response.titleNo
-					this.weighingList.titleNoOther=response.titleNoOther
-					this.weighingList.wingNumber=response.qualityInspectionManagement.wingNumber
-					this.weighingList.wingNumberOther=response.qualityInspectionManagement.wingNumberOther
-					this.weighingList.warehouseInOutDetail={
-						grade:'',
-						imperfectGrain:'',
-						impurity:'',
-						jiaorenli:'',
-						bulkDensity:'',
-						mildewGrain:'',
-					}
-				})
-			// if(){
-			
-			// }
-			// this.deptBudgetList=row
-			// console.log(row)
-      	},
-		add(){
-        	this.information='皮重'
-        	this.weighingList= {
-				grossWeight: 0,
-				tare: 0,
-				tips:'',
-					// contractNo:'',
-					// inOutTaskNo:'',
-				buckleMiscellaneous: 0,
-				netWeight: 0,
-				receivableWeighingFee: '',
-				warehouseInOutDetail: {
-					grade:'',
-					imperfectGrain:'',
-					impurity:'',
-					jiaorenli:'',
-					bulkDensity:'',
-					mildewGrain:'',
-				},
-				qualityInspectionManagement: {
-					boxNo: "暂无",
-					boxNoOther: "暂无",
-					titleNo: "暂无",
-					titleNoOther: "暂无",
-				}
-			}
-      	},
-		deletelist(){
-			if(this.id){
-			delelteWeighing({
-				id: this.id
-				})
-				.toPromise()
-				.then((response) => {
-				this.$message({
-					message: '删除成功!',
-					type: 'success',
-				})
-				this.id=''
-				this.weighingList= {
-					grossWeight: 0,
-					tare: 0,
-					tips:'',
-						// contractNo:'',
-						// inOutTaskNo:'',
-					buckleMiscellaneous: 0,
-					netWeight: 0,
-					receivableWeighingFee: '',
-					warehouseInOutDetail: {
-						grade:'',
-						imperfectGrain:'',
-						impurity:'',
-						jiaorenli:'',
-						bulkDensity:'',
-						mildewGrain:'',
-					},
-					qualityInspectionManagement: {
-						boxNo: "暂无",
-						boxNoOther: "暂无",
-						titleNo: "暂无",
-						titleNoOther: "暂无",
-					}
-				}
-				this.getList()
-				})
-			}
-      	},
-		binNumberchange(e){
-			for (let i = 0; i < this.positionInfos.length; i++) {
-				if(this.positionInfos[i].binNumber==e){
-					this.weighingList.positionId=this.positionInfos[i].id
-				}
-				
-			}
-		},
-		print() {
-			this.weighingList.carNumber=this.weighingList.carNo
-			if (this.types == 1 || this.types == 2) {
-				if (!this.weighingList.contractNo) {
-					this.$message({
-						message: '合同编号不能为空',
-						type: 'warning',
-					})
-					return
-				}
-				if (!this.weighingList.binNumber) {
-					this.$message({
-						message: '仓位号不能为空',
-						type: 'warning',
-					})
-					return
-				}
-				if (!this.weighingList.storageNumber) {
-					this.$message({
-						message: '囤位号不能为空',
-						type: 'warning',
-					})
-					return
-				}
-				if (this.weighingList.storageNumber.length < 1 ||this.weighingList.storageNumber.length > 10) {
-					this.$message({
-						message: '囤位号不超过10个字符!',
-						type: 'warning',
-					})
-					return
-				}
-				if (!this.weighingList.carNumber) {
-					this.$message({
-						message: '车牌号不能为空',
-						type: 'warning',
-					})
-					return
-				}
-				if (this.weighingList.carNumber.length != 7) {
-					this.$message({
-						message: '车牌号输入错误',
-						type: 'warning',
-					})
-					return
-				}
-				if (!this.weighingList.inOutType) {
-					this.$message({
-						message: '出库类型不能为空',
-						type: 'warning',
-					})
-					return
-				}
-					
-			}
-			if(this.tpyeNo==1){
-				if (!this.weighingList.tare) {
-						this.$message({
-							message: '皮重不能为空',
-							type: 'warning',
-						})
-						return
-					}
-					if (
-						isNaN(this.weighingList.tare) ||
-						(String(this.weighingList.tare).indexOf('.') != -1 &&
-							String(this.weighingList.tare).length -
-							(String(this.weighingList.tare).indexOf('.') + 1) >
-							1) ||
-						this.weighingList.tare < 1 ||
-						this.weighingList.tare > 100000
-					) {
-						this.$message({
-							message: '皮重输入错误!',
-							type: 'warning',
-						})
-						return
-					}
-			}
-			if (this.types == 2) {
-				if (!this.weighingList.grossWeight) {
-					this.$message({
-						message: '毛重不能为空',
-						type: 'warning',
-					})
-					return
-				}
-				if (
-					isNaN(this.weighingList.grossWeight) ||
-					(String(this.weighingList.grossWeight).indexOf('.') != -1 &&
-					String(this.weighingList.grossWeight).length -
-					(String(this.weighingList.grossWeight).indexOf('.') + 1) >1) ||this.weighingList.grossWeight < 1 ||
-					this.weighingList.grossWeight > 100000
-				) {
-					this.$message({
-						message: '毛重输入错误!',
-						type: 'warning',
-					})
-					return
-				}
-				if (this.weighingList.netWeight < 0){
-					this.$message({
-						message: '净重不能为负',
-						type: 'warning',
-					})
-					return
-				}
-			}
-			this.weighingList.compId=localStorage.getItem('ws-pf_compId')
-			this.weighingList.warehouseName = this.warehouseName
-			this.weighingList.warehouseType=this.warehouseTyp
-			this.$confirm('确定保存检斤信息?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-			.then(() => {
-				this.weighingList.inOutFlag = 1
-              	this.weighingList.statusFlag = 3
-				this.weighingList.grossWeight=this.weighingList.grossWeight/1000
-				this.weighingList.tare=this.weighingList.tare/1000
-				this.weighingList.netWeight=this.weighingList.netWeight/1000
-				this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous/1000
-				if (this.tpyeNo == 1) {
-					this.weighingList.relationId = this.relationId
-					this.weighingList.warehouseId = this.warehouseId
-					this.weighingList.baseId=this.warehouseId
-					this.weighingList.skinInspector = localStorage.getItem('ws-pf_staffName')
-					if(this.weighingList.id){
-						addstorageputList(this.weighingList)
-						.toPromise()
-						.then((response) => {
-							this.weighingList.warehouseInOutId=response
-							tareEdit(this.weighingList)
-							.toPromise()
-							.then((response) => {
-								getweighing({id:this.weighingList.id})
-								toPromise()
-								.then((response) => {
-									if (this.reader) {
-									this.reader.cancel()
-									}
-									this.$notify.success({
-										title: '成功',
-										message: '提交成功',
-									})
-									this.getList()
-									this.weighingList=response
-									this.warehouseCount+=1
-									this.weighingList.grossWeight=this.weighingList.grossWeight*1000
-									this.weighingList.tare=this.weighingList.tare*1000
-									this.weighingList.netWeight=this.weighingList.netWeight*1000
-									this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
-									this.inspect=JSON.parse(JSON.stringify(this.weighingLis))
-									this.isShowPrint=true
-									this.weighingList= {
-										grossWeight: 0,
-										tare: 0,
-										tips:'',
-											// contractNo:'',
-											// inOutTaskNo:'',
-										buckleMiscellaneous: 0,
-										netWeight: 0,
-										receivableWeighingFee: '',
-										warehouseInOutDetail: {
-											grade:'',
-											imperfectGrain:'',
-											impurity:'',
-											jiaorenli:'',
-											bulkDensity:'',
-											mildewGrain:'',
-										},
-										qualityInspectionManagement: {
-											boxNo: "暂无",
-											boxNoOther: "暂无",
-											titleNo: "暂无",
-											titleNoOther: "暂无",
-										}
-									}
-								})
-							})
-						})
-						.catch((response) => {
-							this.$notify.warning(response)
-						})
-					}else{
-						this.weighingList.relationId = this.relationId
-						this.weighingList.warehouseId = this.warehouseId
-						this.weighingList.baseId=this.warehouseId
-						console.log(this.weighingList)
-						addstorageputList(this.weighingList)
-						.toPromise()
-						.then((response) => {
-						this.weighingList.warehouseInOutId=response
-						tareAdd(this.weighingList)
-						.toPromise()
-						.then((response) => {
-							getweighing({id:response})
-								.toPromise()
-								.then((response) => {
-									this.weighingList=response
-									this.warehouseCount+=1
-									this.weighingList.grossWeight=this.weighingList.grossWeight*1000
-									this.weighingList.tare=this.weighingList.tare*1000
-									this.weighingList.netWeight=this.weighingList.netWeight*1000
-									this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
-									this.inspect=JSON.parse(JSON.stringify(this.weighingList))
-									this.isShowPrint=true
-									
-								})
-						
-							if (this.reader) {
-									this.reader.cancel()
-									}
-									this.$notify.success({
-										title: '成功',
-										message: '提交成功',
-									})
-									this.getList()
-									this.weighingList= {
-										grossWeight: 0,
-										tare: 0,
-										tips:'',
-											// contractNo:'',
-											// inOutTaskNo:'',
-										buckleMiscellaneous: 0,
-										netWeight: 0,
-										receivableWeighingFee: '',
-										warehouseInOutDetail: {
-											grade:'',
-											imperfectGrain:'',
-											impurity:'',
-											jiaorenli:'',
-											bulkDensity:'',
-											mildewGrain:'',
-										},
-										qualityInspectionManagement: {
-											boxNo: "暂无",
-											boxNoOther: "暂无",
-											titleNo: "暂无",
-											titleNoOther: "暂无",
-										}
-									}
-						// 	if (this.reader) {
-						// 		this.reader.cancel()
-						// 	}
-						// 	this.$notify.success({
-						// 	title: '成功',
-						// 	message: '提交成功',
-						// })
-						// 	this.isShowPrint=true
-						// 	this.weighingList.grossWeight=this.weighingList.grossWeight*1000
-						// 	this.weighingList.tare=this.weighingList.tare*1000
-						// 	this.weighingList.netWeight=this.weighingList.netWeight*1000
-						// 	this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
-						// 	this.inspect=JSON.parse(JSON.stringify(this.weighingList))
-						// 	this.weighingList= {
-						// 		grossWeight: 0,
-						// 		tare: 0,
-						// 		tips:'',
-						// 			// contractNo:'',
-						// 			// inOutTaskNo:'',
-						// 		buckleMiscellaneous: 0,
-						// 		netWeight: 0,
-						// 		receivableWeighingFee: '',
-						// 		warehouseInOutDetail: {
-						// 			grade:'',
-						// 			imperfectGrain:'',
-						// 			impurity:'',
-						// 			jiaorenli:'',
-						// 			bulkDensity:'',
-						// 			mildewGrain:'',
-						// 		},
-						// 		qualityInspectionManagement: {
-						// 			boxNo: "暂无",
-						// 			boxNoOther: "暂无",
-						// 			titleNo: "暂无",
-						// 			titleNoOther: "暂无",
-						// 		}
-						// 	}
-						
-						})
-						
-					})
-					.catch((response) => {})
-					}
-				} else if (this.tpyeNo == 2) {
-					this.weighingList.secretaryWeigher = localStorage.getItem('ws-pf_staffName')
-					this.weighingList.warehouseId = this.warehouseId
-					this.weighingList.baseId=this.warehouseId
-					addstorageputList(this.weighingList).toPromise()
-					.then((response) => {
-						this.weighingList.warehouseInOutId=response
-						grossWeight(this.weighingList)
-						.toPromise()
-						.then((response) => {
-								if (this.reader) {
-									this.reader.cancel()
-								}
-								this.$notify.success({
-								title: '成功',
-								message: '提交成功',
-							})
-							this.weighingList.grossWeight=this.weighingList.grossWeight*1000
-							this.weighingList.tare=this.weighingList.tare*1000
-							this.weighingList.netWeight=this.weighingList.netWeight*1000
-							this.weighingList.buckleMiscellaneous=this.weighingList.buckleMiscellaneous*1000
-								this.inspect=JSON.parse(JSON.stringify(this.weighingList))
-								this.isShowPrint=true
-								this.weighingList= {
-									grossWeight: 0,
-									selfLoading:0,
-									tare: 0,
-									tips:'',
-										// contractNo:'',
-										// inOutTaskNo:'',
-									buckleMiscellaneous: 0,
-									netWeight: 0,
-									receivableWeighingFee: '',
-									warehouseInOutDetail: {
-										grade:'',
-										imperfectGrain:'',
-										impurity:'',
-										jiaorenli:'',
-										bulkDensity:'',
-										mildewGrain:'',
-									},
-									qualityInspectionManagement: {
-										boxNo: "暂无",
-										boxNoOther: "暂无",
-										titleNo: "暂无",
-										titleNoOther: "暂无",
-									}
-								}
-								this.getList()
-							})
-						})
-						.catch((response) => {})
-				}
-			})
-			.catch(() => {return false})
-		},
-		carNoTypeChange() {
-			this.carjudge = !this.carjudge
-			if (this.carjudge) {
-			this.weighingList.selfLoading = '1'
-			this.carChange1 = '识别下拉'
-			} else {
-			this.weighingList.selfLoading = '0'
-			this.carChange1 = '手动填写'
-			}
-		},
-		tabClick(val){
-			this.weighingList = []
-			this.index = val
-			// this.disabled=true
-			if (val == 0) {
-				this.statusType='3'
-				this.information = '皮重'
-				this.tpyeNo = '1'
-			} else {
-				this.statusType = 3
-				this.tpyeNo = '2'
-				this.information = '毛重'
-			}
-			this.getList()
-		},
-			warehouseNameChange(e) {
-				for (let i = 0; i < this.warehouseList.length; i++) {
-				if (this.warehouseList[i].value == e) {
-					this.warehouseId = this.warehouseList[i].warehouseId
-				}
-				}
-				for (let i = 0; i < this.warehouseList1.length; i++) {
-					if(this.warehouseList1[i].warehouseName==e){
-						localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
-							No:this.warehouseList1[i].commonWarehouseNo,
-							allowEdit:this.warehouseList1[i].allowEdit,
-							value:this.warehouseList1[i].warehouseName,
-							count:this.warehouseList1[i].count,
-							warehouseId:this.warehouseList1[i].id
-						}))
-							if(	this.warehouseList1[i].allowEdit == 1){
-			this.disabled = false
-		}else{
-			this.disabled = true
-		}
-						this.positionInfos=this.warehouseList1[i].positionInfos
-						this.warehouseCount = this.warehouseList1[i].count
-                  		this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
-						  this.warehouseType=this.warehouseList1[i].warehouseType
-					}
-				}
-				this.getList()
-				this.weighingList= {
-					grossWeight: 0,
-					selfLoading:0,
-					tare: 0,
-					tips:'',
-					// contractNo:'',
-					// inOutTaskNo:'',
-					buckleMiscellaneous: 0,
-					netWeight: 0,
-					receivableWeighingFee: '',
-					warehouseInOutDetail: {
-						grade:'',
-						imperfectGrain:'',
-						impurity:'',
-						jiaorenli:'',
-						bulkDensity:'',
-						mildewGrain:'',
-					},
-					qualityInspectionManagement: {
-						boxNo: "暂无",
-						boxNoOther: "暂无",
-						titleNo: "暂无",
-						titleNoOther: "暂无",
-					}
-				}
-			},
-			async openPort(){
-			 console.log('openPort', navigator)
-        if ('serial' in navigator) {
+        .catch(() => {
+          return false
+        })
+    },
+    carNoTypeChange() {
+      this.carjudge = !this.carjudge
+      if (this.carjudge) {
+        this.weighingList.selfLoading = '1'
+        this.carChange1 = '识别下拉'
+      } else {
+        this.weighingList.selfLoading = '0'
+        this.carChange1 = '手动填写'
+      }
+    },
+    tabClick(val) {
+      this.weighingList = []
+      this.index = val
+      // this.disabled=true
+      if (val == 0) {
+        this.statusType = '3'
+        this.information = '皮重'
+        this.tpyeNo = '1'
+      } else {
+        this.statusType = 3
+        this.tpyeNo = '2'
+        this.information = '毛重'
+      }
+      this.getList()
+    },
+    warehouseNameChange(e) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].value == e) {
+          this.warehouseId = this.warehouseList[i].warehouseId
+        }
+      }
+      for (let i = 0; i < this.warehouseList1.length; i++) {
+        if (this.warehouseList1[i].warehouseName == e) {
+          localStorage.setItem(
+            'houseSelfCollect_house1',
+            JSON.stringify({
+              No: this.warehouseList1[i].commonWarehouseNo,
+              allowEdit: this.warehouseList1[i].allowEdit,
+              value: this.warehouseList1[i].warehouseName,
+              count: this.warehouseList1[i].count,
+              warehouseId: this.warehouseList1[i].id,
+            })
+          )
+          if (this.warehouseList1[i].allowEdit == 1) {
+            this.disabled = false
+          } else {
+            this.disabled = true
+          }
+          this.positionInfos = this.warehouseList1[i].positionInfos
+          this.warehouseCount = this.warehouseList1[i].count
+          this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
+          this.warehouseType = this.warehouseList1[i].warehouseType
+        }
+      }
+      this.getList()
+      this.weighingList = {
+        grossWeight: 0,
+        selfLoading: 0,
+        tare: 0,
+        tips: '',
+        // contractNo:'',
+        // inOutTaskNo:'',
+        buckleMiscellaneous: 0,
+        netWeight: 0,
+        receivableWeighingFee: '',
+        warehouseInOutDetail: {
+          grade: '',
+          imperfectGrain: '',
+          impurity: '',
+          jiaorenli: '',
+          bulkDensity: '',
+          mildewGrain: '',
+        },
+        qualityInspectionManagement: {
+          boxNo: '暂无',
+          boxNoOther: '暂无',
+          titleNo: '暂无',
+          titleNoOther: '暂无',
+        },
+      }
+    },
+    async openPort() {
+      console.log('openPort', navigator)
+      if ('serial' in navigator) {
         //   if (!this.$store.state.app.reader) {
-            // The Web Serial API is supported.
-            console.log('the Web Serial API is supported.')
-            console.log(this.param)
-            const port = await navigator.serial.requestPort()
-            await port.open({
-              baudRate: this.param,
-            }) // set baud rate
-            this.reader = port.readable.getReader()
-            console.log('beforeReader', port)
-            console.log('beforeReader', this.reader)
-            this.$store.dispatch('app/setReader', this.reader)
+        // The Web Serial API is supported.
+        console.log('the Web Serial API is supported.')
+        console.log(this.param)
+        const port = await navigator.serial.requestPort()
+        await port.open({
+          baudRate: this.param,
+        }) // set baud rate
+        this.reader = port.readable.getReader()
+        console.log('beforeReader', port)
+        console.log('beforeReader', this.reader)
+        this.$store.dispatch('app/setReader', this.reader)
         //   } else {
         //     console.log('afterport', this.$store.state.app.reader)
         //     this.reader = this.$store.state.app.reader
         //   }
-				// 监听来自串行设备的数据
-				while (true) {
-				const { value, done } = await this.reader.read();
-				// console.log("value",value);
-				if (done) {
-					// 允许稍后关闭串口。
-					this.reader.releaseLock();
-					break;
-				}
-				var result='';
-				//2。获取16进制字符串
-				// var receData = HexConvert.ByteToString(value);
-				// console.log("receData",receData);
-				var flag = false;
-				// for(var i=0;i<value.length;i++){
-				// 	var tmp = String.fromCharCode(value[i])
-				// 	if(tmp == '+'){
-				// 	flag = true
-				// 	}
-				// 	if(flag && result.length <6 && tmp != '+'){
-				// 	result += tmp
-				// 	}
-				// }
-				// if(this.tpyeNo != 2){
-				// 	this.weighingList.grossWeight = parseInt(result)
-				// }
-				// else{
-				// 	this.weighingList.tare = parseInt(result) 
-				// }
-				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库'
-				||this.warehouseName == '龙江金信库'){
-					for (var i = 0; i < value.length; i++) {
-						var tmp = String.fromCharCode(value[i])
-						if (tmp == '+') {
-						flag = true
-						}
-						if (flag && result.length < 6 && tmp != '+') {
-						result += tmp
-						}
-					}
-					if (this.tpyeNo != 2) {
-						if(parseInt(result)|| parseInt(result) == 0){
-							this.weighingList.weight = parseInt(result)
-						}
-					} else {
-						if(parseInt(result)|| parseInt(result) == 0){
-							this.weighingList.weight = parseInt(result)
-						}
-					}
-				}
-				else if (this.warehouseName && (this.warehouseName == '顺诚粮库'||this.warehouseName == '鲅鱼圈金信库')) {
-					for (var i = value.length - 1; i >= 0; i--) {
-						var tmp = String.fromCharCode(value[i])
-						console.log(tmp)
-						if (String.fromCharCode(value[0]) == '.') {
-						flag = true
-						}
-						if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
-						result += tmp
-						}
-					}
-					if (this.tpyeNo != 2) {
-						if (parseInt(result) || parseInt(result) == 0) {
-							this.weighingList.weight = parseInt(result)
-						}
-					} else {
-						if (parseInt(result) || parseInt(result) == 0) {
-							this.weighingList.weight = parseInt(result)
-						}
-					}
-				}
-				else{
-					for(var i=0;i<value.length;i++){
-						var tmp = String.fromCharCode(value[i])
-						if(value[0] != 49 && value[0] != 2){
-						break
-						}
-						if (tmp == String.fromCharCode(32) ) {
-						flag = true
-						}
-						if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
-						// if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
-						// 	continue
-						// }
-						// if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
-						// 	continue
-						// }
-						result += tmp
-						}
-					}
-					if (this.tpyeNo != 2) {
-						if(parseInt(result)|| parseInt(result) == 0){
-						this.weighingList.weight = parseInt(result)*100
-						}
-					} else {
-						if(parseInt(result)|| parseInt(result) == 0){
-						this.weighingList.weight = parseInt(result)*100
-						}
-					}
-				}
-				// setTimeout(1000)
-				// value 是一个 Uint8Array
-				}
-				await port.close();
-			}
-			else{
-				console.log('the Web Serial API is not supported.',navigator);
-			}
-			},
-			find() {
-				this.getList()
-			},
-			calculation() {
-				if (this.weighingList.grossWeight && this.weighingList.tare) {
-					let count = 0
-					this.weighingList.netWeight = this.weighingList.grossWeight -  this.weighingList.tare - Number(this.weighingList.buckleMiscellaneous ? this.weighingList.buckleMiscellaneous : 0)
-				}
-			},
-			carChange(e) {
-				for (let i = 0; i < this.tranCarInfoList.length; i++) {
-					if (this.tranCarInfoList[i].carNo == this.weighingList.carNo) {
-						this.weighingList.carNumber =this.tranCarInfoList[i].carNo
-						this.weighingList.tranCarNo = this.tranCarInfoList[i].tranCarNo
-						this.weighingList.carId = this.tranCarInfoList[i].id
-					}
-				}
-			},
-			// 获取当前年月日
-			getTime(){
-				var date= new Date()
-				var mouth=date.getMonth()+1
-				var day=date.getDate()
-				if(mouth<10){
-					mouth='0'+mouth
-				}
-				if(day<10){
-					day='0'+day
-				}
-				return date.getFullYear()+mouth+date.getDate()
-			},
-			contractNoChange(e){
-				for (let i = 0; i < this.taskNolist.length; i++) {
-					if (this.taskNolist[i].inOutTaskNo == e) {
-						var data = this.taskNolist[i]
-						if (this.taskNolist[i].contractNo) {
-							// console.log(this.taskNolist[i])
-						this.weighingList.contractNo = this.taskNolist[i].contractNo
-						} else {
-						this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
-						}
-					}
-				}
-				if (!data) return
-				for (var i = 0; i < this.outContractNo.length; i++) {
-					if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
-						this.weighingList.goodsName = this.outContractNo[i].goodsName
-						this.weighingList.goodsName = this.outContractNo[i].goodsName
-						if (this.weighingList.goodsName == '玉米(潮粮)') {
-							this.weighingList.type = '潮粮'
-						} else {
-							this.weighingList.type = '干粮'
-						}
-						this.weighingList.goodsNameKey = this.outContractNo[i].goodsNameKey
-						this.weighingList.grade = this.outContractNo[i].grade
-						this.weighingList.inOutType = this.outContractNo[i].inOutType
-					if (this.outContractNo[i].inOutType == '销售出库') {
-						this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-						this.weighingList.number='XSCK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
-						this.weighingList.buyer = this.outContractNo[i].buyer
-						this.weighingList.seller = localStorage.getItem('ws-pf_compName')
-						if (!this.outContractNo[i].unitContractPrice) {
-							this.weighingList.tips ='买方' +this.outContractNo[i].buyer
-						} else {
-							this.weighingList.tips ='买方' +
-							this.outContractNo[i].buyer +'( ' +this.outContractNo[i].unitContractPrice +'元/吨)'
-						}
-						this.weighingList.inOutTypeKey = 1
-					} else if (this.outContractNo[i].inOutType == '移库出库') {
-						this.warehouseCount = '000' + Number(this.warehouseCount + 1)
-						this.weighingList.number='YKCK'+this.getTime()+this.warehouseNo+this.warehouseCount.substring(this.warehouseCount.length - 4)
-						this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
-						this.weighingList.seller = this.outContractNo[i].sendWarehouse
-						this.weighingList.goodsName = data.goodsName
-						this.weighingList.goodsNameKey = data.goodsNameKey
-						this.weighingList.grade = data.grade
-						if (this.outContractNo[i].unitContractPrice) {
-							this.weighingList.tips ='入货库' +data.receiveWarehouse +'( ' +this.outContractNo[i].unitContractPrice +'元/吨)'
-						} else {
-							this.weighingList.tips = '入货库' + data.receiveWarehouse
-						}
-						this.weighingList.inOutTypeKey = 3
-					} else if (this.outContractNo[i].inOutType == '暂存入库') {
-						this.weighingList.inOutTypeKey = 4
-					} else if (this.outContractNo[i].inOutType == '贸易服务出库') {
-						this.weighingList.inOutTypeKey = 5
-					} else if (this.outContractNo[i].inOutType == '采购出库') {
-						this.weighingList.inOutTypeKey = 6
-					}
-					if (this.outContractNo[i].deliverType == '1') {
-						this.carstatus = true
-					} else {
-						this.carstatus = false
-					}
-					if (this.outContractNo[i].tranCarInfoList) {
-						this.options2 = this.outContractNo[i].tranCarInfoList
-						this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
-						this.carstatus = true
-					}
-					if(this.outContractNo[i].tranCarInfoList1){
-						this.fleetNameList=this.outContractNo[i].tranCarInfoList1
-					}
-				}
-				}
-			},
-			selectWarehouse() {
-				selectWarehouseSelf({
-					compId: localStorage.getItem('ws-pf_compId'),
-				})
-				.toPromise()
-				.then((response) => {
-					this.warehouseList = []
-					for (let i = 0; i < response.length; i++) {
-					this.warehouseList.push({
-						value: response[i].warehouseName,
-						warehouseId: response[i].id,
-					})
-					}
-					let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
-					_wareHouse = JSON.parse(_wareHouse)
-					for (let i = 0; i < response.length; i++) {
-						if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
-							this.warehouseName = response[i].warehouseName
-							this.warehouseId = response[i].id
-							this.positionInfos=response[i].positionInfos
-							this.warehouseCount = response[i].count
-							this.warehouseNo = response[i].commonWarehouseNo
-							this.warehouseType=response[i].warehouseType
-							if( response[i].allowEdit == 1){
-								this.disabled = false
-							}else{
-								this.disabled = true
-							}
-						}
-						if (!_wareHouse) {
-							this.warehouseName = this.warehouseList[0].value
-							this.warehouseId = this.warehouseList[0].warehouseId
-							this.positionInfos=response[0].positionInfos
-							this.warehouseCount = response[0].count
-							this.warehouseNo = response[0].commonWarehouseNo
-							this.warehouseType=response[0].warehouseType
-						}
-					}
-					this.warehouseList1=response
-					
-					this.getList()
-				})
-			},
-			getList() {
-				// pullDown({
-				// 	constId: 'CON6',
-				// })
-				// .toPromise()
-				// .then((response) => {
-				// 	this.storageType = response
-				// })
-				getReceiptTaskNo({
-					flag: 1,
-					warehouseName: this.warehouseName,
-					agentKey: localStorage.getItem('ws-pf_userId'),
-				})
-				.toPromise()
-				.then((response) => {
-					this.taskNolist = response
-				})
-				//合同编号
-				xialaNo({
-					compId: localStorage.getItem('ws-pf_compId'),
-					flag: 5,
-				})
-				.toPromise()
-				.then((response) => {
-					this.outContractNo = response
-				})
-				getweighingList({
-					compId: localStorage.getItem('ws-pf_compId'),
-					currentPage: this.currentPage,
-					pageSize: this.pageSize,
-					searchKeyWord: this.searchKeyWord,
-					warehouseName: this.warehouseName,
-					managementType: 3,
-					statusType:this.statusType
-				})
-				.toPromise()
-				.then((response) => {
-					this.deliveryList = response.records
-					this.deptBudgetTotal = response.total
-					for (var i = 0; i < response.records.length; i++) {
-					if (response.records[i].addressUrl != null) {
-						if (response.records[i].addressUrl) {
-						response.records[i].addressUrlArray = response.records[i].addressUrl.split(',')
-						}
-					} else {
-						response.records[i].addressUrlArray = []
-					}
-					}
-					for (var i = 0; i < response.records.length; i++) {
-					var arr = new Array()
-					this.addressUrls[i] = new Array()
-					if (this.weighingList.records[i].addressUrl !=
-						null) {
-						arr = this.weighingList.records[i].addressUrl.split(',')
-						this.addressUrls[i] = arr
-					}
-					}
-				})
-				.catch((response) => {
+        // 监听来自串行设备的数据
+        while (true) {
+          const { value, done } = await this.reader.read()
+          // console.log("value",value);
+          if (done) {
+            // 允许稍后关闭串口。
+            this.reader.releaseLock()
+            break
+          }
+          var result = ''
+          //2。获取16进制字符串
+          // var receData = HexConvert.ByteToString(value);
+          // console.log("receData",receData);
+          var flag = false
+          // for(var i=0;i<value.length;i++){
+          // 	var tmp = String.fromCharCode(value[i])
+          // 	if(tmp == '+'){
+          // 	flag = true
+          // 	}
+          // 	if(flag && result.length <6 && tmp != '+'){
+          // 	result += tmp
+          // 	}
+          // }
+          // if(this.tpyeNo != 2){
+          // 	this.weighingList.grossWeight = parseInt(result)
+          // }
+          // else{
+          // 	this.weighingList.tare = parseInt(result)
+          // }
+          if (
+            (this.warehouseName &&
+              (this.warehouseName == '山东诸城迈饶库' ||
+                this.warehouseName == '克东千红库')) ||
+            this.warehouseName == '鲅鱼圈祥腾库' ||
+            this.warehouseName == '哈尔滨依兰库' ||
+            this.warehouseName == '龙江金信库'
+          ) {
+            for (var i = 0; i < value.length; i++) {
+              var tmp = String.fromCharCode(value[i])
+              if (tmp == '+') {
+                flag = true
+              }
+              if (flag && result.length < 6 && tmp != '+') {
+                result += tmp
+              }
+            }
+            if (this.tpyeNo != 2) {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result)
+              }
+            } else {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result)
+              }
+            }
+          } else if (
+            this.warehouseName &&
+            (this.warehouseName == '顺诚粮库' ||
+              this.warehouseName == '鲅鱼圈金信库')
+          ) {
+            for (var i = value.length - 1; i >= 0; i--) {
+              var tmp = String.fromCharCode(value[i])
+              console.log(tmp)
+              if (String.fromCharCode(value[0]) == '.') {
+                flag = true
+              }
+              if (flag && result.length < 9 && tmp != '=' && tmp != '.') {
+                result += tmp
+              }
+            }
+            if (this.tpyeNo != 2) {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result)
+              }
+            } else {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result)
+              }
+            }
+          } else {
+            for (var i = 0; i < value.length; i++) {
+              var tmp = String.fromCharCode(value[i])
+              if (value[0] != 49 && value[0] != 2) {
+                break
+              }
+              if (tmp == String.fromCharCode(32)) {
+                flag = true
+              }
+              if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
+                // if(i-1 >=0 &&tmp == String.fromCharCode(48) && value[i-1] == 32){
+                // 	continue
+                // }
+                // if(i-2 >=0 &&tmp == String.fromCharCode(48) && value[i-2] == 32){
+                // 	continue
+                // }
+                result += tmp
+              }
+            }
+            if (this.tpyeNo != 2) {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result) * 100
+              }
+            } else {
+              if (parseInt(result) || parseInt(result) == 0) {
+                this.weighingList.weight = parseInt(result) * 100
+              }
+            }
+          }
+          // setTimeout(1000)
+          // value 是一个 Uint8Array
+        }
+        await port.close()
+      } else {
+        console.log('the Web Serial API is not supported.', navigator)
+      }
+    },
+    find() {
+      this.getList()
+    },
+    calculation() {
+      if (this.weighingList.grossWeight && this.weighingList.tare) {
+        let count = 0
+        this.weighingList.netWeight =
+          this.weighingList.grossWeight -
+          this.weighingList.tare -
+          Number(
+            this.weighingList.buckleMiscellaneous
+              ? this.weighingList.buckleMiscellaneous
+              : 0
+          )
+      }
+    },
+    carChange(e) {
+      for (let i = 0; i < this.tranCarInfoList.length; i++) {
+        if (this.tranCarInfoList[i].carNo == this.weighingList.carNo) {
+          this.weighingList.carNumber = this.tranCarInfoList[i].carNo
+          this.weighingList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+          this.weighingList.carId = this.tranCarInfoList[i].id
+        }
+      }
+    },
+    // 获取当前年月日
+    getTime() {
+      var date = new Date()
+      var mouth = date.getMonth() + 1
+      var day = date.getDate()
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (day < 10) {
+        day = '0' + day
+      }
+      return date.getFullYear() + mouth + date.getDate()
+    },
+    contractNoChange(e) {
+      for (let i = 0; i < this.taskNolist.length; i++) {
+        if (this.taskNolist[i].inOutTaskNo == e) {
+          var data = this.taskNolist[i]
+          if (this.taskNolist[i].contractNo) {
+            // console.log(this.taskNolist[i])
+            this.weighingList.contractNo = this.taskNolist[i].contractNo
+          } else {
+            this.weighingList.contractNo = this.taskNolist[i].moveTaskNo
+          }
+        }
+      }
+      if (!data) return
+      for (var i = 0; i < this.outContractNo.length; i++) {
+        if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
+          this.weighingList.goodsName = this.outContractNo[i].goodsName
+          this.weighingList.goodsName = this.outContractNo[i].goodsName
+          if (this.weighingList.goodsName == '玉米(潮粮)') {
+            this.weighingList.type = '潮粮'
+          } else {
+            this.weighingList.type = '干粮'
+          }
+          this.weighingList.goodsNameKey = this.outContractNo[i].goodsNameKey
+          this.weighingList.grade = this.outContractNo[i].grade
+          this.weighingList.inOutType = this.outContractNo[i].inOutType
+          if (this.outContractNo[i].inOutType == '销售出库') {
+            this.warehouseCount = '000' + Number(this.warehouseCount + 1)
+            this.weighingList.number =
+              'XSCK' +
+              this.getTime() +
+              this.warehouseNo +
+              this.warehouseCount.substring(this.warehouseCount.length - 4)
+            this.weighingList.buyer = this.outContractNo[i].buyer
+            this.weighingList.seller = localStorage.getItem('ws-pf_compName')
+            if (!this.outContractNo[i].unitContractPrice) {
+              this.weighingList.tips = '买方' + this.outContractNo[i].buyer
+            } else {
+              this.weighingList.tips =
+                '买方' +
+                this.outContractNo[i].buyer +
+                '( ' +
+                this.outContractNo[i].unitContractPrice +
+                '元/吨)'
+            }
+            this.weighingList.inOutTypeKey = 1
+          } else if (this.outContractNo[i].inOutType == '移库出库') {
+            this.warehouseCount = '000' + Number(this.warehouseCount + 1)
+            this.weighingList.number =
+              'YKCK' +
+              this.getTime() +
+              this.warehouseNo +
+              this.warehouseCount.substring(this.warehouseCount.length - 4)
+            this.weighingList.buyer = this.outContractNo[i].receiveWarehouse
+            this.weighingList.seller = this.outContractNo[i].sendWarehouse
+            this.weighingList.goodsName = data.goodsName
+            this.weighingList.goodsNameKey = data.goodsNameKey
+            this.weighingList.grade = data.grade
+            if (this.outContractNo[i].unitContractPrice) {
+              this.weighingList.tips =
+                '入货库' +
+                data.receiveWarehouse +
+                '( ' +
+                this.outContractNo[i].unitContractPrice +
+                '元/吨)'
+            } else {
+              this.weighingList.tips = '入货库' + data.receiveWarehouse
+            }
+            this.weighingList.inOutTypeKey = 3
+          } else if (this.outContractNo[i].inOutType == '暂存入库') {
+            this.weighingList.inOutTypeKey = 4
+          } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
+            this.weighingList.inOutTypeKey = 5
+          } else if (this.outContractNo[i].inOutType == '采购出库') {
+            this.weighingList.inOutTypeKey = 6
+          }
+          if (this.outContractNo[i].deliverType == '1') {
+            this.carstatus = true
+          } else {
+            this.carstatus = false
+          }
+          if (this.outContractNo[i].tranCarInfoList) {
+            this.options2 = this.outContractNo[i].tranCarInfoList
+            this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+            this.carstatus = true
+          }
+          if (this.outContractNo[i].tranCarInfoList1) {
+            this.fleetNameList = this.outContractNo[i].tranCarInfoList1
+          }
+        }
+      }
+    },
+    selectWarehouse() {
+      selectWarehouseSelf({
+        compId: localStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = []
+          for (let i = 0; i < response.length; i++) {
+            this.warehouseList.push({
+              value: response[i].warehouseName,
+              warehouseId: response[i].id,
+            })
+          }
+          let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+          _wareHouse = JSON.parse(_wareHouse)
+          for (let i = 0; i < response.length; i++) {
+            if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+              this.warehouseName = response[i].warehouseName
+              this.warehouseId = response[i].id
+              this.positionInfos = response[i].positionInfos
+              this.warehouseCount = response[i].count
+              this.warehouseNo = response[i].commonWarehouseNo
+              this.warehouseType = response[i].warehouseType
+              if (response[i].allowEdit == 1) {
+                this.disabled = false
+              } else {
+                this.disabled = true
+              }
+            }
+            if (!_wareHouse) {
+              this.warehouseName = this.warehouseList[0].value
+              this.warehouseId = this.warehouseList[0].warehouseId
+              this.positionInfos = response[0].positionInfos
+              this.warehouseCount = response[0].count
+              this.warehouseNo = response[0].commonWarehouseNo
+              this.warehouseType = response[0].warehouseType
+            }
+          }
+          this.warehouseList1 = response
 
-				})
-			},
-		},
-	}
+          this.getList()
+        })
+    },
+    getList() {
+      // pullDown({
+      // 	constId: 'CON6',
+      // })
+      // .toPromise()
+      // .then((response) => {
+      // 	this.storageType = response
+      // })
+      getReceiptTaskNo({
+        flag: 1,
+        warehouseName: this.warehouseName,
+        agentKey: localStorage.getItem('ws-pf_userId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.taskNolist = response
+        })
+      //合同编号
+      xialaNo({
+        compId: localStorage.getItem('ws-pf_compId'),
+        flag: 5,
+      })
+        .toPromise()
+        .then((response) => {
+          this.outContractNo = response
+        })
+      getweighingList({
+        compId: localStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        warehouseName: this.warehouseName,
+        managementType: 3,
+        statusType: this.statusType,
+      })
+        .toPromise()
+        .then((response) => {
+          this.deliveryList = response.records
+          this.deptBudgetTotal = response.total
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              if (response.records[i].addressUrl) {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+              }
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
+          for (var i = 0; i < response.records.length; i++) {
+            var arr = new Array()
+            this.addressUrls[i] = new Array()
+            if (this.weighingList.records[i].addressUrl != null) {
+              arr = this.weighingList.records[i].addressUrl.split(',')
+              this.addressUrls[i] = arr
+            }
+          }
+        })
+        .catch((response) => {})
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
-	.center {
-		background: #fff;
-	}
+.center {
+  background: #fff;
+}
 
-	.ws-info-table {
-		border: none;
-	}
-	.base_header_layout{
-		padding:10px;
-		margin-bottom:10px;
-	}
-	.ws-info-table .el-form-item {
-		width: 50%;
-		border: none;
-	}
+.ws-info-table {
+  border: none;
+}
+.base_header_layout {
+  padding: 10px;
+  margin-bottom: 10px;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
 
-	.formItem {
-		width: 100%;
-		display: inline;
-	}
+.formItem {
+  width: 100%;
+  display: inline;
+}
 
-	.ws-info-table {
-    border: none;
-  }
+.ws-info-table {
+  border: none;
+}
 
-  .ws-info-table .el-form-item {
-    width: 100%;
-    border: none;
-  }
+.ws-info-table .el-form-item {
+  width: 100%;
+  border: none;
+}
 
-  /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 30%;
-    text-align: center;
-    background: #ffffff;
-    color: #8890b1;
-  }
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
 
-  /deep/.ws-info-table .el-form-item .el-form-item__content {
-    border: none;
-  }
-  /deep/.el-textarea__inner{
-    width:92%;
-  }
-  /deep/.ws-info-table .el-form-item.rememo .el-form-item__content{
-  height:76px;
-  }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-textarea__inner {
+  width: 92%;
+}
+/deep/.ws-info-table .el-form-item.rememo .el-form-item__content {
+  height: 76px;
+}
 
-	.title {
-		font-size: 16px;
-		font-weight: 600;
-		margin: 10px;
-	}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
+}
 
-	.titleup {
-		position: relative;
-	}
+.titleup {
+  position: relative;
+}
 
-	.title::before {
-		content: '';
-		display: inline-block;
-		width: 5px;
-		height: 15px;
-		background: #8890b1;
-		margin-right: 5px;
-	}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
+}
 
-	.substance {
-		background: #ffffff;
-		width: 100%;
-		border-radius: 4px;
-		margin: 0 auto;
-		padding-top: 20px;
-	}
+.substance {
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
 
-	/deep/.el-table .el-table__header .cell,
-	.el-table .el-table__body .cell {
-		text-align: center;
-	}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
 
-	/deep/.el-table--enable-row-transition .el-table__body td {
-		text-align: center;
-	}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
 
-	.bg-left {
-		padding-left: 30px;
-	}
+.bg-left {
+  padding-left: 30px;
+}
 
-	.bg-right {
-		padding-right: 10px;
-		text-align: right;
-	}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
 
-	.bg-bottom {
-		margin: 15px 0px;
-	}
+.bg-bottom {
+  margin: 15px 0px;
+}
 
-	.titleup {
-		position: relative;
-	}
+.titleup {
+  position: relative;
+}
 
-	/deep/ .substance .bangdan {
-		width: 100%;
-		padding-top: 6%;
-		padding-bottom: 6%;
-	}
+/deep/ .substance .bangdan {
+  width: 100%;
+  padding-top: 6%;
+  padding-bottom: 6%;
+}
 
-	// // .photo2{
-	// //   margin-top: 10px;
-	// // }
-	.el-upload--picture-card {
-		background-color: #fbfdff;
-		border: 1px dashed #c0ccda;
-		border-radius: 6px;
-		box-sizing: border-box;
-		width: 148px;
-		height: 148px;
-		line-height: 146px;
-		vertical-align: top;
-		margin-left: -289px;
-	}
+// // .photo2{
+// //   margin-top: 10px;
+// // }
+.el-upload--picture-card {
+  background-color: #fbfdff;
+  border: 1px dashed #c0ccda;
+  border-radius: 6px;
+  box-sizing: border-box;
+  width: 148px;
+  height: 148px;
+  line-height: 146px;
+  vertical-align: top;
+  margin-left: -289px;
+}
 
-	// .titleup::before {
-	// 	content: '';
-	// 	display: inline-block;
-	// 	width: 5px;
-	// 	height: 30px;
-	// 	background: #5473e8;
-	// 	position: absolute;
-	// 	left: 0;
-	// }
+// .titleup::before {
+// 	content: '';
+// 	display: inline-block;
+// 	width: 5px;
+// 	height: 30px;
+// 	background: #5473e8;
+// 	position: absolute;
+// 	left: 0;
+// }
 
-	.but {
-		text-align: center;
-		margin: 20px auto;
-	}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
 
-	.butCss {
-		opacity: 0;
-		color:#000;
-	}
-	.center{
-		overflow-y:scroll;
-	}
-	.el-button--success.is-plain{
-		border:1px solid #2aff7c;
-		background:black;
-		color:#2aff7c;
-		width:50%;
-	}
-	.top {
-        background: black;
-        color: #2aff7c;
-        font-size: 32px;
-        text-align: right;
-        padding:20px;
-        // border-radius: 10px;
-        margin: 0 20px 20px 20px;
+.butCss {
+  opacity: 0;
+  color: #000;
+}
+.center {
+  overflow-y: scroll;
+}
+.el-button--success.is-plain {
+  border: 1px solid #2aff7c;
+  background: black;
+  color: #2aff7c;
+  width: 50%;
+}
+.top {
+  background: black;
+  color: #2aff7c;
+  font-size: 32px;
+  text-align: right;
+  padding: 20px;
+  // border-radius: 10px;
+  margin: 0 20px 20px 20px;
 
-        .zujian {
-          position: relative;
-        }
+  .zujian {
+    position: relative;
+  }
 
-        .kg-style {
-          font-size: 30px;
-          color: red;
-        }
- 
-        .confirmInfo {
-          display: flex;
-			line-height:90px;
-          .car-type {
-            text-align: left;
-            width: 50%;
-          }
+  .kg-style {
+    font-size: 30px;
+    color: red;
+  }
 
-          .car-no {
-            width: 50%;
-            text-align: right;
-          }
-        }
+  .confirmInfo {
+    display: flex;
+    line-height: 90px;
+    .car-type {
+      text-align: left;
+      width: 50%;
+    }
 
-        .confirmWeight {
-          	display: flex;
-			align-items: center;
-          .titleWeight {
-            width: 35%;
-            text-align: left;
-            line-height: 90px;
-            color: red;
-          }
+    .car-no {
+      width: 50%;
+      text-align: right;
+    }
+  }
 
-          .weight {
-            width: 65%;
-            text-align: right;
-            color: red;
-          }
-        }
-      }
+  .confirmWeight {
+    display: flex;
+    align-items: center;
+    .titleWeight {
+      width: 35%;
+      text-align: left;
+      line-height: 90px;
+      color: red;
+    }
 
-      .bottom {
-        // text-align: center;
-        background: white;
-        margin: 20px 20px 0 20px;
-        // border-radius: 10px;
-        padding-bottom: 20px;
+    .weight {
+      width: 65%;
+      text-align: right;
+      color: red;
+    }
+  }
+}
 
-        .img1,
-        .img2 {
-          width: 200px;
-          padding: 20px;
-        }
+.bottom {
+  // text-align: center;
+  background: white;
+  margin: 20px 20px 0 20px;
+  // border-radius: 10px;
+  padding-bottom: 20px;
 
-        .video-content {
-          width: 100%;
-        }
-        .video1{
-          text-align: center;
-        }
-      }
+  .img1,
+  .img2 {
+    width: 200px;
+    padding: 20px;
+  }
+
+  .video-content {
+    width: 100%;
+  }
+  .video1 {
+    text-align: center;
+  }
+}
 </style>

+ 7 - 2
src/views/outboundManagement/weighingManagementrecord.vue

@@ -336,8 +336,13 @@
                 warehouseId: response[i].id,
               })
             }
-            this.warehouseName = this.warehouseList[0].value
-            this.warehouseId = this.warehouseList[0].warehouseId
+            if(this.$route.query.warehouseName){
+              this.warehouseName = this.$route.query.warehouseName
+            }else{
+                this.warehouseName = response[0].warehouseName
+                this.warehouseId = this.warehouseList[0].warehouseId
+            }
+            
             this.getList()
           })
       },

+ 0 - 1
src/views/profitable/contractOtherMoney.vue

@@ -465,7 +465,6 @@
           })
       },
       audit(num, row) {
-        debugger
         this.formData.addressUrl = ""
         this.formData = {}
         this.$forceUpdate

+ 11 - 7
src/views/warehousenew/warehouseManagementRecord.vue

@@ -61,7 +61,7 @@
             src="../../../public/img/sousuo.png" alt />
         </ws-button>
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
-        <el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="570"
+        <el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
           <el-table-column type="expand">
@@ -182,7 +182,7 @@
           </el-table-column>
 
         </el-table>
-        <el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560"
+        <el-table show-summary :data="warehouseList.records" height="560"
           v-show="this.warehouseType== '2'">
           <el-table-column type="expand">
             <template #default="props">
@@ -347,7 +347,7 @@
         startDate: null,
         endDate: null,
         remark: '',
-        binNumber: '',
+        binNumber: '全部仓位',
         status: 1,
         value2: [],
         appendixIdss: '',
@@ -384,11 +384,11 @@
       this.deptBudgetList.positionId = this.$route.query.positionId
       this.deptBudgetList.warehouseName = this.$route.query.warehouseName
       this.remark = this.$route.query.remark
-      this.binNumber = this.$route.query.binNumber
+      // this.binNumber = this.$route.query.binNumber
       this.capacity = this.$route.query.capacity
       this.warehouseType = this.$route.query.warehouseType
       this.getList()
-      this.getPassYearFormatDate()
+      // this.getPassYearFormatDate()
       this.showType = this.isShow
     },
     updated() {
@@ -435,15 +435,19 @@
       binNumberChange(e) {
         if (e == '全部仓位') {
           this.deptBudgetList.positionId = ''
+          this.getList()
         } else {
           for (let i = 0; i < this.binnumberList.length; i++) {
             if (this.binnumberList[i].binNumber == e) {
               this.deptBudgetList.positionId = this.binnumberList[i].id
             }
           }
+          this.getList()
+          // var seperator1 = "-"
+          // var date = new Date()
       
-          var formatDate = year + seperator1 + month + seperator1 + strDate
-          this.getNowFormatDate(formatDate)
+          // var formatDate = date.getFullYear() + seperator1 + Number(date.getMonth() + 1) + seperator1 + date.getDate()
+          // this.getNowFormatDate(formatDate)
         }
       },
 		/* 获取现在时间,并接受过去时间的值 */