固定高度，样式整改

src/assets/css/index.scss

@@ -7,7 +7,7 @@ body {
     width: 100vw;
     // min-height: 100vh;
     background-color: #f2f2f2;
-    max-width:500px;
+    max-width: 500px;
     margin: 0 auto;
 }
 
@@ -30,7 +30,7 @@ li {
     color: #FF655B;
 }
 
-.cl-yl{
+.cl-yl {
     color: #FFB800;
 }
 
@@ -118,6 +118,7 @@ li {
     overflow-x: auto;
     padding: 0 12px;
     box-sizing: border-box;
+
     table {
         width: 100%;
         border-collapse: collapse;
@@ -204,8 +205,8 @@ li {
     border-radius: 0 !important;
 }
 
-.van-field__label--top{
-    color:#666!important;
+.van-field__label--top {
+    color: #666 !important;
 }
 
 .van-form {
@@ -215,33 +216,34 @@ li {
 
 
 .commons-delete {
-    display: flex!important;
-    padding: 5px 15px!important;
-    justify-content: space-between!important;
-    align-items: center!important;
-    color: #999999!important;
+    display: flex !important;
+    padding: 5px 15px !important;
+    justify-content: space-between !important;
+    align-items: center !important;
+    color: #999999 !important;
     background-color: #f2f2f2;
 
     .title {
-        flex: 1!important;
+        flex: 1 !important;
     }
 
     .delete {
-        width: 20px!important;
-        cursor: pointer!important;
-        text-align: center!important;
+        width: 20px !important;
+        cursor: pointer !important;
+        text-align: center !important;
     }
 }
 
-.commons-add-btn{
-    button{
-        border:none!important;
+.commons-add-btn {
+    button {
+        border: none !important;
     }
 }
 
-:root{
-    --van-field-label-width:10.2em!important;
+:root {
+    --van-field-label-width: 10.2em !important;
 }
+
 .has-bottombar:after {
     content: '';
     z-index: 9998;
@@ -254,14 +256,24 @@ li {
     border-radius: 8px;
 }
 
-.common-process-card{
+.common-process-card {
     margin: 16px 12px;
     background: #fff;
 
 }
 
-.van-tabbar--fixed,.van-tabbar{
-    z-index: 10000!important;
+.van-tabbar--fixed,
+.van-tabbar {
+    z-index: 10000 !important;
 }
 
 
+.iosListBox {
+    height: calc(100vh - 180px);
+    overflow-y: auto;
+}
+
+.androidListBox {
+    height: calc(100vh - 160px);
+    overflow-y: auto;
+}

src/main.js

@@ -1,13 +1,29 @@
-import { createApp } from "vue";
+import {
+  createApp
+} from "vue";
 import App from "./App.vue";
 import router from "./router";
 import i18n from "@/lang/";
-import { moneyFormat, getDictOne, compareTime, dictValueLabel, formChange, formChangeTwo, deepClone } from "@/utils/util";
+import {
+  moneyFormat,
+  getDictOne,
+  compareTime,
+  dictValueLabel,
+  formChange,
+  formChangeTwo,
+  deepClone
+} from "@/utils/util";
 const app = createApp(App);
 app.use(router);
 app.use(i18n).mount("#app");
-import { uploadDdRightBtn } from "@/utils/ddAdapter";
-import { post, get } from "@/utils/axios";
+import {
+  uploadDdRightBtn
+} from "@/utils/ddAdapter";
+import {
+  post,
+  get
+} from "@/utils/axios";
+
 
 import store from './store'
 
@@ -29,8 +45,12 @@ app.config.globalProperties.formChangeTwo = formChangeTwo;
 app.config.globalProperties.deepClone = deepClone;
 //pinia
 app.use(store);
-
-
+import useDeviceStore from "@/store/device";
+const deviceStore = useDeviceStore();
+// 是否是ios系统
+const u = navigator.userAgent;
+deviceStore.isIosSysteme = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+app.config.globalProperties.isIosSysteme = deviceStore.isIosSysteme
 //中英文全局挂载
 app.config.globalProperties.t = i18n.global.t;
-export default app;
+export default app;

src/views/customer/file/index.vue

@@ -3,13 +3,16 @@
     <template #right>{{ $t("common.add") }}</template>
   </van-nav-bar>
   <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="getList" style="margin-bottom: 60px">
-        <commonList :data="listData" @onClick="toDtl" :config="listConfig"></commonList>
-      </van-list>
-    </div>
-  </van-pull-refresh>
+  <div :class="[isIosSysteme?'iosListBox':'androidListBox']">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="getList" style="margin-bottom: 60px">
+          <commonList :data="listData" @onClick="toDtl" :config="listConfig"></commonList>
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
+
 </template>
 <script setup>
 import { ref, getCurrentInstance } from "vue";
@@ -46,11 +49,15 @@ const getList = (type) => {
         res.data.rows = res.data.rows.map((item) => {
           return {
             ...item,
-            cityText: item.countryName + "," + item.provinceName + "," + item.cityName,
+            cityText:
+              item.countryName + "," + item.provinceName + "," + item.cityName,
           };
         });
       }
-      listData.value = type === "refresh" ? res.data.rows : listData.value.concat(res.data.rows);
+      listData.value =
+        type === "refresh"
+          ? res.data.rows
+          : listData.value.concat(res.data.rows);
       if (req.value.pageNum * 10 >= res.data.total) {
         finished.value = true;
       }

src/views/processApproval/index.vue

@@ -1,34 +1,17 @@
 <template>
-  <van-nav-bar
-    :title="$t('processApproval.name')"
-    left-text=""
-    left-arrow
-    @click-left="onClickLeft"
-    @click-right="onClickRight"
-  >
+  <van-nav-bar :title="$t('processApproval.name')" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight">
   </van-nav-bar>
-  <van-search
-    v-model="req.keyword"
-    :placeholder="$t('common.pleaseEnterKeywords')"
-    @search="onRefresh"
-  />
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        :finished-text="$t('common.noMore')"
-        @load="onLoad"
-        style="margin-bottom: 60px"
-      >
-        <commonList
-          :data="listData"
-          @onClick="toDtl"
-          :config="listConfig"
-        ></commonList>
-      </van-list>
-    </div>
-  </van-pull-refresh>
+  <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
+  <div :class="[isIosSysteme?'iosListBox':'androidListBox']">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+          <commonList :data="listData" @onClick="toDtl" :config="listConfig"></commonList>
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
+
 </template>
 <script setup>
 import { ref, getCurrentInstance, onMounted } from "vue";

src/views/purchase-sales/inbound-outbound/manyGoods/index.vue

@@ -3,40 +3,45 @@
     <!-- <template #right> 添加 </template> -->
   </van-nav-bar>
   <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
-        <commonList :data="listData" @onClick="toDtl" :config="listConfig" :showMore="false">
-          <template #businessType="{row}">
-            <div style="width:100%">
-              {{dictValueLabel(row.businessType,businessType)}}
-            </div>
-          </template>
-          <template #logistics="{row}">
-            <div style="width:100%">
-              {{ row.logisticsCompanyName }} (
-              <span style="cursor: pointer; color: #409eff"> {{ row.logisticsCode }} </span>
-              )
-            </div>
-          </template>
+  <div :class="[isIosSysteme?'iosListBox':'androidListBox']">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+          <commonList :data="listData" @onClick="toDtl" :config="listConfig" :showMore="false">
+            <template #businessType="{row}">
+              <div style="width:100%">
+                {{dictValueLabel(row.businessType,businessType)}}
+              </div>
+            </template>
+            <template #logistics="{row}">
+              <div style="width:100%">
+                {{ row.logisticsCompanyName }} (
+                <span style="cursor: pointer; color: #409eff"> {{ row.logisticsCode }} </span>
+                )
+              </div>
+            </template>
 
-          <template #processingMethod="{row}">
-            <div style="width:100%">
-              <span> {{dictValueLabel(row.processingMethod,statusData)}}</span>
-            </div>
-          </template>
+            <template #processingMethod="{row}">
+              <div style="width:100%">
+                <span> {{dictValueLabel(row.processingMethod,statusData)}}</span>
+              </div>
+            </template>
+
+          </commonList>
+          <div></div>
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
 
-        </commonList>
-        <div></div>
-      </van-list>
-    </div>
-  </van-pull-refresh>
 </template>
 <script setup>
 import { ref, getCurrentInstance, onMounted } from "vue";
 import commonList from "@/components/common-list.vue";
 import { useRoute } from "vue-router";
 import { showSuccessToast, showConfirmDialog } from "vant";
+import useDeviceStore from "@/store/device";
+const deviceStore = useDeviceStore();
 
 const loading = ref(false);
 const router = useRoute();
@@ -178,7 +183,7 @@ const handleEndInbound = (row) => {
 
 <style lang="scss" scoped>
 .list {
-  min-height: 70vh;
+  min-height: 100%;
 }
 .aa {
   background: #fa9841;

src/views/purchase-sales/inbound-outbound/waitInbound/add.vue

@@ -38,8 +38,8 @@
             </tr>
           </thead>
         </table>
-        <div style="height:calc(100vh - 280px);overflow-y:auto"
-             :style="{height:!deviceStore.isIosSysteme?'calc(100vh - 280px)':'calc(100vh - 300px)'}">
+        <div style="height:calc(100vh - 283px);overflow-y:auto"
+             :style="{height:!deviceStore.isIosSysteme?'calc(100vh - 283px)':'calc(100vh - 303px)'}">
           <table class="table" v-if="!keyword">
             <tbody>
               <template v-for="(row,index) in formData.stockWaitDetailsList" :key="row.id">
@@ -384,9 +384,9 @@ const onSearch = (val) => {
   for (let i = 0; i < list.length; i++) {
     const row = list[i];
     if (
-      row.productCustomCode.indexOf(val) != -1 ||
-      row.productName.indexOf(val) != -1 ||
-      row.productSpec.indexOf(val) != -1
+      row.productCustomCode.toUpperCase().indexOf(val.toUpperCase()) != -1 ||
+      row.productName.toUpperCase().indexOf(val.toUpperCase()) != -1 ||
+      row.productSpec.toUpperCase().indexOf(val.toUpperCase()) != -1
     ) {
       formData.value.stockWaitDetailsListCopy.push({ ...row });
     }
@@ -429,6 +429,7 @@ const onSearch = (val) => {
     text-align: center;
     color: #000;
   }
+
   td {
     text-align: center;
     padding: 6px 2px;
@@ -446,7 +447,7 @@ const onSearch = (val) => {
   thead tr th {
     text-align: center;
     padding: 6px 2px;
-    height: 30px;
+    height: 20px;
     color: #000;
   }
   td {
@@ -455,4 +456,7 @@ const onSearch = (val) => {
     height: 30px;
   }
 }
+:deep(.van-field) {
+  padding: 5px 10px;
+}
 </style>

src/views/purchase-sales/inbound-outbound/waitInbound/index.vue

@@ -3,48 +3,52 @@
     <!-- <template #right> 添加 </template> -->
   </van-nav-bar>
   <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
-        <commonList :data="listData" :config="listConfig" :showMore="false">
-          <template #businessType="{row}">
-            <div style="width:100%">
-              {{dictValueLabel(row.businessType,businessType)}}
-            </div>
-          </template>
-          <template #logistics="{row}">
-            <div style="width:100%">
-              {{ row.logisticsCompanyName }} (
-              <span style="cursor: pointer; color: #409eff"> {{ row.code }} </span>
-              )
-            </div>
-          </template>
+  <div :class="[isIosSysteme?'iosListBox':'androidListBox']">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+          <commonList :data="listData" :config="listConfig" :showMore="false">
+            <template #businessType="{row}">
+              <div style="width:100%">
+                {{dictValueLabel(row.businessType,businessType)}}
+              </div>
+            </template>
+            <template #logistics="{row}">
+              <div style="width:100%">
+                {{ row.logisticsCompanyName }} (
+                <span style="cursor: pointer; color: #409eff"> {{ row.code }} </span>
+                )
+              </div>
+            </template>
 
-          <template #status="{row}">
-            <div style="width:100%">
-              <span :class="{'aa':row.status=='1'}"> {{dictValueLabel(row.status,statusData)}}</span>
-            </div>
-          </template>
+            <template #status="{row}">
+              <div style="width:100%">
+                <span :class="{'aa':row.status=='1'}"> {{dictValueLabel(row.status,statusData)}}</span>
+              </div>
+            </template>
 
-          <template #btn="{row}">
-            <div style="width:100%;text-align:right">
-              <van-button type="primary" size="small" style="margin-right:10px" @click="toDtl(row)">入库</van-button>
-              <van-button type="default" size="small" @click="handleEndInbound(row)">结束入库</van-button>
-            </div>
-          </template>
+            <template #btn="{row}">
+              <div style="width:100%;text-align:right">
+                <van-button type="primary" size="small" style="margin-right:10px" @click="toDtl(row)">入库</van-button>
+                <van-button type="default" size="small" @click="handleEndInbound(row)">结束入库</van-button>
+              </div>
+            </template>
+
+          </commonList>
+          <div></div>
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
 
-        </commonList>
-        <div></div>
-      </van-list>
-    </div>
-  </van-pull-refresh>
 </template>
 <script setup>
 import { ref, getCurrentInstance, onMounted } from "vue";
 import commonList from "@/components/common-list.vue";
 import { useRoute } from "vue-router";
 import { showSuccessToast, showConfirmDialog } from "vant";
-
+import useDeviceStore from "@/store/device";
+const deviceStore = useDeviceStore();
 const loading = ref(false);
 const router = useRoute();
 const req = ref({
@@ -187,7 +191,7 @@ const handleEndInbound = (row) => {
 
 <style lang="scss" scoped>
 .list {
-  min-height: 70vh;
+  min-height: 100%;
 }
 .aa {
   background: #fa9841;

src/views/purchase-sales/inbound-outbound/waitInbound/manyGoods.vue

@@ -37,7 +37,7 @@
         </table>
 
         <div style="height:calc(100vh - 445px);overflow-y:auto"
-             :style="{height:!deviceStore.isIosSysteme?'calc(100vh - 445px)':'calc(100vh - 465px)'}">
+             :style="{height:!deviceStore.isIosSysteme?'calc(100vh - 448px)':'calc(100vh - 468px)'}">
           <table class="table">
             <tbody>
               <template v-for="(row,index) in formData.productList" :key="row.id">
@@ -74,7 +74,8 @@
                     </div>
                     <div v-show="row.isArrow" style="margin-top:5px;margin-bottom:10px">
                       <div style="display:flex;margin-bottom:8px ;align-items:center">
-                        <van-field v-model="row.addQuantity" type="digit" label="" placeholder="请输入临时登记数量" style="background-color:#f7f7f7;" />
+                        <van-field v-model="row.addQuantity" type="digit" label="" class="aa" placeholder="请输入临时登记数量"
+                                   style="background-color:#f7f7f7;" />
                         <van-button type="success" size="small" style="width:60px;margin-left:10px" @click="handleStag(row,index)">暂存</van-button>
                       </div>
                       <div>
@@ -112,7 +113,7 @@
 
       </van-cell-group>
 
-      <div style="margin: 5px">
+      <div style="margin-top: 5px;padding:0 5px">
         <van-button round block type="primary" native-type="submit" style="height:30px">
           {{$t('common.submit')}}
         </van-button>
@@ -348,7 +349,7 @@ const openSelectGood = () => {
   thead tr th {
     text-align: center;
     padding: 6px 2px;
-    height: 30px;
+    height: 20px;
     color: #000;
   }
   td {
@@ -357,4 +358,7 @@ const openSelectGood = () => {
     height: 30px;
   }
 }
+:deep(.van-field.aa) {
+  padding: 5px 10px;
+}
 </style>

src/views/purchase-sales/inbound-outbound/waitInbound/selectGood.vue

@@ -3,20 +3,23 @@
     <!-- <template #right> {{$t('common.add')}} </template> -->
   </van-nav-bar>
   <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
-        <!-- @onClick="toDtl" -->
-        <commonList :data="listData" :config="listConfig" :showMore="false">
-          <template #btn="{row}">
-            <div style="width:100%;text-align:right">
-              <van-button type="primary" size="small" @click="selectRow(row)">选择</van-button>
-            </div>
-          </template>
-        </commonList>
-      </van-list>
-    </div>
-  </van-pull-refresh>
+  <div :class="[isIosSysteme?'iosListBox':'androidListBox']">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+          <!-- @onClick="toDtl" -->
+          <commonList :data="listData" :config="listConfig" :showMore="false">
+            <template #btn="{row}">
+              <div style="width:100%;text-align:right">
+                <van-button type="primary" size="small" @click="selectRow(row)">选择</van-button>
+              </div>
+            </template>
+          </commonList>
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
+
 </template>
 <script setup>
 import { ref, getCurrentInstance } from "vue";
@@ -151,6 +154,6 @@ const selectRow = (row) => {
 
 <style lang="scss" scoped>
 .list {
-  min-height: 70vh;
+  min-height: 100%;
 }
 </style>

src/views/purchase-sales/inventory-management/Inventory/index.vue

@@ -71,7 +71,8 @@
                   </div>
                   <div v-show="row.isArrow" style="margin-top:5px;margin-bottom:10px">
                     <div style="display:flex;margin-bottom:8px ;align-items:center">
-                      <van-field v-model="row.addQuantity" type="digit" label="" placeholder="请输入临时盘点数量" style="background-color:#f7f7f7;" />
+                      <van-field v-model="row.addQuantity" type="digit" label="" class="aa" placeholder="请输入临时盘点数量"
+                                 style="background-color:#f7f7f7;" />
                       <van-button type="success" size="small" style="width:60px;margin-left:10px" @click="handleStag(row,index)">暂存</van-button>
                     </div>
                     <div>
@@ -324,7 +325,7 @@ const onSubmit = () => {
   font-size: 11px;
 }
 .list {
-  min-height: 70vh;
+  min-height: 100%;
 }
 .main-box {
   padding: 12px 16px 0 16px;
@@ -358,7 +359,7 @@ const onSubmit = () => {
   thead tr th {
     text-align: center;
     padding: 6px 2px;
-    height: 30px;
+    height: 20px;
     color: #000;
   }
   td {
@@ -372,4 +373,8 @@ const onSubmit = () => {
   box-shadow: none !important;
   height: 54px !important;
 }
+
+:deep(.van-field.aa) {
+  padding: 5px 10px;
+}
 </style>

src/views/purchase-sales/inventory-management/inventoryQuery/index.vue

@@ -7,26 +7,29 @@
     <van-tab :title="'按产品'" name="second"></van-tab>
     <van-tab :title="'按SPU'" name="three"></van-tab>
   </van-tabs>
-  <van-pull-refresh v-model="loading" @refresh="onRefresh">
-    <div class="list">
-      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
-        <commonList :data="listData" :config="listConfig" :showMore="false">
-          <template #productUnit="{row}">
-            <div style="width:100%">
-              {{dictValueLabel(row.productUnit,productUnit)}}
-            </div>
-          </template>
-          <template #btn="{row}">
-            <div style="width:100%;text-align:right">
-              <van-button type="primary" size="small" style="margin-right:10px" @click="toDtl(row,true)">良转次</van-button>
-              <van-button type="primary" size="small" @click="toDtl(row,false)">次转良</van-button>
-            </div>
-          </template>
-        </commonList>
-        <!-- @onClick="toDtl" -->
-      </van-list>
-    </div>
-  </van-pull-refresh>
+  <div style="overflow-y:auto" :style="{height:!deviceStore.isIosSysteme?'calc(100vh - 205px)':'calc(100vh - 225px)'}">
+    <van-pull-refresh v-model="loading" @refresh="onRefresh">
+      <div class="list">
+        <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="onLoad" style="margin-bottom: 60px">
+          <commonList :data="listData" :config="listConfig" :showMore="false">
+            <template #productUnit="{row}">
+              <div style="width:100%">
+                {{dictValueLabel(row.productUnit,productUnit)}}
+              </div>
+            </template>
+            <template #btn="{row}">
+              <div style="width:100%;text-align:right">
+                <van-button type="primary" size="small" style="margin-right:10px" @click="toDtl(row,true)">良转次</van-button>
+                <van-button type="primary" size="small" @click="toDtl(row,false)">次转良</van-button>
+              </div>
+            </template>
+          </commonList>
+          <!-- @onClick="toDtl" -->
+        </van-list>
+      </div>
+    </van-pull-refresh>
+  </div>
+
   <van-popup v-model:show="openPopup" position="bottom" :style="{ height: '370px' }" closeable>
     <div style="padding:10px">
       <van-form @submit="onSubmit" label-align="top">
@@ -50,7 +53,8 @@ import { useRoute } from "vue-router";
 import { getUserInfo } from "@/utils/auth";
 import { showSuccessToast, showFailToast } from "vant";
 import TitleInfo from "@/components/TitleInfo/index.vue";
-
+import useDeviceStore from "@/store/device";
+const deviceStore = useDeviceStore();
 const loading = ref(false);
 const router = useRoute();
 const req = ref({
@@ -321,6 +325,6 @@ getList();
 
 <style lang="scss" scoped>
 .list {
-  min-height: 70vh;
+  min-height: 100%;
 }
 </style>