feat:仓库:字段+按钮权限

pages/wareHouse/components/detail.vue

@@ -48,7 +48,7 @@
         <!-- 核心信息区域 -->
         <view class="core_info">
             <view class="section_title">核心信息</view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('dictLabel','read')">
                 <view class="info_label">品牌</view>
                 <view class="info_value" @click.stop="showBrandlList()">
                     <!-- <u-input v-if="editMode.dictLabel" v-model="tempValues.dictLabel" :autoFocus="true" @blur="!globalEditMode && saveEditField('dictLabel', tempValues.dictLabel, 'dictLabel')" /> -->
@@ -56,7 +56,7 @@
                     <BrandList ref="brandListRef" @selectedBrand="handleSelectedBrand"></BrandList>
                 </view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('model','read')">
                 <view class="info_label">型号</view>
                 <view class="info_value" @click.stop="toggleEditField('model', coreInfo.model)">
                     <u-input v-if="editMode.model" v-model="tempValues.model" :autoFocus="true"
@@ -64,7 +64,7 @@
                     <span v-else>{{ coreInfo.model || '-' }}</span>
                 </view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('indentifyCode','read')">
                 <view class="info_label">独立编码</view>
                 <view class="info_value code" @click.stop="toggleEditField('indentifyCode', coreInfo.indentifyCode)">
                     <u-input v-if="editMode.indentifyCode" v-model="tempValues.indentifyCode" :autoFocus="true"
@@ -72,23 +72,23 @@
                     <span v-else>{{ coreInfo.indentifyCode || '-' }}</span>
                 </view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('stockStatus','read')">
                 <view class="info_label">是否入库</view>
                 <view class="info_value">{{ stockStatusFormatter(coreInfo.stockStatus) }}</view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('createTime','read')">
                 <view class="info_label">入库日期</view>
                 <view class="info_value">{{ coreInfo.createTime || '-' }}</view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('payType','read')">
                 <view class="info_label">付款方式</view>
                 <view class="info_value">{{ payTypeFormatter(coreInfo.payType) }}</view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('recycleSituation','read')">
                 <view class="info_label">回收情况</view>
                 <view class="info_value">{{ recycleSituationFormatter(coreInfo.recycleSituation) }}</view>
             </view>
-            <view class="info_row col">
+            <view class="info_row col" v-if="getWarehouseFieldPermissions('desc','read')">
                 <view class="info_label">备注信息</view>
                 <view class="info_value note" @click.stop="toggleEditField('desc', coreInfo.desc)">
                     <textarea v-if="editMode.desc" v-model="tempValues.desc" :autoFocus="true" rows="3"
@@ -101,8 +101,8 @@
         <!-- 财务与价格区域 -->
         <view class="finance_price">
             <view class="section_title">财务与价格</view>
-            <view class="price_group" v-if="isWareHouser">
-                <view class="price_item">
+            <view class="price_group">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('costPrice','read')">
                     <view class="price_label">总成本价</view>
                     <view class="price_value original"
                         @click.stop="toggleEditField('costPrice', coreInfo.costPrice)">
@@ -111,7 +111,7 @@
                         <span v-else>￥{{ coreInfo.costPrice || '-' }}</span>
                     </view>
                 </view>
-                <view class="price_item">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('peerPrice','read')">
                     <view class="price_label">同行价格</view>
                     <view class="price_value additional"
                         @click.stop="toggleEditField('peerPrice', coreInfo.peerPrice)">
@@ -122,7 +122,7 @@
                 </view>
             </view>
             <view class="price_group">
-                <view class="price_item">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('agentPrice','read')">
                     <view class="price_label">代理价格</view>
                     <view class="price_value agent" @click.stop="toggleEditField('agentPrice', coreInfo.agentPrice)">
                         <u-input v-if="editMode.agentPrice" v-model="tempValues.agentPrice" :autoFocus="true"
@@ -130,7 +130,7 @@
                         <span v-else>￥{{ coreInfo.agentPrice || '-' }}</span>
                     </view>
                 </view>
-                <view class="price_item">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('price','read')">
                     <view class="price_label">官方指导价</view>
                     <view class="price_value original" @click.stop="toggleEditField('price', coreInfo.price)">
                         <u-input v-if="editMode.price" v-model="tempValues.price" :autoFocus="true"
@@ -140,8 +140,8 @@
                 </view>
                 
             </view>
-            <view class="price_group" v-if="isWareHouser">
-                <view class="price_item">
+            <view class="price_group">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('salePrice','read')">
                     <view class="price_label">销售价格</view>
                     <view class="price_value suggested"
                         @click.stop="toggleEditField('salePrice', coreInfo.salePrice)">
@@ -150,7 +150,7 @@
                         <span v-else>￥{{ coreInfo.salePrice || '-' }}</span>
                     </view>
                 </view>
-                <view class="price_item">
+                <view class="price_item" v-if="getWarehouseFieldPermissions('actualPrice','read')">
                     <view class="price_label">实价</view>
                     <view class="price_value suggested"
                         @click.stop="toggleEditField('actualPrice', coreInfo.actualPrice)">
@@ -165,7 +165,7 @@
         <!-- 溯源与位置区域 -->
         <view class="traceability_productPosition">
             <view class="section_title">溯源与位置</view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('productPosition','read')">
                 <view class="info_label">商品位置</view>
                 <view class="info_value" @click.stop="toggleEditField('productPosition', coreInfo.productPosition)">
                     <u-input v-if="editMode.productPosition" v-model="tempValues.productPosition" :autoFocus="true"
@@ -173,7 +173,7 @@
                     <span v-else>{{ coreInfo.productPosition || '-' }}</span>
                 </view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('recyclePerson','read')">
                 <view class="info_label">回收人员</view>
                 <view class="info_value" @click.stop="showRecyclePersonPicker">
                     <span>{{ coreInfo.recyclePerson || '-' }}</span>
@@ -182,7 +182,7 @@
                     </personPicker>
                 </view>
             </view>
-            <view class="info_row">
+            <view class="info_row" v-if="getWarehouseFieldPermissions('identifyingPerson','read')">
                 <view class="info_label">鉴定人员</view>
                 <view class="info_value" @click.stop="showIdentifyingPersonPicker">
                     <span>{{ coreInfo.identifyingPerson || '-' }}</span>
@@ -239,7 +239,7 @@
 import BrandList from '@/components/brand-list/index.vue'
 import personPicker from '@/components/person-picker/index.vue'
 import imgsRowScroll from '@/components/imgs-row-scroll/index.vue'
-import { permissionCheck } from '@/utils/util.js'
+import { getWarehouseButtonPermissions,getWarehouseFieldPermissions } from '@/utils/util.js'
 import { recycleSituationList } from '../js/public.js'
 export default {
     components: {
@@ -276,7 +276,6 @@ export default {
             downStatus: '',//下架状态 0：已下架 1：已上架
             showEditImgsModal: false,
             tempImgsUrl: [],
-            isWareHouser: permissionCheck('WAREHOUSER',false),
         }
     },
     onLoad(options) {
@@ -284,6 +283,8 @@ export default {
         this.getGoodsDetail();
     },
     methods: {
+        getWarehouseButtonPermissions:getWarehouseButtonPermissions,
+        getWarehouseFieldPermissions:getWarehouseFieldPermissions,
         // 分享
         handleShare() {
             uni.showToast({
@@ -379,7 +380,7 @@ export default {
         },
         // 显示品牌列表
         showBrandlList() {
-            if(!permissionCheck('WAREHOUSER')) return false
+            if(!this.getWarehouseFieldPermissions('dictValue','edit')) return false
             this.$refs.brandListRef.showBrandList();
         },
         // 处理选中品牌
@@ -487,7 +488,7 @@ export default {
         },
         // 切换单个字段的编辑状态
         toggleEditField(field, value) {
-            if(!permissionCheck('WAREHOUSER')) return false
+            if(!getWarehouseButtonPermissions('edit')) return false
             // 如果不是全局编辑模式
             if (!this.globalEditMode) {
                 // 重置所有编辑状态
@@ -508,7 +509,7 @@ export default {
         },
         // 进入全局编辑模式
         enterGlobalEdit() {
-            if(!permissionCheck('WAREHOUSER')) return false
+            if(!getWarehouseButtonPermissions('edit')) return false
             this.globalEditMode = true;
             // 设置所有可编辑字段为编辑状态
             this.editMode = {
@@ -656,7 +657,7 @@ export default {
             })
         },
         handleEditImgs() {
-            if(!permissionCheck('WAREHOUSER')) return false
+            if(!this.getWarehouseFieldPermissions('goodPicFileList','edit')) return false
             this.showEditImgsModal = true;
             this.tempImgsUrl = this.imgsUrl
         },

pages/wareHouse/components/edit.vue

@@ -26,7 +26,7 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item v-if="getWarehouseFieldPermissions('goodPicFileList','read')" :label="'商品图片('+formData.goodPicFileList.length+'张)'" required prop="goodPicFileList" borderBottom>
+                    <u-form-item v-if="getWarehouseFieldPermissions('goodPicFileList','read')" :label="'商品图片('+formData.goodPicFileList.length+'张)'" required  borderBottom>
                         <view class="imgs_scroll">
                             <DragUpload ref="dragUpload" :images="formData.goodPicFileList" :isDelete="true" :isPreview="true" @imagesChanged="goodPicFileListImagesChanged" @uploadComplete="goodPicFileListUploadComplete"></DragUpload>
                             <!-- <ImgsRowScroll  v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
@@ -276,7 +276,7 @@ import BrandList from '@/components/brand-list/index.vue'
 import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
 import DragUpload from '@/components/drag-upload/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
-import { permissionCheck,getRoles,getWarehouseFieldPermissions } from '@/utils/util.js'
+import { getRoles,getWarehouseFieldPermissions,getWarehouseButtonPermissions } from '@/utils/util.js'
 import moreInfo from './moreInfo.vue'
 import { productConditionList,productAttributeList,stockStatusList,recycleTypeList,labelList,paymentTabList,recycleSituationList } from '../js/public.js'
 export default {
@@ -400,7 +400,6 @@ export default {
             echoInfoProductCondition:'',//入库回显的时候 商品成色回显
             echoInfoStockStatus:'',//入库回显的时候 是否入库回显
             echoInfoRecycleSituation:'0',//入库回显的时候 回收情况回显
-            isWareHouser: permissionCheck('WAREHOUSER',false),
             formType: '',//表单类型 add：新增 edit：编辑
             xhlSystemSetList: [],//系统设置-列表
             productConditionList:productConditionList,
@@ -457,6 +456,7 @@ export default {
     },
     methods: {
         getWarehouseFieldPermissions,
+        getWarehouseButtonPermissions,
         getXhlSystemSetList(){
             uni.$u.api.xhlSystemSetList({
                 pageNum: 1,
@@ -506,7 +506,7 @@ export default {
             })
         },
         handleMoreInfoConfirm() {
-            if(!permissionCheck('WAREHOUSER')) return false
+            if(!this.getWarehouseButtonPermissions('edit')) return false
             this.submitForm(this.submitType)
         },
         // 提交表单

pages/wareHouse/components/fakeRegistration.vue

@@ -69,7 +69,7 @@
 </template>
 
 <script>
-import { permissionCheck } from '../../../utils/util.js'
+import { getWarehouseButtonPermissions } from '../../../utils/util.js'
 export default {
   name: 'FakeRegistration',
   data() {
@@ -118,6 +118,7 @@ export default {
     this.getWareHouseFakeList()
   },
   methods: {
+    getWarehouseButtonPermissions:getWarehouseButtonPermissions,
     handleLoadMore() {
       if (this.pageNum * this.pageSize >= this.total) {
         this.loadStatus = 'noMore'
@@ -141,7 +142,7 @@ export default {
       })
     },
     handleAdd() {
-      if(!permissionCheck('WAREHOUSER')) return false
+      if(!this.getWarehouseButtonPermissions('edit')) return false
       this.isAdd = true
       this.currentEditItem = null
       this.formData = {
@@ -172,7 +173,7 @@ export default {
       this.showEditDialog = true
     },
     handleSubmit() {
-      if(!permissionCheck('WAREHOUSER')) return false
+      if(!this.getWarehouseButtonPermissions('edit')) return false
       this.$refs.formRef.validate().then(() => {
         if (this.isAdd) {
           uni.$u.api.wareHouseFakeAdd(this.formData).then(res => {

pages/wareHouse/components/fieldPermissions.vue

@@ -426,7 +426,7 @@ export default {
 }
 
 .list-wrap {
-	max-height: 60vh;
+	max-height: 30vh;
 }
 
 .loading-wrap {

pages/wareHouse/index.vue

@@ -12,10 +12,12 @@
 					<text class="asset-value">{{ wareHouseCard.totalCost }}</text>
 				</view>
 				<view class="btn-group">
-					<u-button type="primary" shape="circle" plain size="mini" @click="navigateToFieldPermissions">字段权限</u-button>
+					<u-button v-if="isAdmin" type="primary" shape="circle" plain size="mini"
+						@click="navigateToFieldPermissions">字段权限</u-button>
 					<u-button type="success" shape="circle" plain size="mini" @click="openOrderList">开单记录</u-button>
 					<order-list ref="orderListRef"></order-list>
-					<u-button type="primary" shape="circle" plain size="mini" @click="navigateToFakeRegistration">假货登记</u-button>
+					<u-button type="primary" shape="circle" plain size="mini"
+						@click="navigateToFakeRegistration">假货登记</u-button>
 				</view>
 			</view>
 			<view class="data-cards">
@@ -39,8 +41,9 @@
 			</view>
 
 			<view class="category-tabs-wrap">
-				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666" font-size="28rpx"
-					keyName="dictLabel" border-bottom="none" @change="switchTab" class="u-tabs-custom"></u-tabs>
+				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666"
+					font-size="28rpx" keyName="dictLabel" border-bottom="none" @change="switchTab"
+					class="u-tabs-custom"></u-tabs>
 			</view>
 
 			<view class="filter-bar">
@@ -52,7 +55,8 @@
 				</view>
 				<view class="price-layout-btn">
 					<view class="price-btn" type="text" @click="priceVisibleChange">
-						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff" class="price-icon"></u-icon>
+						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff"
+							class="price-icon"></u-icon>
 						<text class="price-text">价格可见</text>
 					</view>
 					<view class="dept-btn" @click="recycleDeptClick">
@@ -61,9 +65,9 @@
 						</view>
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
 					</view>
-					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false' @select-change="deptSeletchang"
-						border title="机构部门" :localdata="deptList" valueKey="deptId" textKey="deptName" childrenKey="children"
-						:selectedValues="deptId" :personNames="deptName" />
+					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false'
+						@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
+						textKey="deptName" childrenKey="children" :selectedValues="deptId" :personNames="deptName" />
 					<view class="layout-btn" type="text" size="mini" @click="openSearchFilter">
 						<image class="filter-icon" src="/static/icons/select.png" mode="aspectFill"></image>
 						筛选
@@ -73,24 +77,28 @@
 					<searchFilter ref="searchFilter" @confirm="handleSearch"></searchFilter>
 				</view>
 			</view>
-			<u-notice-bar class="custom-notice-bar" icon="" :text="selectText" mode="closable" speed="40"></u-notice-bar>
-			<scroll-view ref="scrollView" class="goods-list" scroll-y @scrolltolower="handleLoadMore" @scroll="handleScroll"
-				enable-back-to-top>
+			<u-notice-bar class="custom-notice-bar" icon="" :text="selectText" mode="closable"
+				speed="40"></u-notice-bar>
+			<scroll-view ref="scrollView" class="goods-list" scroll-y @scrolltolower="handleLoadMore"
+				@scroll="handleScroll" enable-back-to-top>
 				<view @click.stop="clickItem(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList"
 					:key="`goods-${goodsIndex}`">
 					<u-swipe-action ref="swipeRef">
-						<u-swipe-action-item :options="swipeOptions" @click="(e) => handleSwipeClick(e, goods, goodsIndex)">
+						<u-swipe-action-item :options="swipeOptions"
+							@click="(e) => handleSwipeClick(e, goods, goodsIndex)">
 							<view class="goods-info">
-								<view class="goods-img-container" v-if="getWarehouseFieldPermissions('goodPicFileList','read')">
-									<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'" mode="aspectFill"
-										lazy-load></image>
+								<view class="goods-img-container"
+									v-if="getWarehouseFieldPermissions('goodPicFileList', 'read')">
+									<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'"
+										mode="aspectFill" lazy-load></image>
 									<!-- <image class="goods-img" src="/static/no-img.png" mode="aspectFill" lazy-load></image> -->
-									<view :class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']">
+									<view
+										:class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']">
 									</view>
 								</view>
 								<view class="info-content">
 									<view class="goods-brand">
-										<view v-if="getWarehouseFieldPermissions('dictLabel','read')">
+										<view v-if="getWarehouseFieldPermissions('dictLabel', 'read')">
 											{{ goods.dictLabel || '-' }}
 										</view>
 										<!-- <image v-if="goods.indentifyCode" src="../../static/icons/code.png"
@@ -99,35 +107,43 @@
 											{{ goods.indentifyCode || '' }}
 										</view> -->
 									</view>
-									<text class="goods-name" v-if="getWarehouseFieldPermissions('model','read')">型号：{{ goods.model || '-' }}</text>
-									<text class="goods-name" v-if="getWarehouseFieldPermissions('indentifyCode','read')">编码：{{ goods.indentifyCode || '-' }}</text>
+									<text class="goods-name" v-if="getWarehouseFieldPermissions('model', 'read')">型号：{{
+										goods.model || '-' }}</text>
+									<text class="goods-name"
+										v-if="getWarehouseFieldPermissions('indentifyCode', 'read')">编码：{{
+											goods.indentifyCode || '-' }}</text>
 									<view class="price-group">
-										<view class="price-item" v-if="getWarehouseFieldPermissions('costPrice','read')">
+										<view class="price-item"
+											v-if="getWarehouseFieldPermissions('costPrice', 'read')">
 											<text class="price-type">成本价</text>
 											<text class="price">¥{{ priceVisible ? goods.costPrice || '-' : '****'
 											}}</text>
 										</view>
-										<view class="price-item" v-if="getWarehouseFieldPermissions('salePrice','read')">
+										<view class="price-item"
+											v-if="getWarehouseFieldPermissions('salePrice', 'read')">
 											<text class="price-type">销售价</text>
 											<text class="price sales">¥{{ priceVisible ? goods.salePrice || '-' : '****'
 											}}</text>
 										</view>
-										<view class="price-item" v-if="getWarehouseFieldPermissions('peerPrice','read')">
+										<view class="price-item"
+											v-if="getWarehouseFieldPermissions('peerPrice', 'read')">
 											<text class="price-type">同行价</text>
 											<text class="price">¥{{ priceVisible ? goods.peerPrice || '-' : '****'
 											}}</text>
 										</view>
-										<view class="price-item" v-if="getWarehouseFieldPermissions('agentPrice','read')">
+										<view class="price-item"
+											v-if="getWarehouseFieldPermissions('agentPrice', 'read')">
 											<text class="price-type">代理价</text>
 											<text class="price">¥{{ priceVisible ? goods.agentPrice || '-' : '****'
 											}}</text>
 										</view>
-										<view class="price-item" v-if="getWarehouseFieldPermissions('actualPrice','read')">
+										<view class="price-item"
+											v-if="getWarehouseFieldPermissions('actualPrice', 'read')">
 											<text class="price-type">实价</text>
 											<text class="price">¥{{ priceVisible ? goods.actualPrice || '-' : '****'
 											}}</text>
 										</view>
-										<view class="price-item" v-if="getWarehouseFieldPermissions('price','read')">
+										<view class="price-item" v-if="getWarehouseFieldPermissions('price', 'read')">
 											<text class="price-type">指导价</text>
 											<text class="price">¥{{ priceVisible ? goods.price || '-' : '****' }}</text>
 										</view>
@@ -146,7 +162,8 @@
 									<view @click.stop="showMoreOptions(goods)">
 										<u-icon name="more-dot-fill" size="16" color="#666666"></u-icon>
 									</view>
-									<text class="goods-stock" v-if="getWarehouseFieldPermissions('stock','read')">数量:{{ goods.stock || 0 }}</text>
+									<text class="goods-stock" v-if="getWarehouseFieldPermissions('stock', 'read')">数量:{{
+										goods.stock || 0 }}</text>
 								</view>
 
 							</view>
@@ -154,35 +171,43 @@
 							<view class="more-info-container">
 								<view class="more-info-header" @click.stop="toggleMoreInfo(goods)">
 									<text class="more-info-title">更多信息</text>
-									<u-icon :name="goods.showMoreInfo ? 'arrow-up' : 'arrow-down'" size="14" color="#666666"></u-icon>
+									<u-icon :name="goods.showMoreInfo ? 'arrow-up' : 'arrow-down'" size="14"
+										color="#666666"></u-icon>
 								</view>
 								<transition name="more-info">
 									<view class="more-info-content" v-if="goods.showMoreInfo">
-										<view class="info-row" v-if="getWarehouseFieldPermissions('recycleTime','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('recycleTime', 'read')">
 											<text class="info-label">回收时间：</text>
 											<text class="info-value">{{ formatterTime(goods.recycleTime) }}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('warehouseDate','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('warehouseDate', 'read')">
 											<text class="info-label">入库时间：</text>
 											<text class="info-value">{{ formatterTime(goods.warehouseDate) }}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('productPosition','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('productPosition', 'read')">
 											<text class="info-label">商品位置：</text>
 											<text class="info-value">{{ goods.productPosition || '-' }}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('identifyingPerson','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('identifyingPerson', 'read')">
 											<text class="info-label">鉴定人员：</text>
 											<text class="info-value">{{ goods.identifyingPerson || '-' }}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('recyclePerson','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('recyclePerson', 'read')">
 											<text class="info-label">回收人员：</text>
 											<text class="info-value">{{ goods.recyclePerson || '-' }}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('stockStatus','read')">
+										<view class="info-row"
+											v-if="getWarehouseFieldPermissions('stockStatus', 'read')">
 											<text class="info-label">是否入库：</text>
-											<text class="info-value">{{ goods.stockStatus == '1' ? '已入库' : '未入库' }}</text>
+											<text class="info-value">{{ goods.stockStatus == '1' ? '已入库' : '未入库'
+												}}</text>
 										</view>
-										<view class="info-row" v-if="getWarehouseFieldPermissions('payType','read')">
+										<view class="info-row" v-if="getWarehouseFieldPermissions('payType', 'read')">
 											<text class="info-label">付款方式：</text>
 											<text class="info-value">{{ payFormatter(goods.payType) }}</text>
 										</view>
@@ -204,7 +229,7 @@
 <script>
 import searchFilter from './components/searchFilter.vue'
 import moreInfo from './components/moreInfo.vue'
-import { permissionCheck,getWarehouseFieldPermissions } from '../../utils/util.js'
+import { getWarehouseButtonPermissions, getWarehouseFieldPermissions,getRoles } from '../../utils/util.js'
 import orderList from './components/orderList/index.vue'
 import { paymentTabList,productAttributeList } from './js/public.js'
 import jtimePickerPopup from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue';
@@ -215,6 +240,11 @@ export default {
 		orderList,
 		jtimePickerPopup
 	},
+	computed: {
+		isAdmin() {
+			return getRoles().some(v => v.includes('admin' || 'ADMIN'))
+		}
+	},
 	data() {
 		return {
 			searchString: '',//搜索编号、名称、品牌...
@@ -304,7 +334,7 @@ export default {
 			},
 			paymentTabList: paymentTabList,
 			productAttributeList: productAttributeList,
-			selectText:'暂无筛选条件'
+			selectText: '暂无筛选条件'
 		};
 	},
 	onLoad() {
@@ -349,6 +379,7 @@ export default {
 			this.$refs.moreInfoRef.showMoreInfo();
 		},
 		getWarehouseFieldPermissions,
+		getWarehouseButtonPermissions,
 		handleMoreInfoConfirm() {
 			this.$refs.moreInfoRef.closeModal();
 		},
@@ -400,7 +431,7 @@ export default {
 			if (!attr || attr.length == 0) {
 				return '暂无'
 			}
-			return attr.map(a=>this.productAttributeList.find(b=>b.value == a))?.map(item=>item.name).join(' ') || '暂无'
+			return attr.map(a => this.productAttributeList.find(b => b.value == a))?.map(item => item.name).join(' ') || '暂无'
 		},
 		formatterStockStatus(status) {
 			if (!status) {
@@ -427,7 +458,7 @@ export default {
 		handleSwipeClick(e, item, goodsIndex) {
 			if (e.index == 0) {//删除
 				this.isSwipeClick = true;
-				if (!permissionCheck('WAREHOUSER')) return false
+				if (!this.getWarehouseButtonPermissions('delete')) return false
 				uni.$u.api.wareHouseDelete({
 					id: item.id
 				}).then(() => {
@@ -520,7 +551,7 @@ export default {
 			return false;
 		},
 	},
-	
+
 	onShow() {
 		// 尝试恢复页面状态
 		if (!this.restorePageState()) {
@@ -528,7 +559,7 @@ export default {
 			this.pageNum = 1;
 			this.getList();
 		}
-		
+
 		this.getCard();
 		// 监听数据更新事件
 		this.updateListener = uni.$on('warehouse-data-updated', () => {
@@ -542,7 +573,7 @@ export default {
 	onHide() {
 		// 页面隐藏时保存状态
 		this.savePageState();
-		
+
 		// 移除事件监听器
 		if (this.updateListener) {
 			uni.$off('warehouse-data-updated', null);

store/getters.js

@@ -16,6 +16,7 @@ const getters = {
   dialing : (state) => state.app.dialing,
   permissions: (state) => state.user.permissions,
   roles: (state) => state.user.userInfo.roles || [],
-  warehouseFieldPermissions: (state) => state.user.warehouseFieldPermissions || []
+  warehouseFieldPermissions: (state) => state.user.warehouseFieldPermissions || [],
+  warehouseButtonPermissions: (state) => state.user.warehouseButtonPermissions || []
 }
 export default getters

store/modules/user.js

@@ -47,6 +47,7 @@ export default {
 		currentRoleIndex: 0, // 当前选中的角色索引
 		showRoleSwitch: false, // 是否显示切换权限按钮
 		warehouseFieldPermissions: [], // 仓库字段权限 [{ fieldName, read, edit }, ...]，登录后按当前用户角色合并
+		warehouseButtonPermissions: [], // 仓库按钮权限 
 	},
 	mutations: {
 		SET_REDIRECTURL(state, data) {
@@ -177,6 +178,9 @@ export default {
 		SET_WAREHOUSE_FIELD_PERMISSIONS: (state, list) => {
 			state.warehouseFieldPermissions = Array.isArray(list) ? list : [];
 		},
+		SET_WAREHOUSE_BUTTON_PERMISSIONS: (state, list) => {
+			state.warehouseButtonPermissions = Array.isArray(list) ? list : [];
+		},
 		SWITCH_ROLE({}, role) {
 			setTimeout(() => {
 				const allIndices = [0, 1, 2, 3, 4, 5, 6];
@@ -233,6 +237,13 @@ export default {
 					}).catch(() => {
 						commit("SET_WAREHOUSE_FIELD_PERMISSIONS", []);
 					});
+					// 登录后拉取仓库按钮权限并存到 store（按当前用户角色合并）
+					uni.$u.api.wareHouseButtonPermissions({}).then((permRes) => {
+						const list = (permRes && permRes.data && Array.isArray(permRes.data)) ? permRes.data : [];
+						commit("SET_WAREHOUSE_BUTTON_PERMISSIONS", list);
+					}).catch(() => {
+						commit("SET_WAREHOUSE_BUTTON_PERMISSIONS", []);
+					});
 					commit("SET_BELONGSYSTEM", {
 						code: state.system.value,
 						callback: (flag) => {

utils/util.js

@@ -414,3 +414,12 @@ export function getWarehouseFieldPermissions(field,permission) {
     const permissionItem = store.state.user.warehouseFieldPermissions?.find(item=>item.fieldName === field);
     return permissionItem ? permissionItem[permission] : false;
 }
+export function getWarehouseButtonPermissions(buttonKey) {
+    const permissionItem = store.state.user.warehouseButtonPermissions?.find(item=>item.buttonKey === buttonKey);
+	console.log(permissionItem)
+	if(!permissionItem.enabled){
+		uni.$u.toast('无权限');
+	}else{
+		return true
+	}
+}