fix:1.4.2优化项

manifest.json

@@ -2,8 +2,8 @@
     "name" : "小葫芦",
     "appid" : "__UNI__DDAE2E0",
     "description" : "",
-    "versionName" : "1.4.1",
-    "versionCode" : 141,
+    "versionName" : "1.4.2",
+    "versionCode" : 142,
     "transformPx" : false,
     "app-plus" : {
         "webView" : {

pages.json

@@ -30,7 +30,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationStyle": "custom"
 			}
@@ -153,7 +153,7 @@
 			"path": "pages/publicClue/index",
 			"style": {
 				"navigationBarTitleText": "线索公海",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},

pages/clue/components/trend.vue

@@ -14,23 +14,23 @@
             <view class="card-container" v-if="cardData.length > 0">
                 <view class="card-item" v-for="(item, index) in cardData" :key="index">
                     <view class="card-row">
-                        <span class="card-label">型号：</span>
+                        <span class="card-label">型号:</span>
                         <span class="card-value">{{ item.model }}</span>
                     </view>
                     <view class="card-row">
-                        <span class="card-label">日期：</span>
+                        <span class="card-label">日期:</span>
                         <span class="card-value">{{ item.recycleTime }}</span>
                     </view>
                     <view class="card-row">
-                        <span class="card-label">价格：</span>
+                        <span class="card-label">价格:</span>
                         <span class="card-value">{{ item.price }}元</span>
                     </view>
                     <view class="card-row">
-                        <span class="card-label">回收情况：</span>
+                        <span class="card-label">回收情况:</span>
                         <span class="card-value">{{ item.recycleSituation }}</span>
                     </view>
                     <view class="card-row">
-                        <span class="card-label">备注：</span>
+                        <span class="card-label">备注:</span>
                         <span class="card-value">{{ item.remark || '-' }}</span>
                     </view>
                 </view>
@@ -348,6 +348,10 @@ export default {
             return item ? item.name : '-'
         },
         handleChartClick(event) {
+            if (!event.currentIndex || event.currentIndex.index === undefined) {
+                this.cardData = [];
+                return;
+            }
             const index = event.currentIndex.index;
             // 获取点击的日期
             const date = this.chartData.categories[index];
@@ -357,7 +361,7 @@ export default {
             const cardData = [];
             this.chartData.series.forEach(series => {
                 const price = series.data[index];
-                if (price !== null) {
+                if (price !== null && price !== undefined) {
                     cardData.push({
                         model: this.model,
                         price: price,
@@ -431,6 +435,8 @@ export default {
     border-radius: 8rpx;
     padding: 16rpx;
     box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
+    display:grid;
+    grid-template-columns: 1fr 1fr;
 }
 
 .card-row {

pages/index/components/workingAchievement/index.vue

@@ -72,7 +72,7 @@
 				this.clueStateList = data;
 			},
 			dateSelectChange(queryParams){
-				queryParams.type = this.type;
+				queryParams.type = this.type
 				this.statisticsCaseState(queryParams);
 			},
 			handleToClue(){

pages/index/index.vue

@@ -28,8 +28,8 @@
 			</view> -->
 		</u-sticky>
 		<view class="main_warp" id="main_warp">
-			<team :class="[activeTab !== 'team' ? 'hidden' : '' ]"	ref="team"></team>
-			<personage :class="[activeTab !== 'personage' ? 'hidden' : '' ]" ref="personage"></personage>
+			<team :class="[activeTab !== 'team' ? 'hidden' : '' ]"	ref="teamRef"></team>
+			<personage :class="[activeTab !== 'personage' ? 'hidden' : '' ]" ref="personageRef"></personage>
 		</view>
 
 	</view>
@@ -68,6 +68,14 @@
 				this.activeTab = value;
 			}
 		},
+		onPullDownRefresh() {
+			if (this.activeTab === 'team') {
+				this.$refs.teamRef.refresh();
+			} else if (this.activeTab === 'personage') {
+				this.$refs.personageRef.refresh();
+			}
+			uni.stopPullDownRefresh();
+		},
 	}
 </script>
 

pages/index/personage/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<working-achievement :list="clueStateList" type="2"></working-achievement>
+		<working-achievement :list="clueStateList" type="2" ref="workingAchievementRef"></working-achievement>
 		<briefReport ref="teamReport" type="2"></briefReport>
 	</view>
 </template>
@@ -34,6 +34,10 @@
 			async teamReportInit(){
 				this.$refs.teamReport.handleInit();
 			},
+			refresh(){
+				this.$refs.workingAchievementRef.dateSelectChange({type : "2"});
+				this.$refs.teamReport.dateSelectChange({type : "2"});
+			}
 		},
 		mounted() {
 		}

pages/index/team/index.vue

@@ -45,7 +45,7 @@
 				</view>
 			</view>
 		</view>
-		<working-achievement type="1"></working-achievement>
+		<working-achievement type="1" ref="workingAchievementRef"></working-achievement>
 		<briefReport type="1" ref="teamReport"></briefReport>
 		<filterQuery ref="filter" v-model="promotionStatsQueryParams" @getList="selectPromotionStats"></filterQuery>
 	</view>
@@ -102,6 +102,11 @@
 			},
 			handleInit(){
 				this.selectPromotionStats();
+			},
+			refresh(){
+				this.handleInit();
+				this.$refs.workingAchievementRef.dateSelectChange({type : "1"});
+				this.$refs.teamReport.dateSelectChange({type : "1"});
 			}
 		},
 		mounted() {

pages/person/cards/index.vue

@@ -266,13 +266,11 @@ export default {
         },
     },
     mounted() {
-        if (this.$store.state.user.userInfo.userId === '12234') {
-            this.getCardData();
-            this.getClueList();
-            this.$nextTick(() => {
-                this.getChartData();
-            })
-        }
+        this.getCardData();
+        this.getClueList();
+        this.$nextTick(() => {
+            this.getChartData();
+        })
     },
 
 };

pages/wareHouse/components/detail.vue

@@ -335,6 +335,7 @@ export default {
         },
         // 锁单
         lockGoods() {
+            if(!this.getWarehouseButtonPermissions('lockOrder')) return false
             if (this.globalEditMode) {
                 uni.showToast({
                     title: '编辑状态下不能操作',
@@ -403,6 +404,7 @@ export default {
         },
         // 打开销售业务开单页面
         handleOpenOrder() {
+            if(!getWarehouseButtonPermissions('openOrder')) return false
             if (this.lockStatus === '1') {
                 uni.showToast({
                     title: '已锁单，不能开单',
@@ -445,6 +447,7 @@ export default {
             this.submitEdit(this.coreInfo)
         },
         viewLog() {
+            if(!getWarehouseButtonPermissions('viewLog')) return false
             uni.$u.api.wareHouseLog({
                 id: this.goodsId,
                 userId: this.$store.state.user.userInfo.userId,
@@ -456,6 +459,7 @@ export default {
 
         // 立即下架按钮
         handleOffShelf() {
+            if(!getWarehouseButtonPermissions('shelf')) return false
             if (this.lockStatus === '1') {
                 uni.showToast({
                     title: '已锁单，不能下架',

pages/wareHouse/components/edit.vue

@@ -178,7 +178,7 @@
                         <Cell :val="formData.recyclePerson" :isDelete="true" @handleClear="clear('recyclePerson')"></Cell>
                         <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员" @selectPerson="handleSelectRecyclePerson"></PersonPicker>
                     </u-form-item>
-                    <u-form-item :label="'回收留底图(' + (formData.recycleBottomFileList.length || 0) + '张)'" borderBottom>
+                    <u-form-item v-if="getWarehouseFieldPermissions('recycleBottomDesc','read') || getWarehouseFieldPermissions('recycleBottomFileList','read')" :label="'回收留底图(' + (formData.recycleBottomFileList.length || 0) + '张)'" borderBottom>
                         <view class="recycle_bottom_desc">
                             <u--textarea v-if="getWarehouseFieldPermissions('recycleBottomDesc','read')" v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
@@ -239,7 +239,7 @@
                         <u--input v-model="formData.productAttachment" placeholder="请输入" clearable
                             border="none"></u--input>
                     </u-form-item>
-                    <u-form-item  :label="'备注(' + (formData.productDescPicFileList.length || 0) + '张)'" borderBottom>
+                    <u-form-item v-if="getWarehouseFieldPermissions('productDesc','read') || getWarehouseFieldPermissions('productDescPicFileList','read')" :label="'备注(' + (formData.productDescPicFileList.length || 0) + '张)'" borderBottom>
                         <view class="recycle_bottom_desc">
                             <u--textarea v-if="getWarehouseFieldPermissions('productDesc','read')" v-model="formData.productDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>

pages/wareHouse/components/fieldPermissions.vue

@@ -27,10 +27,6 @@
 						<text class="input-label">角色Key</text>
 						<u--input v-model="formRoleKey" placeholder="如 WAREHOUSER" border="surround"></u--input>
 					</view>
-				</view>
-				<view class="btn-row">
-					<u-button type="error" plain size="small" :disabled="!currentRoleId"
-						@click="clearConfig">清空该角色配置</u-button>
 					<u-button type="primary" size="small" :loading="loadConfigLoading"
 						@click="loadConfig">加载配置</u-button>
 				</view>
@@ -83,6 +79,10 @@
 				<view class="section-head">
 					<text class="section-title">按钮权限</text>
 					<view class="btn-group">
+						<u-button type="success" plain size="mini" 
+							:disabled="!currentRoleId || buttonPermissionList.length === 0" @click="openAllButtonPermissions">一键全开</u-button>
+						<u-button type="error" plain size="mini" 
+							:disabled="!currentRoleId || buttonPermissionList.length === 0" @click="closeAllButtonPermissions">一键全关</u-button>
 						<u-button type="primary" size="mini" :loading="saveLoading"
 							:disabled="!currentRoleId || !buttonPermissionList.length" @click="saveButtonConfig">保存配置</u-button>
 					</view>
@@ -177,6 +177,9 @@ export default {
 					const list = (res && res.data) ? (Array.isArray(res.data) ? res.data : []) : [];
 					this.roleList = list.map((r) => ({ roleId: r.roleId, roleName: r.roleName || r.roleKey || '', roleKey: r.roleKey || '' }));
 					this.roleIndex = 0;
+					if (this.roleList.length > 0) {
+						this.loadConfig();
+					}
 				})
 				.catch(() => {
 					this.roleList = [];
@@ -185,6 +188,7 @@ export default {
 		onRoleChange(e) {
 			this.roleIndex = e.detail.value;
 			this.permissionList = [];
+			this.loadConfig()
 		},
 		loadConfig() {
 			const roleId = this.currentRoleId;
@@ -267,6 +271,8 @@ export default {
 				return;
 			}
 			this.saveLoading = true;
+			console.log(this.buttonPermissionList);
+			
 			uni.$u.api.wareHouseButtonPermissionsConfigSave({
 				roleId,
 				roleKey,
@@ -322,6 +328,20 @@ export default {
 			});
 			uni.$u.toast('已关闭所有权限');
 		},
+		// 一键打开所有按钮权限
+		openAllButtonPermissions() {
+			this.buttonPermissionList.forEach(item => {
+				item.enabled = true;
+			});
+			uni.$u.toast('已打开所有按钮权限');
+		},
+		// 一键关闭所有按钮权限
+		closeAllButtonPermissions() {
+			this.buttonPermissionList.forEach(item => {
+				item.enabled = false;
+			});
+			uni.$u.toast('已关闭所有按钮权限');
+		},
 	},
 };
 </script>
@@ -435,16 +455,10 @@ export default {
 			}
 		}
 	}
-
-	.btn-row {
-		display: flex;
-		gap: 20rpx;
-		// flex-wrap: wrap;
-	}
 }
 
 .list-wrap {
-	max-height: 30vh;
+	max-height: 35vh;
 }
 
 .loading-wrap {

pages/wareHouse/components/searchFilter.vue

@@ -36,6 +36,11 @@
             <u-form-item label="是否入库" labelWidth="70">
                 <TabSelect :tabList="stockStatusListAll" :colNum="4" :echoInfo="formData.stockStatus" mode="single" @tabChange="handleTabChangeStockStatus"></TabSelect>
             </u-form-item>
+			<u-form-item label="排序方式" labelWidth="70" @click="openSortPicker">
+				<Cell :val="curSortType.label" :isDelete="false" :border="true"></Cell>
+                <u-picker ref="sortPicker" :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange"
+                    @cancel="sortPickerShow = false"></u-picker>
+			</u-form-item>
         </u--form>
         <view class="btns">
             <u-button text="重置" @click="resetForm"></u-button>
@@ -85,6 +90,41 @@ export default {
             // 将导入的变量在data中重新定义，确保模板能够访问
             productAttributeList: productAttributeList,
             stockStatusListAll: stockStatusListAll,
+			curSortType: {
+				id: 4,
+				label: '按入库最新',
+			},
+			sortPickerShow: false,
+			sortColumns: [[
+				{
+					label: '按最久未下载',
+					id: 1
+				},
+				{
+					label: '按最近更新',
+					id: 2
+				},
+				{
+					label: '按最久更新',
+					id: 3
+				},
+				{
+					label: '按入库最新',
+					id: 4
+				},
+				{
+					label: '按入库最久',
+					id: 5
+				},
+				{
+					label: '按价格最高',
+					id: 6
+				},
+				{
+					label: '按价格最低',
+					id: 7
+				},
+			]],
            
         }
     },
@@ -93,7 +133,9 @@ export default {
     emits: [],
     methods: {
         handleSearch() {
-            this.$emit('confirm', this.formData);
+			const filters = { ...this.formData, sortType: this.curSortType.id };
+			const text = this.generateSelectText(filters);
+            this.$emit('confirm', { filters, text });
             this.close();
         },
         resetForm() {
@@ -112,6 +154,8 @@ export default {
                 productAttribute: [],
                 stockStatus: '',
             };
+			this.time = '';
+			this.$emit('confirm', { filters: this.formData, text: '' });
         },
         open() {
             this.show = true
@@ -189,6 +233,38 @@ export default {
         handleTabChangeStockStatus(e) {
             this.formData.stockStatus = e;
         },
+		openSortPicker() {
+			this.sortPickerShow = true;
+			const selectedIndex = this.sortColumns[0].findIndex(item => item.id === this.curSortType.id);
+			this.$nextTick(() => {
+				this.$refs.sortPicker.setIndexs(selectedIndex > -1 ? [selectedIndex] : [0]);
+			});
+		},
+		handleSortChange(e) {
+			this.curSortType = e.value[0];
+			this.sortPickerShow = false;
+		},
+		generateSelectText(filters) {
+			let parts = [];
+			if (filters.dictLabel) parts.push(`品牌: ${filters.dictLabel}`);
+			if (filters.minPrice || filters.maxPrice) parts.push(`实价范围: ${filters.minPrice || '不限'} - ${filters.maxPrice || '不限'}`);
+			if (filters.location) parts.push(`位置: ${filters.location}`);
+			if (filters.startTime || filters.endTime) parts.push(`回收时间: ${filters.startTime || ''} 至 ${filters.endTime || ''}`);
+			if (filters.recyclePerson) parts.push(`回收人员: ${filters.recyclePerson}`);
+			if (filters.identifyingPerson) parts.push(`鉴定人员: ${filters.identifyingPerson}`);
+			if (filters.productAttribute && filters.productAttribute.length > 0) {
+				const attrNames = filters.productAttribute.map(val => {
+					const item = this.productAttributeList.find(i => i.value === val);
+					return item ? item.name : '';
+				}).filter(Boolean).join(', ');
+				if (attrNames) parts.push(`商品属性: ${attrNames}`);
+			}
+			if (filters.stockStatus) {
+				const status = this.stockStatusListAll.find(i => i.value === filters.stockStatus);
+				if (status) parts.push(`是否入库: ${status.name}`);
+			}
+			return parts.join(' | ');
+		},
     }
 }
 </script>

pages/wareHouse/styles/index.scss

@@ -265,6 +265,10 @@
         color: #333;
         font-size: 24rpx;
       }
+      .sort-text {
+        font-size: 22rpx;
+        color: #333;
+      }
     }
   }
 }

utils/util.js

@@ -417,7 +417,7 @@ export function getWarehouseFieldPermissions(field,permission) {
 export function getWarehouseButtonPermissions(buttonKey) {
     const permissionItem = store.state.user.warehouseButtonPermissions?.find(item=>item.buttonKey === buttonKey);
 	if(!permissionItem || !permissionItem.enabled){
-		uni.$u.toast('无权限');
+		uni.$u.toast('此用户无权限,请联系管理员添加权限!');
 		return false;
 	}else{
 		return true