Browse Source

Merge branch 'feature_20250408_物料发放频次' into uat(dev)

zhujindu 8 months ago
parent
commit
9db6e03574

+ 10 - 1
src/views/deviceOutside/suishenbangOutstoreVisit.vue

@@ -130,7 +130,7 @@
       <el-table :data="wuliaoList" border style="width: 100%">
         <el-table-column label="物料名称" prop="materialDataName" align="center" />
         <el-table-column label="发放时间" prop="issuerTime" align="center" />
-        <el-table-column label="发放数量" prop="inventoryNum" width="60" align="center" />
+        <el-table-column label="数量" prop="inventoryNum" width="60" align="center" />
       </el-table>
     </el-dialog>
   </div>
@@ -930,8 +930,17 @@ export default {
   align-items: center;
   background: rgba(0, 0, 0, 0.5) !important;
   .wuliaoTable {
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    height: 70%;
+    .el-dialog__header {
+      height: 40px;
+    }
     .el-dialog__body {
       padding: 30px 20px !important;
+      overflow-y: auto;
+      flex: 1;
     }
     .cell {
       font-size: 12px;

+ 1 - 1
src/views/deviceWithin/addStoreVisit.vue

@@ -4795,7 +4795,7 @@ export default {
                   .confirm({
                     title: '提示',
                     message: res.msg,
-                    confirmButtonText: '仍要上传',
+                    confirmButtonText: '仍要发放',
                   })
                   .then(() => {
                     this.stillDistribute = true;