fix：提交

components/add-inquiry-dialog/index.vue

@@ -178,13 +178,13 @@ export default {
                 })
                 return
             }
-            // if(this.info.imgsUrl.length == 0){
-            //     uni.showToast({
-            //         title: '请上传图片',
-            //         icon: 'none'
-            //     })
-            //     return
-            // }
+            if(this.info.imgsUrl.length == 0){
+                uni.showToast({
+                    title: '请上传图片',
+                    icon: 'none'
+                })
+                return
+            }
             const data = {
                 clueId: this.clueId,
                 dictValue: this.info.dictValue,

components/brand-list/index.scss

@@ -1,12 +1,14 @@
 .brand_list_page {
     width: 100vw;
-    // height: 100vh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
+    position: relative;
+    
     .brand_list {
         background-color: #fff;
         padding: 20rpx;
-        flex-shrink: 0;
 
         .u-nav-slot {
             display: flex;
@@ -26,7 +28,7 @@
                 align-items: center;
 
                 .brand_img {
-                    width: 160rpx;
+                    width: 140rpx;
                     height: 80rpx;
                 }
 
@@ -38,19 +40,26 @@
         }
 
     }
+    
     .index_list{
         flex: 1;
-        overflow: auto;
+        overflow: hidden;
+        
         ::v-deep uni-scroll-view{
-            height: calc(100vh - 216rpx);
+            height: 100%;
+            overflow: auto;
+            
             .uni-scroll-view-content{
                 padding-bottom: 120rpx;
             }
         }
     }
+    
     .u-index-list{
         height: 100%;
+        overflow: hidden;
     }
+    
     .no_brand{
         position:fixed;
         bottom:0;
@@ -59,11 +68,22 @@
         padding: 20rpx;
         background-color: #fff;
         z-index: 1;
+        
         ::v-deep .u-button__text{
             color: #108cff;
         }
     }
 }
+
+// 确保整个页面没有滚动条
+body {
+    overflow: hidden;
+}
+
+// 确保 u-popup 内部也没有滚动条
+::v-deep .brand_list_popup {
+    overflow: hidden;
+}
 ::v-deep .u-index-anchor{
     background-color: #efefef !important;
 }
@@ -78,7 +98,7 @@
     padding: 16rpx;
     border-bottom: 1rpx solid #f0eded;
     .brand_img{
-        width: 160rpx;
+        width: 140rpx;
         height: 80rpx;
     }
 }

components/brand-list/index.vue

@@ -58,11 +58,16 @@ export default {
         }
     },
     methods: {
-        handleSearch(val) {
-            if(val){
-                this.filterData(this.list.filter(item => item.dictLabel.includes(this.keyword)))
-            }else{
-                this.filterData(this.list)
+        handleSearch() {
+            const keyword = this.keyword.trim().toLowerCase();
+            if (keyword) {
+                const filteredList = this.list.filter(item => {
+                    const brandName = (item.dictLabel || '').toLowerCase();
+                    return brandName.includes(keyword);
+                });
+                this.filterData(filteredList);
+            } else {
+                this.filterData(this.list);
             }
         },
         handleBrandClick(brand) {
@@ -91,14 +96,61 @@ export default {
             this.indexList = processedData.indexList
         },
         processBrandData(data) {
-            // 1. 首先按 isDefault 排序（true 的排在前面），然后按 dictLabel 字母排序
+            // 1. 按每个字符的拼音首字母排序
             const sortedData = data.sort((a, b) => {
-                // isDefault 为 true 的排在前面
-                if (a.isDefault !== b.isDefault) {
-                    return b.isDefault - a.isDefault
+                const labelA = a.dictLabel || ''
+                const labelB = b.dictLabel || ''
+                const maxLength = Math.max(labelA.length, labelB.length)
+                
+                // 逐个字符比较
+                for (let i = 0; i < maxLength; i++) {
+                    const charA = labelA[i] || ''
+                    const charB = labelB[i] || ''
+                    
+                    // 检查是否为英文字符
+                    const isEnglishA = /[a-zA-Z]/.test(charA)
+                    const isEnglishB = /[a-zA-Z]/.test(charB)
+                    
+                    if (isEnglishA && isEnglishB) {
+                        // 都是英文，直接比较（忽略大小写）
+                        const upperA = charA.toUpperCase()
+                        const upperB = charB.toUpperCase()
+                        if (upperA !== upperB) {
+                            return upperA.localeCompare(upperB)
+                        }
+                    } else if (isEnglishA) {
+                        // 只有A是英文，英文排在前面
+                        return -1
+                    } else if (isEnglishB) {
+                        // 只有B是英文，英文排在前面
+                        return 1
+                    } else {
+                        // 都不是英文，比较拼音首字母
+                        let pinyinA = ''
+                        let pinyinB = ''
+                        
+                        try {
+                            pinyinA = chineseToPinYin(charA).charAt(0).toUpperCase()
+                        } catch (error) {
+                            pinyinA = '#'
+                        }
+                        
+                        try {
+                            pinyinB = chineseToPinYin(charB).charAt(0).toUpperCase()
+                        } catch (error) {
+                            pinyinB = '#'
+                        }
+                        
+                        if (pinyinA !== pinyinB) {
+                            if (pinyinA === '#') return 1
+                            if (pinyinB === '#') return -1
+                            return pinyinA.localeCompare(pinyinB)
+                        }
+                    }
                 }
-                // 如果 isDefault 相同，则按 dictLabel 字母顺序排序
-                return a.dictLabel.localeCompare(b.dictLabel, 'zh-CN')
+                
+                // 如果所有字符都相同，则按长度排序
+                return labelA.length - labelB.length
             })
 
             // 2. 按首字母分组
@@ -109,21 +161,22 @@ export default {
                 let firstLetter
                 const label = item.dictLabel || ''
                 
-                if (/[a-zA-Z]/.test(label.charAt(0))) {
-                    // 英文字母开头，使用大写首字母
-                    firstLetter = label.charAt(0).toUpperCase()
-                } else {
-                    // 中文字符，使用拼音首字母
-                    try {
-                        const pinyin = chineseToPinYin(label)
-                        if (pinyin && pinyin.length > 0 && /[a-zA-Z]/.test(pinyin.charAt(0).toUpperCase())) {
+                try {
+                    const firstChar = label.charAt(0) || ''
+                    if (/[a-zA-Z]/.test(firstChar)) {
+                        // 英文直接使用大写
+                        firstLetter = firstChar.toUpperCase()
+                    } else {
+                        // 中文使用拼音首字母
+                        const pinyin = chineseToPinYin(firstChar)
+                        if (pinyin && pinyin.length > 0 && /[a-zA-Z]/.test(pinyin.charAt(0))) {
                             firstLetter = pinyin.charAt(0).toUpperCase()
                         } else {
                             firstLetter = '#'
                         }
-                    } catch (error) {
-                        firstLetter = '#'
                     }
+                } catch (error) {
+                    firstLetter = '#'
                 }
 
                 // 创建字母分组

components/inquiry-verification-list/index.vue

@@ -31,7 +31,6 @@
                     </view>
                 </view>
             </view>
-            <show-empty v-if="list.length === 0"></show-empty>
         </scroll-view>
 
         <add-inquiry-dialog ref="addInquiryDialog" editOrAdd="edit" :editInfo="editInfo" :type="type" @submitSuccess="onRefresh"/>

components/inquiry-verification-list/styles/index.scss

@@ -1,23 +1,27 @@
 .inquiry_wrap {
     background-color: #f9fafb;
-    // height: 100vh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;
+    overflow: hidden;
 
     .list_wrap {
         flex: 1;
+        height: 100%;
+        overflow: hidden;
+        padding: 20rpx 0;
 
         ::v-deep .uni-scroll-view {
-            height: calc(100vh - 250rpx);
+            height: 100%;
         }
 
         .list_item {
             margin: 0 20rpx;
+            margin-bottom:20rpx;
             padding: 30rpx;
             background-color: #fff;
             border-radius: 20rpx;
-            margin-bottom: 20rpx;
             box-shadow: 2px 2px 11px 1px #e7e7e7;
 
             .list_item_top {

components/person-picker/index.vue

@@ -41,16 +41,41 @@ export default {
               values,
               picker = this.$refs.uPicker
           } = e
-          // 当前项不是用户，且有子级，添加下一层
-          if(!value[columnIndex].isUser){
-            picker.setColumnValues(columnIndex+1, value[columnIndex].children);
-          }else{
-            // 当前是用户且同等级的其他项有子级，则添加下一层空数据
-            values[columnIndex].forEach((item, index) => {
-              if(!item.isUser){
-                picker.setColumnValues(columnIndex+1, []);
+          
+          // 清除当前层级之后的所有层级
+          if (this.columns.length > columnIndex + 1) {
+              this.columns = this.columns.slice(0, columnIndex + 1);
+          }
+          
+          // 自动展开后续所有层级
+          let currentItem = value[columnIndex];
+          let currentLevel = columnIndex;
+          
+          // 循环检查并添加后续层级，直到遇到用户或没有子级
+          while (currentItem && !currentItem.isUser && currentItem.children && currentItem.children.length > 0) {
+              // 添加下一层级
+              picker.setColumnValues(currentLevel + 1, currentItem.children);
+              if (this.columns.length <= currentLevel + 1) {
+                  this.columns.push(currentItem.children);
+              } else {
+                  this.columns[currentLevel + 1] = currentItem.children;
+              }
+              
+              // 检查下一层级的第一个元素是否可以继续展开
+              // 只自动展开第一个元素的层级，模拟常见的组织架构展开逻辑
+              if (currentItem.children[0] && !currentItem.children[0].isUser && currentItem.children[0].children && currentItem.children[0].children.length > 0) {
+                  currentItem = currentItem.children[0];
+                  currentLevel++;
+              } else {
+                  break;
+              }
+          }
+          
+          // 如果当前是用户或没有子级，确保后续层级为空
+          if (currentItem && (currentItem.isUser || !currentItem.children || currentItem.children.length === 0)) {
+              if (this.columns.length > currentLevel + 1) {
+                  this.columns = this.columns.slice(0, currentLevel + 1);
               }
-            })
           }
         },
     recyclePersonClick() {

pages/wareHouse/components/add.vue

@@ -26,7 +26,7 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item required label="商品图片" prop="goodPicFileList" borderBottom>
+                    <u-form-item label="商品图片" required prop="goodPicFileList" borderBottom>
                         <view class="imgs_scroll">
                             <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
@@ -266,7 +266,7 @@ export default {
     },
     data() {
         return {
-            checkboxValue: [],
+            checkboxValue: [''],
             recognitionContent: '',
             formData: {
                 goodPicFileList: [],//商品图片
@@ -317,7 +317,7 @@ export default {
             continuousWarehousing: [],//是否连续入库 1：是 0：否
             rules: {
                 goodPicFileList: [
-                    { required: true, message: '请上传商品图片', trigger: 'change' },
+                    { required: true, message: '请上传商品图片' },
                 ],
                 desc: [
                     { required: true, message: '请输入商品描述', trigger: 'blur' },

pages/wareHouse/components/detail.vue

@@ -295,20 +295,17 @@ export default {
                 id: this.goodsId,
                 lockStatus: this.lockStatus === '1' ? '0' : '1',
             }).then(res => {
-                if(res.code === 200){
-                    uni.showToast({
-                        type: "success",
-                        title: this.lockStatus === '1' ? '解锁成功' : '锁单成功',
-                        icon: 'success'
-                    })
-                    this.getGoodsDetail();
-                }else{
-                    uni.showToast({
-                        type: "error",
-                        title: res.msg || '操作失败',
-                        icon: false
-                    })
-                }
+                uni.showToast({
+                    type: "success",
+                    title: this.lockStatus === '1' ? '解锁成功' : '锁单成功',
+                    icon: 'success'
+                })
+                this.getGoodsDetail();
+            }).catch((error) => {
+                uni.showToast({
+                    title: error || '操作失败',
+                    icon: 'none'
+                })
             })
         },
         showRecyclePersonPicker() {
@@ -405,6 +402,11 @@ export default {
                     icon: 'success'
                 })
                 this.getGoodsDetail();
+            }).catch(() => {
+                uni.showToast({
+                    title: '操作失败',
+                    icon: 'none'
+                })
             })
         },
         // 切换单个字段的编辑状态
@@ -473,8 +475,6 @@ export default {
                 identifyingPerson: info.identifyingPerson,
                 identifyingPersonId: info.identifyingPersonId,
             }
-            console.log('修改图片',data);
-            
             uni.$u.api.wareHouseUpdate(data).then(res => {
                 uni.showToast({
                     title: '编辑成功',
@@ -482,6 +482,11 @@ export default {
                 });
                 this.getGoodsDetail();
                 this.$emit('editSuccess')
+            }).catch(() => {
+                uni.showToast({
+                    title: '操作失败',
+                    icon: 'none'
+                })
             })
         },
         // 点击页面其他地方保存所有编辑

pages/wareHouse/components/openOrder.vue

@@ -260,22 +260,16 @@ export default {
                   payTypeProofPicFileList: this.payTypeProofPicFileList,
                   amountReceived: Number(this.openOrderForm.dealPrice) * Number(this.openOrderForm.quantity),
                }
-               uni.$u.api.wareHouseOpenOrder(data).then(res => {
-                  if (res.code === 200) {
-                     uni.$u.toast("开单成功");
-                     setTimeout(() => {
-                        uni.navigateBack({
-                              delta: 2
-                        });
-                     }, 1000);
-                  } else {
-                     uni.$u.toast(res.msg);
-                  }
-               }).catch(() => {
-                  uni.$u.toast("开单失败");
+               uni.$u.api.wareHouseOpenOrder(data).then(() => {
+                  uni.$u.toast("开单成功");
+                  setTimeout(() => {
+                     uni.navigateBack({
+                           delta: 2
+                     });
+                  }, 1000);
+               }).catch((error) => {
+                  uni.$u.toast(error);
                })
-               console.log('提交成功', this.openOrderForm);
-
             }
          })
       },

pages/wareHouse/styles/index.scss

@@ -1,13 +1,18 @@
 /* 页面容器 */
 .page{
   width: 100%;
+  height: 100vh;
   background-color: #fff;
+  display: flex;
+  flex-direction: column;
 }
 .page-container {
-  // padding: 8rpx 15rpx;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   background-color: #f9fafb;
-  // min-height: 100vh;
   padding-bottom:20rpx;
+  overflow: hidden;
 }
 .nav-bar{
   border-bottom: 1px solid #f7f6f6 !important;
@@ -234,12 +239,15 @@
 
 /* 商品列表 */
 .goods-list {
+  flex: 1;
   display: flex;
   flex-direction: column;
   gap: 10rpx;
   background-color: #f9fafb;
+  overflow: hidden;
+  height: 100%;
   ::v-deep .uni-scroll-view{
-    height: calc(100vh - 850rpx);
+    height: 100%;
   }
   .goods-item {
     margin: 10rpx 15rpx;

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip