Merge branch 'master' of http://192.168.30.2:3000/bonus/bonus-material-app

src/pages/materialsStation/index/index.vue

@@ -225,11 +225,11 @@ onShow(async () => {
   display: flex;
   // 针对平板（如宽度大于等于768px）设置不同的 padding-top
   @media (min-width: 768px) {
-    padding-top: 150rpx;
+    padding-top: 130rpx;
   }
   // 针对手机（如宽度小于768px）设置不同的 padding-top
   @media (max-width: 767px) {
-    padding-top: 100rpx;
+    padding-top: 80rpx;
   }
   .user-lef {
     width: 60px;

src/pages/materialsStation/toolsLease/codeOut.vue

@@ -114,12 +114,13 @@
               v-model="queryCodeParams.maCode"
               :localdata="codeRange"
               @change="changeCode"
+              @click="handleMaCode"
             ></uni-data-select>
           </uni-col>
         </uni-row>
       </div>
 
-      <scroll-view scroll-y style="padding-bottom: 90rpx; height: 70vh">
+      <scroll-view scroll-y style="padding-bottom: 30rpx; height: 70vh">
         <view class="table-list-item" v-for="(item, index) in codeDeviceList" :key="item.maId">
           <uni-row :gutter="24">
             <uni-col :span="6">物资类型：</uni-col>
@@ -162,9 +163,9 @@
         <view class="loading-text">
           {{ '没有更多数据了~' }}
         </view>
+        <view v-if="codeDeviceList.length > 0" class="outbound-btn" @tap="onHandleOutbound"> 添加 </view>
       </scroll-view>
     </scroll-view>
-    <view class="outbound-btn" @tap="onHandleOutbound"> 添加 </view>
   </view>
 
 </template>
@@ -307,6 +308,10 @@ const getCodeDeviceListData = async () => {
   }
 }
 
+const handleMaCode = () => {
+  isExpanded.value = false
+}
+
 const changeCode = (value) => {
   console.log('🚀 ~ changeCode ~ value:', value)
   if (!value) return
@@ -694,11 +699,11 @@ const ocrClick = () => {
 
   // 底部出库按钮
   .outbound-btn {
-    position: fixed;
-    bottom: 40rpx;
-    left: 50%;
-    transform: translateX(-50%);
-    width: 90%;
+    // position: fixed;
+    // bottom: 40rpx;
+    // left: 50%;
+    // transform: translateX(-50%);
+    // width: 90%;
     height: 88rpx;
     background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
     text-align: center;

src/pages/materialsStation/toolsLease/toolsLeaseAdd.vue

@@ -249,6 +249,10 @@ const fitNumChange = () => {
 // 编辑获取详情
 const getDetailsById = async () => {
   try {
+    uni.showLoading({
+      title: '加载中...',
+      mask: true, // 遮罩层
+    })
     const res = await detailsLeaseTask(opts.value.id)
     console.log('🚀 ~ getDetailsById ~ res:', res)
     tableData.value = res.data.leaseApplyDetailsList
@@ -261,6 +265,8 @@ const getDetailsById = async () => {
     getAgreementInfoById()
   } catch (error) {
     console.log('🚀 ~ getDetailsById ~ error:', error)
+  } finally {
+    uni.hideLoading()
   }
 }
 // 获取班组
@@ -553,7 +559,7 @@ const submit = (isOut) => {
       const res = await uni.showModal({
         title: '提示',
         content: '是否确认提交？',
-        confirmText: '确定',
+        confirmText: isOut == 0 ? '暂存' : '出库',
         cancelText: '取消',
       })
       console.log('🚀 ~ .then ~ res:', res)
@@ -600,8 +606,8 @@ const back = () => {
       .showModal({
         title: '提示',
         content: '当前有未提交的数据，是否暂存？',
-        confirmText: '确定',
-        cancelText: '取消',
+        confirmText: '暂存',
+        cancelText: '不暂存',
       })
       .then((res) => {
         if (res.confirm) {