diff --git a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
index ad8ea31..37b73b5 100644
--- a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
+++ b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue
@@ -49,7 +49,7 @@
         <el-radio-group v-model="queryParams.weighttype">
           <el-radio v-for="dict in dict.type.weighttype" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
         </el-radio-group>
-        <el-button type="primary" size="mini" @click="handleQuery" style="width: 78px">生成榜单</el-button>
+        <el-button type="primary" size="mini" @click="" style="width: 78px">生成榜单</el-button>
       </el-form-item>
       <el-form-item label="车号" prop="carno">
         <el-input
@@ -70,7 +70,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleGetweight">获取重量</el-button>
-        <el-button type="primary" size="mini" @click="handleStopTimer">（停止/启动）获取</el-button>
+<!--        <el-button type="primary" size="mini" @click="handleStopTimer">（停止/启动）获取</el-button>-->
         <el-button type="primary" size="mini" @click="getwghqty" :disabled="this.queryParams.carno =='' || this.queryParams.carno == null || this.activeTab != 'weighingRequest'">称毛重</el-button>
         <el-button type="primary" size="mini" @click="getempqty" :disabled="this.queryParams.carno =='' || this.queryParams.carno == null">称皮重</el-button>
       </el-form-item>
@@ -86,7 +86,7 @@
                             v-model="form.crtdt"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="请选择创建时间"
+                            placeholder=""
                             readonly
             >
             </el-date-picker>
@@ -98,7 +98,7 @@
                             v-model="form.srcbsndt"
                             type="date"
                             value-format="yyyy-MM-dd"
-                            placeholder="请选择创建时间"
+                            placeholder=""
                             readonly
             >
             </el-date-picker>
@@ -106,7 +106,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="车号" prop="carno">
-            <el-input v-model="form.carno" placeholder="请输入车号"
+            <el-input v-model="form.carno" placeholder=""
                       readonly
             />
           </el-form-item>
@@ -125,7 +125,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="原磅单号" prop="srcpunmqty">
-            <el-input v-model="form.srcpunmqty" placeholder="请输入原磅单号"
+            <el-input v-model="form.srcpunmqty" placeholder=""
                       readonly
             />
           </el-form-item>
@@ -139,7 +139,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="规格" prop="specification">
-            <el-input v-model="form.specification" placeholder="请输入规格"
+            <el-input v-model="form.specification" placeholder=""
                       readonly
             />
           </el-form-item>
@@ -177,7 +177,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="收货单位" prop="recentname">
-            <el-input v-model="form.recentname" placeholder="请输入收货单位"
+            <el-input v-model="form.recentname" placeholder=""
                       readonly
             />
           </el-form-item>
@@ -191,7 +191,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="扣吨比例" prop="ductmqtypre">
-            <el-input v-model="form.ductmqtypre" placeholder="请输入扣吨比例" />
+            <el-input v-model="form.ductmqtypre" placeholder="" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -201,7 +201,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="承运单位" prop="trnentname">
-            <el-input v-model="form.trnentname" placeholder="请输入承运单位"
+            <el-input v-model="form.trnentname" placeholder=""
                       readonly
             />
           </el-form-item>
@@ -229,7 +229,7 @@
             <el-table style="width: 950px; display: inline-block;float:left;"
                       v-loading="loading"
                       :data="poundappliList"
-                      v-if="activeTab === 'weighingRequest'"
+                      v-show="activeTab === 'weighingRequest'"
                       border
                       stripe
                       @selection-change="handleSelectionChange"
@@ -260,7 +260,7 @@
             <el-table style="width: 950px; display: inline-block;float:left;"
                       v-loading="loading"
                       :data="tareappliList"
-                      v-if="activeTab === 'tareRequest'"
+                      v-show="activeTab === 'tareRequest'"
                       border
                       stripe
                       @selection-change="handleSelectionChange"
@@ -302,7 +302,7 @@
             <el-table style="width: 950px; display: inline-block;float:left;"
                       v-loading="loading"
                       :data="outinpoundList"
-                      v-if="activeTab === 'weightInfo'"
+                      v-show="activeTab === 'weightInfo'"
                       border
                       stripe
                       @selection-change="handleSelectionChange">
@@ -317,7 +317,7 @@
             <!-- 右下部分：历史皮重 -->
             <div style=" width: 500px; display: inline-block;float:left;position: relative;top: -29px;">
               <div>
-                <el-button class="transition-all duration-200" type="primary" size="mini" @click="handleQuery">历史皮重</el-button>
+                <el-button class="transition-all duration-200" type="primary" size="mini" @click="">历史皮重</el-button>
               </div>
               <div >
                 <el-table v-loading="historyPoundLoading"
@@ -421,10 +421,27 @@ export default {
       truepoundData: {
 
       },
+      //分页查询参数
+      queryPageParams: {
+        weighingRequest:{
+          total:0,
+          pageNum:1,
+          pageSize:10
+        },
+        tareRequest:{
+          total:0,
+          pageNum:1,
+          pageSize:10
+        },
+        weightInfo:{
+          total:0,
+          pageNum:1,
+          pageSize:10
+        },
+      },
     }
   },
   created() {
-    this.getList()
   },
   watch: {
     //监听磅点变化
@@ -557,8 +574,10 @@ export default {
       this.form.wghmqty = this.queryParams.weight;
       //获取磅点编码到前端进行展示。
       getPoundNumber().then(response => {
-        var number = response.data;
+        debugger;
+        var number = response.data.number;
         this.form.usrcode = number +"|"+this.form.carno;
+        this.form.crtdt = response.data.date;
       })
     },
     //过皮申请单击选中，并将车号进行赋值。
@@ -598,6 +617,8 @@ export default {
       }
       //将当前过皮申请的磅单赋值到字段上
       this.form.usrcode = row.usrcode;
+      //制单时间进行赋值
+      this.form.crtdt = row.crtdt;
     },
     // 生成随机重量（两位小数，避免精度问题）
     handleGetweight() {
@@ -628,7 +649,7 @@ export default {
       }
       this.handleSearchPoundappli();
       this.handleSearchTareappli();
-      if (this.poundappliList.length > 0){
+      if (this.tareappliList.length > 0){
         this.activeTab = 'tareRequest';
       }else {
         this.activeTab = 'weighingRequest';
@@ -642,9 +663,12 @@ export default {
         isinuse:"Y",
         bllstate:"1"
       };
+      thisqueryParams.pageNo = this.queryPageParams.weighingRequest.pageNum;
+      thisqueryParams.pageSize = this.queryPageParams.weighingRequest.pageSize;
       thisqueryParams.carno = this.queryParams.carno;
       listPoundappli(thisqueryParams).then(response => {
         this.poundappliList = response.rows;
+        this.queryPageParams.weighingRequest.total = response.total;
         this.loading = false;
       })
     },
@@ -656,9 +680,12 @@ export default {
         isinuse:"Y",
         billstate:"1"
       };
+      thisqueryParams.pageNo = this.queryPageParams.tareRequest.pageNum;
+      thisqueryParams.pageSize = this.queryPageParams.tareRequest.pageSize;
       thisqueryParams.carno = this.queryParams.carno;
       listPoundbill(thisqueryParams).then(response => {
         this.tareappliList = response.rows;
+        this.queryPageParams.tareRequest.total = response.total;
         this.loading = false;
       })
     },
@@ -686,6 +713,7 @@ export default {
       }
       if (this.form.wghmqty == undefined || this.form.wghmqty == ""){
         this.$message.error("请先获取毛重！(双击过磅申请)");
+        return;
       }
 
       // 弹出确认框
@@ -705,6 +733,8 @@ export default {
 
             // 磅单号
             transData.usrcode = this.form.usrcode;
+            //备注数据
+            transData.remark = this.form.remark;
 
             // 磅点信息
             transData.poundid = this.truepoundData.id;
@@ -733,6 +763,8 @@ export default {
 
             // 磅单号
             transData.usrcode = this.form.usrcode;
+            //备注数据
+            transData.remark = this.form.remark;
 
             // 磅点信息
             transData.poundid = this.truepoundData.id;
@@ -753,7 +785,7 @@ export default {
     //称皮重方法
     getempqty() {
       //先写出厂磅的逻辑
-      this.$modal.confirm('车号为:' + this.form.carno + '",皮重为:' + this.queryParams.weight).then(() => {
+      this.$modal.confirm('车号为:' + this.form.carno + ',皮重为:' + this.queryParams.weight).then(() => {
         if(this.queryParams.poundtype == "1"){
           var transData = {};
           transData.carno = this.form.carno;
@@ -775,9 +807,16 @@ export default {
             this.$message.error("请先选择过皮申请！");
             return;
           }
+          //根据磅单号来判断是否双击了过皮申请。
+          var poundbill = this.form.usrcode;
+          if (poundbill === undefined || poundbill === ""){
+            this.$message.error("请双击过皮申请！");
+            return;
+          }
           //获取选中的过皮申请的id
           var transData = {};
           transData.id = selection[0].id;
+          transData.carno = this.queryParams.carno;
           //获取皮重，净重，扣减吨位。
           transData.empmqty = this.form.empmqty;
           transData.netmqty = this.form.netmqty;