소스 검색

fix:优化

zhangxin 1 개월 전
부모
커밋
365c12a5f5

+ 10 - 2
components/add-inquiry-dialog/index.vue

@@ -53,9 +53,17 @@ export default {
53
             type: Number,
53
             type: Number,
54
             default: 1
54
             default: 1
55
         },
55
         },
56
+        isClue: {
57
+            type: Boolean,
58
+            default: false
59
+        },
56
 	},
60
 	},
57
     emits: ['submitSuccess'],
61
     emits: ['submitSuccess'],
58
-    inject: ['refreshData'],
62
+    inject: {
63
+        refreshData: {
64
+            default: null
65
+        }
66
+    },
59
 	data() {
67
 	data() {
60
 		return {
68
 		return {
61
 			showModal: false,
69
 			showModal: false,
@@ -167,7 +175,7 @@ export default {
167
                 uni.$u.toast(this.type == 1 ? "询价成功" : "核价成功")
175
                 uni.$u.toast(this.type == 1 ? "询价成功" : "核价成功")
168
                 this.closeDialog()
176
                 this.closeDialog()
169
                 this.$emit('submitSuccess')
177
                 this.$emit('submitSuccess')
170
-                if(this.type == 1 && this.clueId !== '') this.refreshData.resetData(); //线索公海页面需要刷新列表
178
+                if(this.isClue && this.refreshData) this.refreshData.resetData(); //线索公海页面需要刷新列表
171
             }).catch((err) => {
179
             }).catch((err) => {
172
                 uni.$u.toast(err)
180
                 uni.$u.toast(err)
173
             })
181
             })

+ 1 - 1
pages/clue/post/index.vue

@@ -64,7 +64,7 @@
64
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
64
 			<image src='/static/publicClue/littlePlane.png' mode="aspectFit" class="sendOrder_img"></image>
65
 			<view>发单</view>
65
 			<view>发单</view>
66
 		</view>
66
 		</view>
67
-		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
67
+		<add-inquiry-dialog ref="inquiryDialog" :clueId="clueId" :isClue="true" :editOrAdd="editOrAdd" :editInfo="editInfo" @cancel="handleInquiryCancel" :type="1"/>
68
 	</view>
68
 	</view>
69
 </template>
69
 </template>
70
 
70
 

+ 0 - 1
pages/person/index.vue

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

+ 1 - 1
pages/setting/index.vue

@@ -50,7 +50,7 @@
50
 		},
50
 		},
51
 		data() {
51
 		data() {
52
 			return {
52
 			return {
53
-				
53
+				showModal: false
54
 			}
54
 			}
55
 		},
55
 		},
56
 		methods: {
56
 		methods: {

+ 16 - 12
pages/wareHouse/components/edit.vue

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

+ 2 - 3
pages/wareHouse/index.vue

@@ -51,7 +51,6 @@
51
 					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange"
51
 					<u-picker :show="sortPickerShow" :columns="sortColumns" keyName="label" @confirm="handleSortChange"
52
 						@cancel="sortPickerShow = false"></u-picker>
52
 						@cancel="sortPickerShow = false"></u-picker>
53
 				</view>
53
 				</view>
54
-
55
 				<view class="price-layout-btn">
54
 				<view class="price-layout-btn">
56
 					<view class="price-btn" type="text" @click="priceVisibleChange">
55
 					<view class="price-btn" type="text" @click="priceVisibleChange">
57
 						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff"
56
 						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff"
@@ -61,7 +60,7 @@
61
 					<view class="dept-btn" @click="recycleDeptClick">
60
 					<view class="dept-btn" @click="recycleDeptClick">
62
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
61
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
63
 					</view>
62
 					</view>
64
-					<ba-tree-picker :selectParent="true" v-if="deptList.length > 0" ref="recycleDeptRef" :multiple='false'
63
+					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false'
65
 							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
64
 							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
66
 							textKey="deptName" childrenKey="children" :selectedValues="deptId"
65
 							textKey="deptName" childrenKey="children" :selectedValues="deptId"
67
 							:personNames="deptName" />
66
 							:personNames="deptName" />
@@ -256,7 +255,6 @@ export default {
256
 	},
255
 	},
257
 	onLoad() {
256
 	onLoad() {
258
 		this.getTypeList();
257
 		this.getTypeList();
259
-		this.getDeptListAll();
260
 	},
258
 	},
261
 	methods: {
259
 	methods: {
262
 		getDeptListAll() {
260
 		getDeptListAll() {
@@ -277,6 +275,7 @@ export default {
277
 			this.handleSearch();
275
 			this.handleSearch();
278
         },
276
         },
279
 		recycleDeptClick() {
277
 		recycleDeptClick() {
278
+			this.getDeptListAll();
280
             this.$refs.recycleDeptRef._show();
279
             this.$refs.recycleDeptRef._show();
281
         },
280
         },
282
 		showMoreOptions(goods) {
281
 		showMoreOptions(goods) {

+ 2 - 0
pages/wareHouse/styles/detail.scss

@@ -383,6 +383,8 @@
383
                 display: flex;
383
                 display: flex;
384
                 flex-direction: column;
384
                 flex-direction: column;
385
                 gap:20rpx;
385
                 gap:20rpx;
386
+                max-height: 500rpx;
387
+                overflow: auto;
386
                 .log_item{
388
                 .log_item{
387
                     display: flex;
389
                     display: flex;
388
                     text-align: left;
390
                     text-align: left;