From 5777f1dae5a6a477ca40b3a1bbb9d8243cc82d0c Mon Sep 17 00:00:00 2001
From: ptt <2403326863@qq.com>
Date: Tue, 8 Jul 2025 10:53:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=80=92=E7=9F=AD=E7=A3=85=EF=BC=8C=E9=93=81?=
 =?UTF-8?q?=E6=B0=B4=E7=A3=85=E6=B7=BB=E5=8A=A0=E5=AE=8C=E6=88=90=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/moltenironpound/index.vue       | 46 ++++-----------
 .../operation/shortdispound/index.vue         | 56 ++++++-------------
 2 files changed, 30 insertions(+), 72 deletions(-)

diff --git a/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue b/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue
index cc516db..9737c0d 100644
--- a/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue
+++ b/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue
@@ -5,14 +5,6 @@
       <el-row style="display: inline-block;width: 260px">
         <el-col :span="24">
           <el-form-item label="磅点" prop="poundid" label-width="40">
-<!--            <el-select v-model="queryParams.poundid" placeholder="请选择磅点" clearable>-->
-<!--              <el-option-->
-<!--                v-for="dict in dict.type.pound"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              />-->
-<!--            </el-select>-->
             <search-select v-model="queryParams.poundid"
                            :options = "getOptionsByKey('moltenironpound')"
             ></search-select>
@@ -36,18 +28,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-form-item>
-      <!--      <el-form-item label="车号" prop="carno">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.carno"-->
-      <!--          placeholder="请输入车号"-->
-      <!--          style=""-->
-      <!--          clearable-->
-      <!--          @keyup.enter.native="handleQuery"-->
-      <!--        />-->
-      <!--        <el-button type="primary" size="mini" @click="handleQuery" style="position: absolute;left: 150px;top: 2px;">刷新</el-button>-->
-      <!--      </el-form-item>-->
       <el-form-item label="重量" prop="1aaa">
         <el-input
           v-model="queryParams.weight"
@@ -62,14 +43,6 @@
       <el-row style="display: inline-block;width: 300px">
         <el-col :span="24">
           <el-form-item label="收货单位" prop="recunitid">
-<!--            <el-select v-model="queryParams.poundid" placeholder="请选择收货单位" clearable>-->
-<!--              <el-option-->
-<!--                v-for="dict in dict.type.pound"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              />-->
-<!--            </el-select>-->
             <search-select v-model="queryPageParams.mstBill.recunitid"
                            :options = "getOptionsByKey('recunit')"
                            clearable
@@ -78,12 +51,6 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="品名" prop="itmcode">
-<!--            <el-input-->
-<!--              v-model="queryParams.poundname"-->
-<!--              placeholder="请输入品名"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
             <search-select v-model="queryPageParams.mstBill.itmcode"
                            :options = "getOptionsByKey('itmcode')"
                            clearable
@@ -108,7 +75,17 @@
             ></search-select>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row style="display: inline-block;width: 100px">
+        <el-col>
+          <el-form-item prop="sendunitid">
+            <el-checkbox
+              v-model="queryPageParams.mstBill.bllstt"
+              :true-value="'2'"
+              :false-value="'1'"
+            >完成</el-checkbox>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -721,6 +698,7 @@ export default {
           trnunitid:"",//运输单位
           sendunitid:"",//发货单位
           poundid:"",//业务磅点,java对象中存储为该字段。
+          bllstt:"1",//完成状态
         },
         poundBillDetail: {
           total: 0,
diff --git a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
index c41675f..8f775ad 100644
--- a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
+++ b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue
@@ -1,19 +1,10 @@
 <!--倒短-->
 <template>
   <div class="app-container">
-
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-row style="display: inline-block;width: 260px">
         <el-col :span="24">
           <el-form-item label="磅点" prop="poundid" label-width="40">
-<!--            <el-select v-model="queryParams.poundid" placeholder="请选择磅点" clearable>-->
-<!--              <el-option-->
-<!--                v-for="dict in dict.type.pound"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              />-->
-<!--            </el-select>-->
             <search-select v-model="queryParams.poundid"
                            :options="this.getOptionsByKey('shortdispound')"
             ></search-select>
@@ -37,22 +28,11 @@
         <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-form-item>
-<!--      <el-form-item label="车号" prop="carno">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.carno"-->
-<!--          placeholder="请输入车号"-->
-<!--          style=""-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--        <el-button type="primary" size="mini" @click="handleQuery" style="position: absolute;left: 150px;top: 2px;">刷新</el-button>-->
-<!--      </el-form-item>-->
       <el-form-item label="重量" prop="1aaa">
         <el-input
           v-model="queryParams.weight"
-          style=""
+          style="width: 150px"
           clearable
           readonly
         />
@@ -63,14 +43,6 @@
       <el-row style="display: inline-block;width: 300px">
         <el-col :span="24">
           <el-form-item label="收货单位" prop="recunitid">
-<!--            <el-select v-model="queryParams.recunitid" placeholder="请选择收货单位" clearable>-->
-<!--              <el-option-->
-<!--                v-for="dict in dict.type.pound"-->
-<!--                :key="dict.value"-->
-<!--                :label="dict.label"-->
-<!--                :value="dict.value"-->
-<!--              />-->
-<!--            </el-select>-->
             <search-select v-model="queryPageParams.mstBill.recunitid"
                            :options="getOptionsByKey('recunit')"
                            clearable
@@ -79,12 +51,6 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="品名" prop="itmcode">
-<!--            <el-input-->
-<!--              v-model="queryParams.itmcode"-->
-<!--              placeholder="请输入品名"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
             <search-select v-model="queryPageParams.mstBill.itmcode"
                            :options = "getOptionsByKey('itmcode')"
                            clearable
@@ -110,9 +76,22 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="getEmpPoundData">新增皮重</el-button>
-      </el-form-item>
+      <el-row style="display: inline-block;width: 100px">
+        <el-col>
+          <el-form-item prop="sendunitid">
+            <el-checkbox
+              v-model="queryPageParams.mstBill.bllstt"
+              :true-value="'2'"
+              :false-value="'1'"
+            >完成</el-checkbox>
+          </el-form-item>
+        </el-col>
+        <el-col>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="getEmpPoundData">新增皮重</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <!-- 主磅单信息 -->
@@ -809,6 +788,7 @@ export default {
           trnunitid:"",//运输单位
           sendunitid:"",//发货单位
           poundid:"",//业务磅点,java对象中存储为该字段。
+          bllstt:"1",//业务磅点,java对象中存储为该字段。
         },
         poundBillDetail: {
           total: 0,