fix:优化

components/add-inquiry-dialog/index.vue

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

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" @cancel="handleInquiryCancel" :type="1"/>
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
 	</view>
 </template>
 

pages/person/index.vue

@@ -83,7 +83,6 @@ export default {
 			navbarInitTop: 0, //导航栏初始化距顶部的距离
 			isFixedTop: true, //是否固定顶部
 			background: "", // 为了实现渐变背景颜色
-			showModal: false,
 			showSwitchRole: false,
 			columns: [],
 			defaultIndex: [this.$store.state.user.currentRoleIndex],

pages/setting/index.vue

@@ -50,7 +50,7 @@
 		},
 		data() {
 			return {
-				
+				showModal: false
 			}
 		},
 		methods: {

pages/wareHouse/components/edit.vue

@@ -424,7 +424,7 @@ export default {
                     userId: this.$store.state.user.userInfo.userId,
                 })
                 this.formData = res.data
-                this.formData.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
+                this.formData.recycleTime = res.data.recycleTime ? this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') : ''
                 this.echoInfoType = res.data.type || '1'//商品分类回显
                 this.formData.type = res.data.type || '1'//商品分类校验
                 this.echoInfoProductAttribute = res.data.productAttribute || '1'//商品属性回显
@@ -439,14 +439,14 @@ export default {
                 this.echoInfoRecycleType = res.data.recycleType//回收类型回显
                 this.echoInfoRecycleSituation = res.data.recycleSituation || '0'//回收情况回显
                 this.echoInfoLabel = res.data.label//商品标签回显
-                this.recognitionContent = `品牌：${res.data.dictLabel || '-'}
-来源：${res.data.origin || '-'}
-实价：${res.data.actualPrice || '-'}
-型号：${res.data.model || '-'}
-编码：${res.data.indentifyCode || '-'}
-日期：${res.data.cardYear || '-'}
-备注：${res.data.productDesc || '-'}
-付款方式：${this.paymentTabList.find(item => item.value == res.data.payType)?.name || '-'}
+                this.recognitionContent = `品牌：${res.data.dictLabel || ''}
+来源：${res.data.origin || ''}
+实价：${res.data.actualPrice || ''}
+型号：${res.data.model || ''}
+编码：${res.data.indentifyCode || ''}
+日期：${res.data.cardYear || ''}
+备注：${res.data.productDesc || ''}
+付款方式：${this.paymentTabList.find(item => item.value == res.data.payType)?.name || ''}
 `
             }
         })
@@ -464,9 +464,13 @@ export default {
             if (this.formData.actualPrice) {
                 const actualPrice = Number(this.formData.actualPrice)
                 let obj = {}
-                // 只要账号权限里面有销售权限，就按照销售的计算规则，没有就固定计算
-                if(getRoles().includes('SALESMAN')){
-                    obj = this.xhlSystemSetList.find(item => item.agentType == 'SALESMAN') || {}
+                // 查找包含SALEMAN字符的权限
+                const roles = getRoles()
+                const salesmanRole = roles.find(role => role.toUpperCase().includes('SALEMAN'))
+                
+                // 只要账号权限里面有包含SALEMAN的权限，就按照对应权限的计算规则，没有就固定计算
+                if(salesmanRole){
+                    obj = this.xhlSystemSetList.find(item => item.agentType == salesmanRole) || {}
                 }else{
                     obj = {
                         goodsRate: 0.003,

pages/wareHouse/index.vue

@@ -51,7 +51,6 @@
 					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange"
 						@cancel="sortPickerShow = false"></u-picker>
 				</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"
@@ -61,7 +60,7 @@
 					<view class="dept-btn" @click="recycleDeptClick">
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
 					</view>
-					<ba-tree-picker :selectParent="true" v-if="deptList.length > 0" ref="recycleDeptRef" :multiple='false'
+					<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" />
@@ -256,7 +255,6 @@ export default {
 	},
 	onLoad() {
 		this.getTypeList();
-		this.getDeptListAll();
 	},
 	methods: {
 		getDeptListAll() {
@@ -277,6 +275,7 @@ export default {
 			this.handleSearch();
         },
 		recycleDeptClick() {
+			this.getDeptListAll();
             this.$refs.recycleDeptRef._show();
         },
 		showMoreOptions(goods) {

pages/wareHouse/styles/detail.scss

@@ -383,6 +383,8 @@
                 display: flex;
                 flex-direction: column;
                 gap:20rpx;
+                max-height: 500rpx;
+                overflow: auto;
                 .log_item{
                     display: flex;
                     text-align: left;