Merge branch 'rukuguanli' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc into rukuguanli

public/static/payprint.html

@@ -282,17 +282,10 @@
                 <tr class="row">
                   <td class="col">{{ printData1[index].goodsName}}</td>
                   <td class="col">{{ printData1[index].type}}</td>
-                  <td class="col">
-                    {{ printData1[index].qualityInspectionManagement.grade}}
-                  </td>
-                  <td class="col">
-                    {{
-                    printData1[index].qualityInspectionManagement.waterContent}}
-                  </td>
-                  <td class="col">
-                    {{ printData1[index].qualityInspectionManagement.impurity}}
-                  </td>
-                  <td class="col">  {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
+                  <td class="col">{{ printData1[index].qualityInspectionManagement.grade}}</td>
+                  <td class="col">{{printData1[index].qualityInspectionManagement.waterContent}}</td>
+                  <td class="col">{{ printData1[index].qualityInspectionManagement.impurity}}</td>
+                  <td class="col">{{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">

public/static/weightCheck.html

@@ -144,10 +144,14 @@
             <div class="number">{{item.number}}</div>
             <table class="table">
               <tr class="row">
-                <td class="col col-bgc">客户姓名</td>
-                <td class="col" colspan="2">{{item.customer}}</td>
-                <td class="col col-bgc">客户电话</td>
-                <td class="col">{{item.customerPhone}}</td>
+                <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户姓名</td>
+                <td class="col" colspan="2" v-if="item.serviceManagementType == 3">{{item.customer}}</td>
+                <td class="col col-bgc" v-if="item.serviceManagementType == 1">发货单位</td>
+                <td class="col" colspan="2" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.seller : ""}}</td>
+                <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户电话</td>
+                <td class="col" v-if="item.serviceManagementType == 3">{{item.customerPhone}}</td>
+                <td class="col col-bgc" v-if="item.serviceManagementType == 1">联系电话</td>
+                <td class="col" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
                 <td class="col col-bgc">车牌号</td>
                 <td class="col" colspan="2">{{item.carNumber}}</td>
               </tr>
@@ -227,7 +231,6 @@
       </div>
       <div v-else>
         <div class="content" v-if="bigContent">
-
           <div class="title">{{tableData.compName}}</div>
           <div class="title">入库检斤单</div>
           <div class="left">
@@ -236,10 +239,14 @@
           <div class="number">{{tableData.number}}</div>
           <table class="table">
             <tr class="row">
-              <td class="col col-bgc">客户姓名</td>
-              <td class="col" colspan="2">{{tableData.customer}}</td>
-              <td class="col col-bgc">客户电话</td>
-              <td class="col">{{tableData.customerPhone}}</td>
+              <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户姓名</td>
+              <td class="col" colspan="2" v-if="tableData.serviceManagementType == 3">{{tableData.customer}}</td>
+              <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">发货单位</td>
+              <td class="col" colspan="2" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</td>
+              <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户电话</td>
+              <td class="col" v-if="tableData.serviceManagementType == 3">{{tableData.customerPhone}}</td>
+              <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">联系电话</td>
+              <td class="col" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</td>
               <td class="col col-bgc">车牌号</td>
               <td class="col" colspan="2">{{tableData.carNumber}}</td>
             </tr>
@@ -290,7 +297,6 @@
               <td class="col col-bgc">净重（公斤）</td>
               <td class="col">{{tableData.netWeight}}</td>
               <td class="col " colspan="2"></td>
-
             </tr>
             <tr class="row">
               <td class="col col-bgc" colspan="2">毛重检斤时间</td>
@@ -324,17 +330,25 @@
         </div>
         <img :src="tableData.codeUrl" alt="" class="small-code">
         <div class="small-row">
-          <div>编号</div>
+          <div>业务编号</div>
           <div>{{tableData.number}}</div>
         </div>
-        <div class="small-row">
+        <div class="small-row" v-if="tableData.serviceManagementType == 3">
           <div>客户姓名</div>
           <div>{{tableData.customer}}</div>
         </div>
-        <div class="small-row">
+        <div class="small-row" v-if="tableData.serviceManagementType == 3">
           <div>客户电话</div>
           <div>{{tableData.customerPhone}}</div>
         </div>
+        <div class="small-row" v-if="tableData.serviceManagementType == 1">
+          <div>发货单位</div>
+          <div>{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</div>
+        </div>
+        <div class="small-row" v-if="tableData.serviceManagementType == 1">
+          <div>联系电话</div>
+          <div>{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</div>
+        </div>
         <div class="small-row">
           <div>车牌号</div>
           <div>{{tableData.carNumber}}</div>
@@ -359,14 +373,6 @@
           <div>类型</div>
           <div>{{tableData.type}}</div>
         </div>
-        <div class="small-row">
-          <div>皮重（公斤）</div>
-          <div>{{tableData.tare}}</div>
-        </div>
-        <div class="small-row">
-          <div>皮检时间</div>
-          <div>{{tableData.tareDate}}</div>
-        </div>
         <div class="small-row">
           <div>毛重（公斤）</div>
           <div>{{tableData.grossWeight}}</div>
@@ -375,11 +381,18 @@
           <div>毛检时间</div>
           <div>{{tableData.grossDate}}</div>
         </div>
-
-        <!-- <div class="small-row">
-          <div>扣杂（公斤）</div>
+        <div class="small-row">
+          <div>皮重（公斤）</div>
+          <div>{{tableData.tare}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮检时间</div>
+          <div>{{tableData.tareDate}}</div>
+        </div>
+        <div class="small-row" v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
+          <div>扣重（公斤）</div>
           <div>{{tableData.buckleMiscellaneous}}</div>
-        </div> -->
+        </div>
         <div class="small-row">
           <div>净重（公斤）</div>
           <div>{{tableData.netWeight}}</div>

src/lang/zh.js

@@ -1034,6 +1034,8 @@ export default {
     inspectionManagementrecord:'质检管理记录',
     paymentManagement: '付款管理',
     weighingManagement: '检斤管理',
+    newWeighingManagement: '新检斤管理',
+    weightCheckRecord: '检斤记录',
     houseSelfCollectPrint: '查看',
     acquisitionManagementAdd: '收购管理',
     acquisitionManagementEdit: '收购管理编辑',
@@ -7454,6 +7456,8 @@ export default {
     inspectionManagementrecord:'质检管理记录',
     paymentManagement: '付款管理',
     weighingManagement: '检斤管理',
+    weighingManagement: '检斤管理',
+    newWeighingManagement: '新检斤管理',
     houseSelfCollect: '收购业务管理',
     houseSelfCollectPrint: '查看',
     customerManagementEdit: '客户管理编辑',

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -77,8 +77,8 @@
         <div class="content" v-for="(item,index) in priceList" :key="index">
           <div class="top">
             <div  class="left">
-              <div v-if="baseInfoForm.paramType == '2' "class="text">基准单价（元/公斤）</div>
-              <el-input v-if="baseInfoForm.paramType == '2' "type="number" @mousewheel.native.prevent v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
+              <div v-if="baseInfoForm.paramType == '2' " class="text">基准单价（元/公斤）</div>
+              <el-input v-if="baseInfoForm.paramType == '2' " type="number" @mousewheel.native.prevent v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
             </div>
             <el-button @click="delSetPrice(item,index)" :disabled="!isEdit">删除</el-button>
           </div>

src/views/houseSelfCollect/component/routers/route.js

@@ -196,6 +196,35 @@ const houseSelfCollectRouter = {
       },
       hidden: true
     },
+    // 新检斤管理
+    {
+      path: 'newWeighingManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
+      name: 'newWeighingManagement',
+      meta: {
+        title: 'newWeighingManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'acquisitionManagement.acquisitionWeight.view',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    // 记录
+    {
+      path: 'weightCheckRecord',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
+      name: 'weightCheckRecord',
+      meta: {
+        title: 'weightCheckRecord',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'acquisitionManagement.acquisitionWeight.view',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
   ],
 
 };

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -4,10 +4,14 @@
         <div class="number">{{tableData.number}}</div>
         <table class="table">
           <tr class="row">
-            <td class="col col-bgc">客户姓名</td>
-            <td class="col" colspan="2">{{tableData.customer}}</td>
-            <td class="col col-bgc">客户电话</td>
-            <td class="col" >{{tableData.customerPhone}}</td>
+            <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户姓名</td>
+            <td class="col" colspan="2" v-if="tableData.serviceManagementType == 3">{{tableData.customer}}</td>
+            <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">发货单位</td>
+            <td class="col" colspan="2" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</td>
+            <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户电话</td>
+            <td class="col" v-if="tableData.serviceManagementType == 3">{{tableData.customerPhone}}</td>
+            <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">联系电话</td>
+            <td class="col" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</td>
             <td class="col col-bgc">车牌号</td>
             <td class="col" colspan="2">{{tableData.carNumber}}</td>
           </tr>
@@ -52,6 +56,8 @@
             <td class="col col-bgc">皮重（公斤）</td>
             <td class="col">{{tableData.tare}}</td>
             <!-- <td class="col " colspan="2"></td> -->
+             <td class="col col-bgc">扣重（公斤）</td>
+            <td class="col">{{tableData.buckleMiscellaneous}}</td>
             <td class="col col-bgc">净重（公斤）</td>
             <td class="col">{{tableData.netWeight}}</td>
           </tr>
@@ -119,7 +125,6 @@ export default{
     text-align: right;
     margin: 0 0 10px 0;
   }
-
   table,
   table tr th,
   table tr td {

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -0,0 +1,1507 @@
+//检斤管理
+<template>
+  <div class="center">
+    <div class="substance">
+      <div class="left">
+        <BalanceAlert v-if="isShowBalance" ref="weightChild" :deptBudgetList="deptBudgetList" :information="information"
+          v-on:balanceListen="setVal" class="zujian">
+        </BalanceAlert>
+        <div class="top">
+          <div class="confirmWeight">
+            <div class="titleWeight">确认重量</div>
+            <div v-if="index == 0" class="weight">
+              {{ weighingList.grossWeight }} <span class="kg-style">kg</span>
+            </div>
+            <div v-else class="weight">
+              {{ weighingList.tare }} <span class="kg-style">kg</span>
+            </div>
+          </div>
+          <div class="confirmInfo">
+            <div class="car-type">车牌号</div>
+            <div class="car-no">{{ carWeightInfo.carNumber }}</div>
+          </div>
+        </div>
+        
+        <div class="bottom">
+          <div class="bg-left titleup"><span class="word_css">实时监控</span></div>
+          <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>
+      <div class="right">
+        <ws-form class="right-content">
+          <div class="left1">
+            <div class="titlesign weightTitle">
+              <span class="word_css">检斤信息</span>
+              
+            </div>
+            <div class="weightInfo">
+              <div class="tab">
+                <div :class="inWarehouseType == 1 ? 'in_css':'in_cssno'" @click="WarehousingType(1)">贸易入库</div>
+                <div :class="inWarehouseType == 3 ? 'in_css':'in_cssno'" @click="WarehousingType(3)">收购入库</div>
+              </div>
+              <div class="tab weigh_btn">
+                 <el-badge :value="mListTop.length" class="badge_item">
+                 <div :class="tpyeNo == 1 ? 'in_css1':'in_cssno1'" @click="tabClick(0)">称毛重</div>
+              </el-badge>
+              <el-badge :value="pListTop.length" class="badge_item">
+                <div :class="tpyeNo == 2 ? 'in_css1':'in_cssno1'" @click="tabClick(1)">称皮重</div>
+              </el-badge>
+              </div>
+            <ws-info-table>
+              <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">
+                <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-else>
+                <ws-input v-model="weighingList.moveTaskNo" placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled />
+              </ws-form-item>
+              <ws-form-item label="客户" span="1" prop="customer" v-if="inWarehouseType == 3">
+                <ws-input v-model="weighingList.customer" 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 label="车牌号" span="1" prop="carNumber">
+                <ws-input v-model="weighingList.carNumber" placeholder="自动获取，不可编辑" maxlength="100" size="small"
+                  disabled />
+              </ws-form-item>
+                 <ws-form-item label="运输方式" span="1" prop="outType" v-if="inWarehouseType == 1">
+                <ws-input v-model="weighingList.outType" placeholder="自动获取，不可编辑" maxlength="100" size="small"
+                  disabled />
+              </ws-form-item>
+              <ws-form-item label="箱号-1" span="1" prop="boxNo">
+                <ws-input disabled v-model="weighingList.boxNo" placeholder="暂无"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input disabled v-model="weighingList.boxNoOther" placeholder="暂无"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input disabled v-model="weighingList.titleNo" placeholder="暂无"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无"
+                  maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
+                <ws-input type="number" @mousewheel.native.prevent v-if="index == 0"
+                  v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
+                  size="small" :disabled="disabled" />
+                <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
+                  @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
+                <el-button class="butCss" @click="openPort" v-if="index == 0">重新获取</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="disabled" />
+                <el-button class="butCss" v-if="index != 0" @click="openPort">重新获取</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>
+                <ws-form-item label="实收卸车过磅费（元）" span="1" prop="actualWeighingFee" v-if="index == 1">
+                  <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 class="car-right">
+            <div class="screen">
+              <el-select v-model="warehouseName" placeholder="请选择仓库名" @change="warehouseNameChange">
+                <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                  :value="item.warehouseName">
+                </el-option>
+              </el-select>
+              <!-- <el-checkbox v-model="checked">默认</el-checkbox> -->
+            </div>
+            <div class="screen frame">
+              <div class="screen_left">
+                <div @click="cutstatus(1)" :class="status==1?'select_css':'noselect_css'" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">未称{{information}}</div>
+                <div @click="cutstatus(2)" :class="status==2?'select_css':'noselect_css'" v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</div>
+              </div>
+            <div class="screen_right">
+              <div @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`">记录</div>
+            </div>
+            
+            </div>
+            
+            <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
+              style="width: 100%; overflow: auto; height: calc(100vh - 55vh);margin-top:20px">
+              <el-table-column property="number" label="业务编号">
+              </el-table-column>
+              <el-table-column property="carNumber" label="车牌号">
+              </el-table-column>
+              <el-table-column property="status" label="状态">
+              </el-table-column>
+            </el-table>
+            <div style="text-align: center">
+              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="deptBudgetTotal">
+              </el-pagination>
+            </div>
+            <!-- <div class="table-title">
+            <div class="top">
+            <div class="top-item first"></div>
+            <div class="top-item">编号</div>
+            <div class="top-item">车牌号</div>
+          </div>
+              <div class="top">
+            <div></div>
+           <div class="top-item"></div>
+            <div class="top-item">编号</div>
+            <div class="top-item">车牌号</div>
+          </div>
+        </div>
+          <div class="table">
+            <div class="table-content" v-for="(item,index) in 30" :key="index">
+              <div class="table-content-item"><input type="radio"></div>
+              <div class="table-content-item">xxxxxxxxxxxxx</div>
+              <div class="table-content-item">辽A11111</div>
+            </div>
+          </div> -->
+          </div>
+        </ws-form>
+      </div>
+    </div>
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单" @opened="opendBtn"
+      @close="closeDialog" :close-on-click-modal="false">
+      <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
+      <div style="text-align: center">
+        <el-button type="primary" @click="closePrint">关闭</el-button>
+        <el-button type="primary" @click="printSmall">打印小票</el-button>
+        <el-button type="primary" @click="printBig">打印单据</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    tare,
+    grossWeight,
+    getamount,
+    getPrint,
+    getweighingList,
+    getinspectLookGoods,
+    selectWarehouseSelf,
+  } from '@/model/houseSelfCollect/index'
+  import {addstorageputList} from '@/model/warehouse/index'
+  import weightCheckPrint from './component/weightCheckPrint.vue'
+  import BalanceAlert from '@/components/balanceAlert'
+  import html2canvas from 'html2canvas'
+  import axios from 'axios'
+  export default {
+    components: {
+      weightCheckPrint,
+      BalanceAlert,
+    },
+    watch: {
+      weighingList: {
+        //深度监听，可监听到对象、数组的变化
+        handler(val, oldVal) {
+          if (val.tare) {
+            if (this.weighingList.buckleMiscellaneous) {
+              this.weighingList.netWeight =
+                this.weighingList.grossWeight -
+                val.tare -
+                this.weighingList.buckleMiscellaneous
+            } else {
+              this.weighingList.netWeight =
+                this.weighingList.grossWeight - val.tare
+            }
+          }
+        },
+        deep: true, //true 深度监听
+      },
+    },
+    data() {
+      return {
+        isShowBalance: false,
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        pList: [],
+        mList: [],
+        index: 0,
+        status: 1,
+        carList: [],
+        carWeightInfo: {
+          carNumber: '',
+          type: '',
+          weight: '',
+        },
+        currentRow: null,
+        inspect: {},
+        types: 1,
+        information: '',
+        weighingList: {
+          grossWeight: 0,
+          tare: 0,
+          buckleMiscellaneous: 0,
+          netWeight: 0,
+          receivableWeighingFee: '',
+          qualityInspectionManagement: {
+            boxNo: "暂无",
+            boxNoOther: "暂无",
+            titleNo: "暂无",
+            titleNoOther: "暂无",
+          }
+        },
+        deptBudgetList: {},
+        tpyeNo: '1',
+        disabled: true,
+        relationId: '',
+        // warehouseId: '',
+        purchasePriceList: [],
+        isShowPrint: false,
+        tableData: {},
+        reader: null,
+        param: 9600,
+        monitorUrl1: '',//监控地址
+        monitorUrl2: '',//监控地址
+        cangid: '',
+        paramType: '1',//参数类型 1 扣重比 2 降幅
+        warehouseName: '',
+        result1: '00',
+        allowEdit: 0,
+        mListTop: [],
+        mListBottom: [],
+        pListTop: [],
+        carList1: [],
+        pListBottom: [],
+        warehouseList: [], //仓库
+        checked: false,
+        inWarehouseType: 1, //入库类型
+        mListTotal: [],
+        pListTotal: [],
+        submitAllow:false
+      }
+    },
+    activated() {
+      // if (!this.$route.query.grossWeight) {
+      //   this.$route.query.grossWeight = 0
+      // } else {
+      //   this.weighingList.grossWeight = this.$route.query.grossWeight
+      // }
+      // this.allowEdit = this.$route.query.allowEdit
+      // this.$route.query.automaticWeightAcquisition = 0
+      // if(this.$route.query.automaticWeightAcquisition == '1'){
+      // this.openPort()
+      // this.isShowBalance = true
+      // }
+      //  if (this.$route.query.automaticWeightAcquisition == '1') {
+      this.isShowBalance = true
+      // }
+      //仓库
+      selectWarehouseSelf({
+          compId: localStorage.getItem('ws-pf_compId'),
+        })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+          if (localStorage.getItem('ck')) {
+            this.warehouseName = localStorage.getItem('ck')
+            for (var i = 0; i < response.length; i++) {
+              if (this.warehouseName == this.warehouseList[i].warehouseName) {
+                this.cangid = this.warehouseList[i].id
+                this.monitorUrl1 = this.warehouseList[i].monitorUrl1
+                this.monitorUrl2 = this.warehouseList[i].monitorUrl2
+                this.allowEdit = this.warehouseList[i].allowEdit
+                break
+              }
+            }
+          } else {
+            this.warehouseName = this.warehouseList[0].warehouseName
+            localStorage.setItem('ck', this.warehouseName)
+            this.cangid = this.warehouseList[0].id
+            this.allowEdit = this.warehouseList[0].allowEdit
+            this.monitorUrl1 = this.warehouseList[0].monitorUrl1
+            this.monitorUrl2 = this.warehouseList[0].monitorUrl2
+          }
+          if (this.allowEdit == 0) {
+            this.disabled = true
+          } else if (this.allowEdit == 1) {
+            this.disabled = false
+          }
+          this.getList()
+        })
+
+      if (this.tpyeNo == 1) {
+        this.information = '毛重'
+        this.weighingList.tare = 0
+      } else if (this.tpyeNo == 2) {
+        this.information = '皮重'
+      }
+    },
+    methods: {
+      warehouseNameChange() {
+        localStorage.setItem('ck', this.warehouseName)
+        this.weighingList.warehouseName = this.warehouseName
+        this.deptBudgetList.warehouseName = this.warehouseName
+        for (var i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseName == this.warehouseList[i].warehouseName) {
+            this.cangid = this.warehouseList[i].id
+            this.monitorUrl1 = this.warehouseList[i].monitorUrl1
+            this.monitorUrl2 = this.warehouseList[i].monitorUrl2
+            this.allowEdit = this.warehouseList[i].allowEdit
+            if (this.allowEdit == 0) {
+              this.disabled = true
+            } else if (this.allowEdit == 1) {
+              this.disabled = false
+            }
+          }
+        }
+        this.getList()
+      },
+      record() {
+        this.$router.push({
+          path: 'weightCheckRecord',
+          query:{inWarehouseType:this.inWarehouseType,warehouseName:this.warehouseName}
+        })
+      },
+      WarehousingType(num) {
+        this.inWarehouseType = num
+        this.getList()
+      },
+      setVal(data) {
+        if (this.information == '毛重') {
+          this.weighingList.grossWeight = data
+        } else {
+          this.weighingList.tare = data
+        }
+      },
+      openPort() {
+        this.$refs.weightChild.openPort()
+      },
+      cutstatus(status) {
+        this.status = status
+        if (status == 2) {
+          if (this.tpyeNo == 1) {
+            this.carList = this.carList1.filter(function(item) {
+              return item.status == '已称毛重'
+            })
+          } else {
+            this.carList = this.carList1.filter(function(item) {
+              return item.status == '已称皮重'
+            })
+          }
+        } else {
+          if (this.tpyeNo == 1) {
+            // this.mListTop.concat(this.mListBottom)
+            this.carList = this.carList1.filter(function(item) {
+              return item.status == '已质检'
+            })
+          } else {
+            this.carList = this.carList1.filter(function(item) {
+              return item.status == '已称毛重'
+            })
+          }
+        }
+this.deptBudgetTotal = this.carList.length
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      getList() {
+        // 货名
+        getinspectLookGoods({
+            warehouseId: this.cangid,
+          }).toPromise()
+          .then((response) => {
+            this.purchasePriceList = response
+          })
+
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: '',
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            serviceManagementType: this.inWarehouseType,
+            // statusType:1
+          })
+          .toPromise()
+          .then((response) => {
+            this.weighingList = response.records
+            this.common.commonWeighingList = response.records
+            this.makeData()
+          })
+          .catch((response) => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
+      },
+      makeData() {
+        this.mList = []
+        this.pList = []
+        this.mListTop = []
+        this.mListBottom = []
+        this.pListTop = []
+        this.pListBottom = []
+        this.carWeightInfo.carNumber = ''
+        this.weighingList = []
+        let that = this
+        let _list = this.common.commonWeighingList
+        for (let i = 0; i < _list.length; i++) {
+          if (_list[i].paymentManagement) {
+            if (
+              _list[i].paymentManagement.status != '待结算' ||
+              _list[i].paymentManagement.approveStatus
+            ) {
+              continue
+            }
+          }
+          if (_list[i].status == '已质检') {
+            this.mListTop.push(_list[i])
+          }
+          if (_list[i].status == '已称毛重') {
+            this.mListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称皮重') {
+            this.pListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称毛重') {
+            this.pListTop.push(_list[i])
+          }
+        }
+        if (this.status == 1) {
+          this.mList = this.mListTop
+          this.pList = this.pListTop
+        } else {
+          this.mList = this.mListBottom
+          this.pList = this.pListBottom
+        }
+        this.mListTotal = this.mListTop.concat(this.mListBottom)
+        this.pListTotal = this.pListTop.concat(this.pListBottom)
+        if (this.information == '毛重') {
+          this.index = 0
+          this.carList = this.mList
+          this.carList1 = this.mListTotal
+          if (this.mList.length != 0) {
+              this.setCurrent(this.mList[0])
+
+              this.weighingList = this.mList[0]
+              this.carWeightInfo = {
+                carNumber: this.mList[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.grossWeight,
+            }
+          }
+        } else {
+          this.index = 1
+          this.carList = this.pList
+          this.carList1 = this.pListTotal
+          if (this.pList.length != 0) {
+              this.setCurrent(this.pList[0])
+
+              this.weighingList = this.pList[0]
+              this.carWeightInfo = {
+                carNumber: this.pList[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.tare
+              }
+          }
+          this.deptBudgetTotal = this.pList.length
+        }
+        this.weighingList.carModel = this.weighingList.qualityInspectionManagement.carModel
+        //已下代码注释保留
+        // if (this.weighingList.carModel == '单拖小柜') {
+        //   this.weighingList.receivableWeighingFee = 80
+        //   this.weighingList.actualWeighingFee = 80
+        // } else if (this.weighingList.carModel == '双拖小柜') {
+        //   this.weighingList.receivableWeighingFee = 160
+        //   this.weighingList.actualWeighingFee = 160
+        // } else if (this.weighingList.carModel == '大柜') {
+        //   if (this.weighingList.grossWeight / 1000 < 50) {
+        //     this.$set(this.weighingList, 'receivableWeighingFee', 120)
+        //     this.weighingList.actualWeighingFee = 120
+        //     this.$forceUpdate()
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 50 ||
+        //     this.weighingList.grossWeight / 1000 < 65
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 150
+        //     this.weighingList.actualWeighingFee = 150
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 65 ||
+        //     this.weighingList.grossWeight / 1000 < 75
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 170
+        //     this.weighingList.actualWeighingFee = 170
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 75 ||
+        //     this.weighingList.grossWeight / 1000 < 80
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 190
+        //     this.weighingList.actualWeighingFee = 190
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 80 ||
+        //     this.weighingList.grossWeight / 1000 < 85
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 210
+        //     this.weighingList.actualWeighingFee = 210
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 85 ||
+        //     this.weighingList.grossWeight / 1000 < 95
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 240
+        //     this.weighingList.actualWeighingFee = 240
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 95 ||
+        //     this.weighingList.grossWeight / 1000 < 105
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 260
+        //     this.weighingList.actualWeighingFee = 260
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 105 ||
+        //     this.weighingList.grossWeight / 1000 < 150
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 300
+        //     this.weighingList.actualWeighingFee = 300
+        //   }
+        // } else if (this.weighingList.carModel == '挂车') {
+        //   if (this.weighingList.grossWeight / 1000 < 50) {
+        //     this.weighingList.receivableWeighingFee = 180
+        //     this.weighingList.actualWeighingFee = 180
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 50 ||
+        //     this.weighingList.grossWeight / 1000 < 65
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 200
+        //     this.weighingList.actualWeighingFee = 200
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 65 ||
+        //     this.weighingList.grossWeight / 1000 < 75
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 250
+        //     this.weighingList.actualWeighingFee = 250
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 75 ||
+        //     this.weighingList.grossWeight / 1000 < 85
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 350
+        //     this.weighingList.actualWeighingFee = 350
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 85 ||
+        //     this.weighingList.grossWeight / 1000 < 95
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 400
+        //     this.weighingList.actualWeighingFee = 400
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 95 ||
+        //     this.weighingList.grossWeight / 1000 < 105
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 450
+        //     this.weighingList.actualWeighingFee = 450
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 105 ||
+        //     this.weighingList.grossWeight / 1000 < 120
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 500
+        //     this.weighingList.actualWeighingFee = 500
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 120 ||
+        //     this.weighingList.grossWeight / 1000 < 130
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 550
+        //     this.weighingList.actualWeighingFee = 550
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 130 ||
+        //     this.weighingList.grossWeight / 1000 < 150
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 700
+        //     this.weighingList.actualWeighingFee = 700
+        //   }
+        // } else if (this.weighingList.carModel == '冷藏箱（不抠箱）') {
+        //   if (this.weighingList.grossWeight / 1000 < 50) {
+        //     this.weighingList.receivableWeighingFee = 120
+        //     this.weighingList.actualWeighingFee = 120
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 50 ||
+        //     this.weighingList.grossWeight / 1000 < 65
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 150
+        //     this.weighingList.actualWeighingFee = 150
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 65 ||
+        //     this.weighingList.grossWeight / 1000 < 75
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 170
+        //     this.weighingList.actualWeighingFee = 170
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 75 ||
+        //     this.weighingList.grossWeight / 1000 < 80
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 190
+        //     this.weighingList.actualWeighingFee = 190
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 80 ||
+        //     this.weighingList.grossWeight / 1000 < 85
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 210
+        //     this.weighingList.actualWeighingFee = 210
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 85 ||
+        //     this.weighingList.grossWeight / 1000 < 95
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 240
+        //     this.weighingList.actualWeighingFee = 240
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 95 ||
+        //     this.weighingList.grossWeight / 1000 < 105
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 260
+        //     this.weighingList.actualWeighingFee = 260
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 105 ||
+        //     this.weighingList.grossWeight / 1000 < 120
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 300
+        //     this.weighingList.actualWeighingFee = 300
+        //   }
+        // } else if (this.weighingList.carModel == '冷藏箱（抠箱）') {
+        //   if (this.weighingList.grossWeight / 1000 < 50) {
+        //     this.weighingList.receivableWeighingFee = 360
+        //     this.weighingList.actualWeighingFee = 360
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 50 ||
+        //     this.weighingList.grossWeight / 1000 < 65
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 390
+        //     this.weighingList.actualWeighingFee = 390
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 65 ||
+        //     this.weighingList.grossWeight / 1000 < 75
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 410
+        //     this.weighingList.actualWeighingFee = 410
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 75 ||
+        //     this.weighingList.grossWeight / 1000 < 80
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 430
+        //     this.weighingList.actualWeighingFee = 430
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 80 ||
+        //     this.weighingList.grossWeight / 1000 < 85
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 450
+        //     this.weighingList.actualWeighingFee = 450
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 85 ||
+        //     this.weighingList.grossWeight / 1000 < 95
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 480
+        //     this.weighingList.actualWeighingFee = 480
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 95 ||
+        //     this.weighingList.grossWeight / 1000 < 105
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 500
+        //     this.weighingList.actualWeighingFee = 500
+        //   } else if (
+        //     this.weighingList.grossWeight / 1000 > 105 ||
+        //     this.weighingList.grossWeight / 1000 < 120
+        //   ) {
+        //     this.weighingList.receivableWeighingFee = 540
+        //     this.weighingList.actualWeighingFee = 540
+        //   }
+        // } else {
+        //   this.weighingList.receivableWeighingFee = ''
+        // }
+      },
+      tabClick(val) {
+        this.mListTop = []
+        this.mListBottom = []
+        this.pListTop = []
+        this.pListBottom = []
+        this.carWeightInfo.carNumber = ''
+        this.weighingList = []
+        this.index = val
+        if (val == 0) {
+          this.information = '毛重'
+          this.tpyeNo = '1'
+        } else {
+          this.tpyeNo = '2'
+          this.information = '皮重'
+        }
+        this.getList()
+      },
+      setCurrent(row) {
+        this.$refs.singleTable.setCurrentRow(row)
+      },
+      handleCurrentChange(val) {
+        this.submitAllow = false
+        if(this.tpyeNo == 2 && this.status == 1 && val.qualityInspectionManagement.confirm == 0){
+           this.submitAllow = true
+           this.$message({
+              message: '该条质检信息未确认',
+              type: 'warning'
+            });
+        }
+        if(val){
+          this.currentRow = val
+          this.carWeightInfo = {
+          carNumber: val.carNumber,
+          type: this.information,
+          weight: val.grossWeight,
+        }
+        this.weighingList = val
+        if(val.qualityInspectionManagement){
+          this.weighingList.boxNo = val.qualityInspectionManagement.boxNo
+          this.weighingList.boxNoOther = val.qualityInspectionManagement.boxNoOther
+          this.weighingList.titleNo = val.qualityInspectionManagement.titleNo
+          this.weighingList.titleNoOther = val.qualityInspectionManagement.titleNoOther
+        }
+        this.paramType = val.qualityInspectionManagement.paramType
+        }
+      },
+      cancel() {
+        if (this.reader) {
+          this.reader.cancel()
+        }
+        this.$router.push({
+          path: 'weighingManagement',
+        })
+      },
+      calculation(status) {
+        // if (this.weighingList.grossWeight && this.weighingList.tare) {
+        //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
+        //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
+        // }
+      },
+      printSmall() {
+        window.open(
+          '../../../../static/weightCheck.html?type=1&tableData=' +
+          JSON.stringify(this.inspect)
+        )
+      },
+      printBig() {
+        window.open(
+          '../../../../static/weightCheck.html?type=2&tableData=' +
+          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, 'printImage')
+            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
+              tare(this.weighingList)
+                .toPromise()
+                .then((response) => {})
+            })
+          }
+        })
+      },
+      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, 'printImage')
+            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
+              tare(this.weighingList)
+                .toPromise()
+                .then((response) => {})
+            })
+            this.dialogTableVisible = true
+          }
+        })
+        this.isShowPrint = false
+        // this.$router.push({
+        //   path: 'weighingManagement'
+        // })
+      },
+      closePrint() {
+        this.isShowPrint = false
+        // this.$router.push({
+        //   path: 'weighingManagement'
+        // })
+      },
+      print() {
+        if (this.reader) {
+          this.reader.cancel()
+        }
+        if (!this.weighingList.grossWeight) {
+          this.$message({
+            message: '毛重不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.weighingList.grossWeight < 1 ||
+          this.weighingList.grossWeight > 200000
+        ) {
+          this.$message({
+            message: '毛重输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          String(this.weighingList.grossWeight).indexOf('.') != -1 &&
+          String(this.weighingList.grossWeight).length -
+          (String(this.weighingList.grossWeight).indexOf('.') + 1) >
+          1
+        ) {
+          this.$message({
+            message: '毛重输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.tpyeNo == 2) {
+          if (!this.weighingList.tare) {
+            this.$message({
+              message: '皮重不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.weighingList.tare) {
+            this.$message({
+              message: '皮重不能为空',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.weighingList.tare > this.weighingList.grossWeight) {
+            this.$message({
+              message: '皮重不能大于毛重',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.weighingList.tare < 1 || this.weighingList.tare > 100000) {
+            this.$message({
+              message: '皮重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            String(this.weighingList.tare).indexOf('.') != -1 &&
+            String(this.weighingList.tare).length -
+            (String(this.weighingList.tare).indexOf('.') + 1) >
+            1
+          ) {
+            this.$message({
+              message: '皮重输入错误',
+              type: 'warning',
+            })
+            return
+          }
+
+          if (this.weighingList.netWeight < 0) {
+            this.$message({
+              message: '净重不能小于0',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        this.$confirm('确定保存检斤信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            var warehousing = {}
+            //贸易入库保存需要再走入库接口
+              if(this.inWarehouseType == 1){
+                warehousing = this.weighingList
+                        warehousing.secretaryWeigher = localStorage.getItem('ws-pf_staffName')
+                        warehousing.compId = localStorage.getItem('ws-pf_compId')
+                        warehousing.inOutFlag = 2
+                        let _data = JSON.parse(
+                          localStorage.getItem('winseaview-userInfo')
+                        )
+                        warehousing.backOffice = _data.content.showCompName + '-' + _data.content.staffName
+                        warehousing.grossWeight = this.weighingList.grossWeight 
+                        warehousing.tare = this.weighingList.tare
+                        warehousing.netWeight = this.weighingList.netWeight 
+                        warehousing.pureWeight = this.weighingList.pureWeight
+                        warehousing.deductionAmount = this.weighingList.deductionAmount
+                        warehousing.deductionWeight = this.weighingList.deductionWeight
+                        warehousing.warehouseInOutDetail = {}
+                        delete warehousing.qualityInspectionManagement
+              }
+            if (this.tpyeNo == 1) {
+              //毛检保存前进行校验
+              getamount({
+                  compId: localStorage.getItem('ws-pf_compId'),
+                  customerNumberCard: this.weighingList.customerNumberCard,
+                  goodsName: this.weighingList.goodsName,
+                })
+                .toPromise()
+                .then((response) => {
+                  for (let i = 0; i < this.purchasePriceList.length; i++) {
+                    if (
+                      this.weighingList.goodsName ==
+                      this.purchasePriceList[i].goodsName
+                    ) {
+                      //累计售粮超上限不能完成毛检保存
+                      let count = (
+                        this.purchasePriceList[i].saleLimit -
+                        response / 1000
+                      ).toFixed(2)
+                      // console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
+                      // this.weighingList.grossWeight/=1000
+                      if (count - this.weighingList.grossWeight / 1000 < 0) {
+                        this.$alert(
+                          '该客户累计销售' +
+                          this.weighingList.goodsName +
+                          (response / 1000).toFixed(2) +
+                          '吨，还可售粮' +
+                          count +
+                          '吨',
+                          '提示', {
+                            confirmButtonText: '确定',
+                            callback: (action) => {
+                              this.$message({
+                                type: 'info',
+                                message: `累计售粮已超出上限`,
+                              })
+                            },
+                          }
+                        )
+                      } else {
+                        //累计售粮没有超上限完成毛检保存
+                        // this.weighingList.relationId = this.relationId;
+                        grossWeight(this.weighingList)
+                          .toPromise()
+                          .then((response) => {
+                            if (this.reader) {
+                              this.reader.cancel()
+                            }
+                            this.$notify.success({
+                              title: '成功',
+                              message: '保存成功',
+                            })
+                            //贸易入库需要走再入库接口
+                            if(this.inWarehouseType == 1){
+                              warehousing.grossWeight /= 1000
+                              warehousing.tare /= 1000
+                              warehousing.netWeight /= 1000 
+                              warehousing.pureWeight =  1000
+                              warehousing.deductionAmount *= 1000
+                              warehousing.deductionWeight /=  1000 
+                              warehousing.statusFlag = 1
+                            addstorageputList(warehousing).toPromise().then((response) => {
+                              // if(response == "OK"){
+                              //   this.getList()
+                              // }
+                            })
+                        }
+                          })
+                          .catch((response) => {
+                            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                          })
+                      }
+                    }
+                  }
+                })
+            } else if (this.tpyeNo == 2) {
+              this.weighingList.warehouseId = this.cangid;
+              (this.weighingList.skinInspector =
+                localStorage.getItem('ws-pf_staffName')),
+              tare(this.weighingList)
+                .toPromise()
+                .then((response) => {
+                  if (this.reader) {
+                    this.reader.cancel()
+                  }
+                  this.$notify.success({
+                    title: '成功',
+                    message: '保存成功',
+                  })
+                  //贸易入库需要再走入库接口
+                   if(this.inWarehouseType == 1){
+                          warehousing.statusFlag = 3
+                            warehousing.grossWeight /= 1000
+                        warehousing.tare /= 1000
+                        warehousing.netWeight /= 1000 
+                        warehousing.pureWeight =  1000
+                        warehousing.deductionAmount *= 1000
+                        warehousing.deductionWeight /=  1000 
+                            addstorageputList(warehousing).toPromise().then((response) => {})
+                        }
+                  getPrint({
+                      id: response,
+                    })
+                    .toPromise()
+                    .then((response) => {
+                      // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
+                      //   getQRcode({printString}).toPromise().then((res) => {
+                      this.isShowPrint = true
+                      this.inspect = response
+                      // this.inspect.qrCodeUrl = res
+                      if (response.compName == '黑龙江秋收有限公司') {
+                        this.inspect.compName = '黑龙江中天昊元贸易有限公司'
+                      }
+                      this.inspect.a = '中天'
+                      // })
+                    })
+                    .catch((response) => {
+                      // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                    })
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+            }
+          })
+          .catch(() => {
+            return false
+          })
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  /deep/.el-pagination {
+    margin-bottom: 0;
+  }
+
+  .center {
+    background: #E8ECF6 ;
+  }
+
+  .ws-info-table {
+    border: none;
+    // height: 610px;
+    margin-top: 30px;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 100%;
+    border: none;
+  }
+
+  .formItem {
+    width: 100%;
+    display: inline;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 25%;
+    text-align: center;
+    background: #ffffff;
+    font-size: 14px;
+    color: #8890b1;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 10px;
+  }
+
+  .substance {
+    padding-bottom: 20px;
+    overflow-x: scroll;
+
+    .active {
+      background: #5878e8;
+      color: white;
+    }
+
+    // background: #ffffff;
+    width: 100%;
+    height: calc(100vh - 125px);
+    border-radius: 4px;
+    margin: 0 auto;
+    display: flex;
+
+    .left {
+      width: 30%;
+      min-width: 500px;
+      position: relative;
+      // padding:0 20px 20px 20px;
+
+      .top {
+        background: black;
+        color: #2aff7c;
+        font-size: 32px;
+        text-align: right;
+        padding: 0 20px;
+        border-radius: 10px;
+        margin: 0 20px 20px 20px;
+        position: absolute;
+        top: 130px;
+        width: 91%;
+
+        .zujian {
+          position: relative;
+        }
+
+        .kg-style {
+          font-size: 30px;
+          color: red;
+        }
+
+        .confirmInfo {
+          display: flex;
+
+          .car-type {
+            text-align: left;
+            width: 50%;
+          }
+
+          .car-no {
+            width: 50%;
+            text-align: right;
+          }
+        }
+
+        .confirmWeight {
+          display: flex;
+
+          .titleWeight {
+            width: 35%;
+            text-align: left;
+            line-height: 90px;
+            color: red;
+          }
+
+          .weight {
+            width: 65%;
+            text-align: right;
+            color: red;
+          }
+        }
+      }
+
+      .bottom {
+        // text-align: center;
+        background: white;
+        margin: 20px 20px 0 20px;
+        border-radius: 10px;
+        padding-bottom: 20px;
+
+        .img1,
+        .img2 {
+          width: 200px;
+          padding: 20px;
+        }
+
+        .video-content {
+          width: 100%;
+        }
+        .video1{
+          text-align: center;
+        }
+      }
+    }
+
+    .right {
+      width: 70%;
+      // padding: 20px;
+      height: 750px;
+      border-radius: 10px;
+
+      .tab {
+        display: flex;
+        margin-bottom: 5px;
+        .tab-item {
+          padding: 5px 10px;
+          margin-right: 20px;
+          border-radius: 10px;
+        }
+        .in_css,.in_cssno,.in_cssno1,.in_css1{
+          width: 80px;
+          height: 32px;
+          padding: 3px 10px;
+          border-radius: 4px;
+          margin-right: 10px;
+          font-size: 15px;
+          line-height: 28px;
+          text-align: center;
+          font-weight: 600;
+        }
+        .in_css{
+          color: #5878E8;
+          background: #F0F6FF;
+        }
+        .in_css1{
+           color: #5878E8;
+        }
+        .in_cssno1{
+          color: #8890B1 ;
+        }
+       /deep/.el-badge__content.is-fixed{
+         top: 3px;
+         right: 26px;
+       }
+      }
+      .weigh_btn{
+        height: 35px;
+        border-bottom: 1px solid #D8DCE6;
+      }
+
+      .table-title {
+        background: red;
+
+        .top {
+          display: inline-block;
+          width: 48%;
+
+          .top-item {
+            display: inline-block;
+          }
+        }
+      }
+
+      .table {
+        background: red;
+
+        .table-content {
+          background: green;
+          display: inline-block;
+          width: 50%;
+
+          .table-content-item {
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+    font-size: 16px;
+    // background: #f6f7fc;
+  }
+
+  /deep/.el-table td {
+    background: #e7e8ef;
+  }
+
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
+
+  .bg-left {
+    height: 60px;
+    background: #F6F7FC;
+    // padding-left: 30px;
+    line-height: 60px;
+  }
+
+  .titleup {
+    position: relative;
+  }
+
+  .titleup::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+    top: 14px;
+  }
+  .butCss {
+    // opacity: 0;
+    margin-left: 20px;
+    color: #5473E8;
+    background: #ffffff;
+  }
+
+  /deep/.el-dialog__title {
+    font-size: 24px !important;
+  }
+
+  /deep/.el-dialog__header {
+    text-align: center !important;
+    padding: 10px 0 !important;
+    height: auto !important;
+  }
+
+  .weight {
+    font-size: 68px;
+  }
+
+  .right-content {
+    display: flex;
+    height: calc(100vh - 25vh);
+
+    .left1 {
+      position: relative;
+      background: #ffffff;
+      // padding: 10px;
+      border-radius: 4px;
+      min-width: 355px;
+      width: 40%;
+
+      .but {
+        position: absolute;
+        left: 0;
+        right: 0;
+        margin: auto;
+        justify-content: flex-end;
+        display: flex;
+        margin-right: 17px;
+        bottom: 20px;
+      }
+      .weightInfo{
+        padding: 10px;
+      }
+      /deep/.el-input.is-disabled .el-input__inner{
+        background: #F5F7FA !important;
+        border: none;
+      }
+    }
+    .titlesign::before{
+     content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+      top: 14px;
+    }
+    .weightTitle{
+      width: 100%;
+      height: 60px;
+      background: #F6F7FC;
+      margin-bottom: 6px;
+      border-radius: 4px;
+      line-height: 60px;
+    }
+
+    .left {
+      width: 40%;
+    }
+
+    .right {
+      width: 60%;
+    }
+  }
+
+  .car-right {
+    width: 60%;
+    background: #ffffff;
+    padding: 10px;
+    margin-left: 20px;
+    border-radius: 4px;
+  }
+  .screen{
+    margin-bottom: 10px;
+    width: 100%;
+    display: flex;
+    .screen_left{
+      min-width: 215px;
+      width: 30%;
+      display: flex;
+
+      .select_css,.noselect_css{
+       width: 76px;
+       height: 32px;
+          padding: 3px 10px;
+          border-radius: 4px;
+          margin-right: 10px;
+          font-size: 14px;
+          line-height: 28px;
+          text-align: center;
+    }
+    .select_css{
+      color: #5878E8 ;
+      background: #F0F6FF;
+    }
+    }
+    .screen_right{
+      width: 70%;
+      justify-content: flex-end;
+      display: flex;
+      margin-right: 30px;
+      div{
+        color: #5878E8 ;
+      }
+    }
+    /deep/.el-select{
+      width: 50%;
+    }
+  }
+  .frame{
+    border-bottom: 1px solid #D8DCE6;
+    height: 40px;
+  }
+   .word_css{
+      margin-left: 15px;
+      font-size: 18px;
+      font-weight: 600;
+      text-align: left;
+    }
+</style>

src/views/houseSelfCollect/settlement.vue

@@ -56,6 +56,10 @@
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney"
                 placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item v-if='paymentList.type=="干粮"' label="出库净重（公斤）" span="1" prop="unitDeduction">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney"
+                placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled/>
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>
@@ -183,6 +187,12 @@
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
+            <!-- 采购合同 自运 按合同的出库净重计算 -->
+            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+              class="formItem">
+              <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
+                placeholder="请输入粮款" maxlength="100" size="small" disabled />
+            </ws-form-item> -->
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' @focus="inputFocus($event)"
                 v-model="paymentList.weighingDeduction" placeholder="请输入称重扣款" maxlength="100" size="small"

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -0,0 +1,316 @@
+// 检斤记录
+<template>
+  <div class="container">
+    <el-row class="toptitle">
+      <el-col :span="12">
+        <h2 class="bg-left title">检斤记录</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button type="primary" size="small" @click="returnsales()">
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <div class="center">
+      <el-row>
+        <el-col :span="12">
+            <el-button :type="warehousingType == 1?'primary':''" size="small" @click="changeType(1)" class="btn_css btn_topcss">贸易入库</el-button>
+            <el-button :type="warehousingType == 3?'primary':''" size="small" @click="changeType(3)" class="btn_css btn_topcss">收购入库</el-button>
+        </el-col>
+        <el-col :span="12" class="bg-right">
+          <div style="display:flex">
+            <el-select v-model="warehouseName" placeholder="请选择仓库名" @change="warehouseNameChange">
+              <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
+                :value="item.warehouseName"></el-option>
+            </el-select>
+            <el-input :placeholder="warehousingType == 1 ? '可按业务编号、合同编号/移库编号、车牌号查找':'可按业务编号、车牌号、客户名查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
+            <!-- <el-input placeholder="可按业务编号、车牌号、客户名查找" clearable v-model="searchKeyWord"></el-input> -->
+            <el-button type="primary" size="small" @click="lookup">查找</el-button>
+          </div>
+        </el-col>
+      </el-row>
+       <el-button :type="choice == ''?'primary':''" size="small" @click="screen()" class="btn_css">全部</el-button>
+          <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
+          <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
+      <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780">
+        <el-table-column type="index" label="序号" width="80">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="number" label="业务编号"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130">
+        <template scope="scope">
+          <span v-if="scope.row.contractNo">{{scope.row.contractNo}}</span>
+          <span v-else>{{scope.row.moveTaskNo}}</span>
+        </template>
+        
+        </el-table-column>
+        <!--//moveTaskNo -->
+        <el-table-column prop="customer" label="客户" v-if="warehousingType == 3"></el-table-column>
+        <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+        <el-table-column prop="goodsName" label="货名"></el-table-column>
+        <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
+        <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>
+        <el-table-column prop="buckleMiscellaneous" label="扣重（公斤）" width="100"></el-table-column>
+        <el-table-column prop="netWeight" label="净重（公斤）" width="100"></el-table-column>
+        <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
+        <el-table-column prop="grossDate" label="检斤时间"></el-table-column>
+        <el-table-column prop="status" label="状态"></el-table-column>
+        <el-table-column label="操作">
+          <template scope="scope">
+            <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
+            <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div style="text-align: center; padding: 10px">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
+      <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
+      <div style="text-align:center">
+        <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+        <el-button type="primary" @click="printSmall">打印小票</el-button>
+        <el-button type="primary" @click="printBig">打印单据</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import {
+    selectWarehouseSelf,
+    getweighingList,
+    getPrint
+  } from '@/model/houseSelfCollect/index'
+   import weightCheckPrint from './component/weightCheckPrint.vue'
+  export default {
+      components: {
+      weightCheckPrint
+    },
+    data() {
+      return {
+        weighingRecordList: [],
+        warehouseId: '',
+        warehouseName: '',
+        // goodsNameList: [],
+        // goodsNameAllList: [],
+        // binNoList: [],
+        // binNumberId: '', //仓位Id
+        // warehouseType: '',
+        compId: '',
+        //分页
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        warehouseList: [], //仓库
+        searchKeyWord: "",
+        choice: '',
+        warehousingType: 1,
+        isShowPrint:false,
+        dialogData:{},
+        title:"",
+      }
+    },
+    activated() {
+      //仓库
+      selectWarehouseSelf({
+          compId: localStorage.getItem('ws-pf_compId'),
+        })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList = response
+        })
+      this.compId = localStorage.getItem('ws-pf_compId')
+      this.warehousingType = this.$route.query.inWarehouseType 
+      this.warehouseName = this.$route.query.warehouseName //仓库名
+      this.getList()
+    },
+    methods: {
+      lookup(){
+        this.getList()
+      },
+      changeType(val) {
+        this.warehousingType = val
+        this.getList()
+      },
+      screen(num) {
+        this.choice = num
+        this.getList()
+      },
+      returnsales() {
+        this.$router.go(-1)
+      },
+     print(row) {
+          getPrint({
+              id: row.id
+            })
+            .toPromise()
+            .then((response) => {
+              this.isShowPrint = true
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+      },
+      printSmall() {
+        window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
+      },
+      printBig(type, radioType) {
+        // if (type == 1) {
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+        // } else if (type == 2) {
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+        // } else {
+
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
+        // }
+      },
+      warehouseNameChange() {
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        // 列表
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            warehouseName: this.warehouseName,
+            managementType: 1,
+            serviceManagementType: this.warehousingType,
+            statusType:this.choice
+          })
+          .toPromise()
+          .then((response) => {
+            this.weighingRecordList = response.records
+            this.deptBudgetTotal = response.total
+          })
+          .catch((response) => {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
+      },
+
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .toptitle {
+    background: #f6f7fc;
+  }
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    text-align: right;
+    padding: 16px 20px;
+  }
+
+  .top-title {
+    width: 50%;
+    display: flex;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .center {
+    margin: auto;
+  }
+
+  .centertitle {
+    display: flex;
+    margin: 10px 0;
+  }
+
+  .temporary {
+    line-height: 80px;
+    font-size: 20px;
+    color: #abaaaa;
+  }
+
+  /deep/.forData .cell {
+    text-align: center;
+  }
+
+  //弹出框
+  .eject-warehouse {
+    font-size: 20px;
+    margin-left: 15px;
+    font-weight: 600;
+  }
+
+  .table_css {
+    margin: 20px auto;
+
+    tr {
+      height: 50px;
+    }
+
+    .table_item {
+      min-width: 70px;
+    }
+
+    td {
+      text-align: center;
+      font-size: 18px;
+      font-weight: 600;
+    }
+
+    .el-select {
+      width: 90%;
+    }
+  }
+  .btn_topcss{
+    margin-top: 15px;
+
+  }
+  .btn_css{
+      width: 90px;
+      margin-left: 10px;
+    }
+    .search_css{
+      margin: 0 20px;
+    }
+</style>

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -347,7 +347,6 @@ export default {
     //返回按钮
     revert() {
       this.$router.go(-1)
-      
     },
     // returnsales() {
     //   this.$router.push({ path: 'warehouseManagementPutOut' })