1.铁水磅前端界面调整。

2.倒短磅前端界面完善。

ruoyi-ui/src/views/measurement/basedata/truepound/index.vue

@@ -648,6 +648,9 @@ export default {
         name: [
           { required: true, message: "磅点名称不能为空", trigger: "blur" }
         ],
+        buspoundid: [
+          { required: true, message: "业务磅点不能为空", trigger: "blur" }
+        ],
       }
     }
   },

ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue

@@ -147,7 +147,7 @@
             >
               <el-table-column type="selection" width="55" align="center" />
 <!--              <el-table-column label="打印次数" align="center" prop="id" />-->
-              <el-table-column label="单号" align="center" prop="usrcode" />
+              <el-table-column label="单号" align="center" prop="usrcode" width="180"/>
               <el-table-column label="榜单日期" align="center" prop="bsndt" width="180">
                 <template slot-scope="scope">
                   <span>{{ parseTime(scope.row.bsndt, '{y}-{m}-{d}') }}</span>
@@ -317,7 +317,7 @@
               :total="queryPageParams.poundBillDetail.total"
               :page.sync="queryPageParams.poundBillDetail.pageNum"
               :limit.sync="queryPageParams.poundBillDetail.pageSize"
-              @pagination="handleSearchTareappli"
+              @pagination="queryPoundBillDetail"
             />
           </el-col>
           <el-col :span="activeTab === 'tareRequest'? 24 : 16"
@@ -897,6 +897,7 @@ export default {
       // 表单校验
       rules: {
       },
+      //存储物理磅点的相关参数
       truepoundData:{},
       //皮重相关界面参数
       empPoundFormData:{
@@ -1033,9 +1034,9 @@ watch: {
     handleMstSelectionChange(selection) {
       if (selection.length > 0){
       this.mstBillFormData.selectedIds = selection.map(item => item.id)
-      var mstId = this.mstBillFormData.selectedIds[0];
+        this.queryPoundBillDetailFirst();
-      debugger
+      }else {
-      this.queryPoundBillDetail(mstId);
+        this.mstBillFormData.selectedIds = [];
       }
     },
     // 过磅明细多选框选中数据
@@ -1106,6 +1107,8 @@ watch: {
     },
     //查询主榜单数据,分页设置为1
     handleSearchMstBillFirst(){
+      //如果没有选中磅点
+      if (!this.checkPoundSelected())return;
       this.queryPageParams.mstBill.pageNum = 1;
       this.handleSearchMstBill();
     },
@@ -1153,6 +1156,11 @@ watch: {
     getMstBillDataById(){
       debugger;
       const id = this.mstBillFormData.selectedIds[0];
+      //如果id为空或null
+      if (id == null || id === "") {
+        this.$message.error("请选择主榜单！");
+        return;
+      }
       this.resetMstBillForm();
       getPoundmst(id).then(response => {
         this.mstBillFormData.mstBillForm = response.data;
@@ -1207,13 +1215,23 @@ watch: {
       this.poundBillDetailFormData.thisSelectedRow = row;
 
     },
+    //查询过磅明细并设置页数为1
+    queryPoundBillDetailFirst(){
+      this.queryPageParams.poundBillDetail.pageNum = 1;
+      this.queryPoundBillDetail();
+    },
     //根据主榜单ID查询过磅明细。
-    queryPoundBillDetail(id){
+    queryPoundBillDetail(){
+      // 校验是否选中主榜单
+      if (this.mstBillFormData.selectedIds.length === 0) {
+        this.$message.error("请先选择主榜单！");
+        return;
+      }
       var thisQueryParams = {
         billstate:"1",
         isinuse:"Y"
       }
-      thisQueryParams.appliid = id;
+      thisQueryParams.appliid = this.mstBillFormData.selectedIds[0];
       listPoundbill(thisQueryParams).then(response => {
         this.queryPageParams.poundBillDetail.total = response.total;
         this.poundBillDetailList = response.rows;
@@ -1304,7 +1322,7 @@ watch: {
                 this.$message.success("新增榜单明细成功！");
                 this.poundBillDetailFormData.poundBillDetailOpen = false;
                 //查询榜单明细数据
-                this.queryPoundBillDetail(this.mstBillFormData.selectedIds[0]);
+                this.queryPoundBillDetailFirst();
               })
             }).catch(() => {});
           } else {
@@ -1374,7 +1392,7 @@ watch: {
                 this.$message.success("榜单明细称皮重成功！");
                 this.poundBillDetailFormData.poundBillDetailOpen = false;
                 //查询榜单明细数据
-                this.queryPoundBillDetail(this.mstBillFormData.selectedIds[0]);
+                this.queryPoundBillDetailFirst();
               })
             }).catch(() => {});
           } else {
@@ -1382,7 +1400,7 @@ watch: {
               this.$message.success("榜单明细称皮重成功！");
               this.poundBillDetailFormData.poundBillDetailOpen = false; //关闭榜单明细弹窗
               //查询榜单明细数据
-              this.queryPoundBillDetail(this.mstBillFormData.selectedIds[0]);
+              this.queryPoundBillDetailFirst();
             });
           }
         }
@@ -1396,6 +1414,13 @@ watch: {
     },
     //查询完成的榜单数据
     handleQueryPoundBillFullList(){
+      //是否选中磅点
+      if (!this.checkPoundSelected())return;
+      //是否选中主榜单
+      if (this.mstBillFormData.selectedIds.length === 0) {
+        this.$message.error("请先选择主榜单！");
+        return;
+      }
       this.poundBillFullLoading = true;
       var thisqueryParams = {
         billstate:"2",