feat:权限添加ADMIN字符判断、线索公海询价完成刷新列表、仓库排版优化

components/add-inquiry-dialog/index.vue

@@ -55,6 +55,7 @@ export default {
         },
 	},
     emits: ['submitSuccess'],
+    inject: ['refreshData'],
 	data() {
 		return {
 			showModal: false,
@@ -166,6 +167,7 @@ export default {
                 uni.$u.toast(this.type == 1 ? "询价成功" : "核价成功")
                 this.closeDialog()
                 this.$emit('submitSuccess')
+                if(this.type == 1 && this.clueId !== '') this.refreshData.resetData(); //线索公海页面需要刷新列表
             }).catch((err) => {
                 uni.$u.toast(err)
             })

pages/clue/mixins/clue.js

@@ -2,7 +2,13 @@ import pullUpRefresh from "@/utils/pullUpRefresh";
 import dayjs from "dayjs";
 export default {
 	mixins: [pullUpRefresh],
-
+	provide() {
+		return {
+			refreshData: {
+				resetData: this.resetData
+			}
+		}
+	},
 	computed: {
 		currentIndex() {
 			return this.queryParams.type == 1 ? 0 : 1;
@@ -397,6 +403,11 @@ export default {
 				url: `/pages/clueDetail/index?clueId=${id}&name=${name}&type=${this.queryParams.type}`,
 			});
 		},
+		inquirySuccess() {
+			console.log('inquirySuccess');
+			
+			this.resetData();
+		},
 		async getList() {
 			const {
 				pageNum,

pages/clue/post/index.vue

@@ -64,7 +64,7 @@
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
 			<view>发单</view>
 		</view>
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :editOrAdd="editOrAdd" :editInfo="editInfo" @success="handleInquirySuccess" @cancel="handleInquiryCancel" :type="1"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
 	</view>
 </template>
 
@@ -189,10 +189,6 @@ export default {
 				this.$refs.inquiryDialog.showDialog()
 			}
 		},
-		// 询价成功
-		handleInquirySuccess() {
-			this.$refs.inquiryDialog.closeDialog()
-		},
 		// 询价取消
 		handleInquiryCancel() {
 			this.$refs.inquiryDialog.closeDialog()

pages/privateClue/index.vue

@@ -36,7 +36,7 @@
 			<show-emtry v-if="listData.length === 0"></show-emtry>
 			<view class="case_main_wrap" v-else>
 				<post v-for="(item,index) in listData" :key="item.id + index" :item="item" :dicts="dicts"
-					:type="queryParams.type" @click.native="handleToDetail(item)">
+					:type="queryParams.type" @click.native="handleToDetail(item)" @inquirySuccess="inquirySuccess">
 				</post>
 				<u-loadmore :status="finished ? 'nomore' : loadStatus" icon line />
 			</view>

pages/wareHouse/components/edit.vue

@@ -9,7 +9,7 @@
                 </view>
             </u-navbar>
             <view class="form_list">
-                <u--form labelPosition="top" :model="formData" :rules="rules" ref="addForm" labelWidth="100%">
+                <u--form labelPosition="top" :model="formData" :rules="rules" ref="addForm" labelWidth="auto">
                     <u-form-item borderBottom class="u-form-item-col">
                         <u--textarea v-model="recognitionContent" placeholder='品牌：-
 来源：-
@@ -26,7 +26,7 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item label="商品图片" required prop="goodPicFileList" borderBottom>
+                    <u-form-item :label="'商品图片(' + (formData.goodPicFileList.length || 0) + '张)'" required prop="goodPicFileList" borderBottom>
                         <view class="imgs_scroll">
                             <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
@@ -83,7 +83,7 @@
                             @tabChange="handleTabChangeProductCondition" :colNum="2" mode="single" :echoInfo="echoInfoProductCondition">
                         </TabSelect>
                     </u-form-item>
-                    <u-form-item label="细节图" borderBottom>
+                    <u-form-item :label="'细节图(' + (formData.detailPicFileList.length || 0) + '张)'" borderBottom>
                         <!-- <view class="detail_pic_container"> -->
                         <!-- <view>
                                 <text class="tip">视频：</text>
@@ -175,7 +175,7 @@
                         <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员"
                             @selectPerson="handleSelectRecyclePerson"></PersonPicker>
                     </u-form-item>
-                    <u-form-item label="回收留底图" borderBottom>
+                    <u-form-item :label="'回收留底图(' + (formData.recycleBottomFileList.length || 0) + '张)'" borderBottom>
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.recycleBottomDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>
@@ -217,7 +217,7 @@
                         <u--input v-model="formData.cardYear" placeholder="不填写默认空白保卡" clearable
                             border="none"></u--input>
                     </u-form-item>
-                    <u-form-item label="保卡图片或独立编码照片留底(仅内部人员可见)" borderBottom>
+                    <u-form-item :label="'保卡图片或独立编码照片留底(' + (formData.productCardPicFileList.length || 0) + '张)'" borderBottom>
                         <view class="imgs_scroll">
                             <ImgsRowScroll v-if="formData.productCardPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteProductCardPicInfo" imgMode="aspectFill" :totalWidth="400"
@@ -234,7 +234,7 @@
                         <u--input v-model="formData.productAttachment" placeholder="请输入" clearable
                             border="none"></u--input>
                     </u-form-item>
-                    <u-form-item label="备注(仅内部人员可见)" borderBottom>
+                    <u-form-item :label="'备注(' + (formData.productDescPicFileList.length || 0) + '张)'" borderBottom>
                         <view class="recycle_bottom_desc">
                             <u--textarea v-model="formData.productDesc" clearable count autoHeight maxlength="250"
                                 height="100" confirmType="done"></u--textarea>

pages/wareHouse/index.vue

@@ -83,16 +83,16 @@
 								<view class="info-content">
 									<view class="goods-brand">
 										<view>
-											{{ goods.dictLabel || '' }}
+											{{ goods.dictLabel || '-' }}
 										</view>
-										<image v-if="goods.indentifyCode" src="../../static/icons/code.png"
+										<!-- <image v-if="goods.indentifyCode" src="../../static/icons/code.png"
 											class="code-icon" mode="aspectFill" lazy-load></image>
 										<view>
 											{{ goods.indentifyCode || '' }}
-										</view>
+										</view> -->
 									</view>
-									<text class="goods-name">{{ goods.model || '' }}</text>
-
+									<text class="goods-name">型号：{{ goods.model || '-' }}</text>
+									<text class="goods-name">编码：{{ goods.indentifyCode || '-' }}</text>
 									<view class="price-group">
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">成本价</text>

pages/wareHouse/styles/index.scss

@@ -320,6 +320,7 @@
 
       .info-content {
         flex: 1;
+        line-height: 1.4;
 
         .goods-brand {
           font-size: 32rpx;
@@ -341,7 +342,7 @@
           font-size: 26rpx;
           color: #666666;
           display: block;
-          font-weight: 600;
+          font-weight: 550;
           line-height: 1.4;
           word-break: break-all;
         }

store/modules/user.js

@@ -60,7 +60,7 @@ export default {
 			
 			const validRoles = [];
 			
-			const hasAdminRole = roles.some(role => role.roleKey === 'admin');
+			const hasAdminRole = roles.some(role => role.roleKey && role.roleKey.includes('admin' || 'ADMIN'));
 			const hasCrmRole = roles.some(role => role.roleKey && role.roleKey.includes('CRM'));
 			const hasWarehouser = roles.some(role => role.roleKey === 'WAREHOUSER');
 			const hasSalesman = roles.some(role => role.roleKey === 'SALESMAN');
@@ -92,13 +92,6 @@ export default {
 				});
 				const currentRole = validRoles[0] || '';
 				switch (currentRole) {
-					case 'admin':
-						// 展示首页、线索公海、销售线索、接单中心、我的
-						uni.setTabBarItem({ index: 0, visible: true }); // 首页
-						uni.setTabBarItem({ index: 1, visible: true }); // 线索公海
-						uni.setTabBarItem({ index: 5, visible: true }); // 销售线索
-						uni.setTabBarItem({ index: 6, visible: true }); // 接单中心
-						break;
 					case 'WAREandSALE':
 						// 展示仓库、核价中心、询价中心、我的
 						uni.setTabBarItem({ index: 2, visible: true }); // 仓库