feat:回收情况、机构部门

pages/wareHouse/components/detail.vue

@@ -84,6 +84,10 @@
                 <view class="info_label">付款方式</view>
                 <view class="info_value">{{ payTypeFormatter(coreInfo.payType) }}</view>
             </view>
+            <view class="info_row">
+                <view class="info_label">回收情况</view>
+                <view class="info_value">{{ recycleSituationFormatter(coreInfo.recycleSituation) }}</view>
+            </view>
             <view class="info_row col">
                 <view class="info_label">备注信息</view>
                 <view class="info_value note" @click.stop="toggleEditField('desc', coreInfo.desc)">
@@ -236,6 +240,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 { recycleSituationList } from '../js/public.js'
 export default {
     components: {
         BrandList,
@@ -322,6 +327,11 @@ export default {
                     return '-'
             }
         },
+        // 回收情况格式化
+        recycleSituationFormatter(val){
+            let item = recycleSituationList.find(item => item.value == val)
+            return item ? item.name : '-'
+        },
         // 锁单
         lockGoods() {
             if (this.globalEditMode) {

pages/wareHouse/components/edit.vue

@@ -26,7 +26,7 @@
                                 @click="handlePasteRecognition(recognitionContent)"></u-button>
                         </view>
                     </u-form-item>
-                    <u-form-item :label="'商品图片(' + (formData.goodPicFileList.length || 0) + '张)'" required prop="goodPicFileList" borderBottom>
+                    <u-form-item :label="'商品图片(' + (formData.goodPicFileList.length || 0) + '张)'" required  borderBottom>
                         <view class="imgs_scroll">
                             <ImgsRowScroll v-if="formData.goodPicFileList.length > 0" :isShowDeleteIcon="true"
                                 @deleteImgInfo="getDeleteGoodPicInfo" imgMode="aspectFill" :totalWidth="400"
@@ -162,6 +162,11 @@
                             @tabChange="handleTabChangeRecycleType">
                         </TabSelect>
                     </u-form-item>
+                    <u-form-item label="回收情况" borderBottom>
+                        <TabSelect :tabList="recycleSituationList" :colNum="5" mode="single" :isClear="recycleSituationIsClear" :echoInfo="echoInfoRecycleSituation"
+                            @tabChange="handleTabChangeRecycleSituation">
+                        </TabSelect>
+                    </u-form-item>
                     <u-form-item label="标签" borderBottom>
                         <TabSelect :tabList="labelList" :colNum="5" mode="single" :isClear="labelIsClear" :echoInfo="echoInfoLabel"
                             @tabChange="handleTabChangeLabel">
@@ -271,7 +276,7 @@ import ImgsRowScroll from '@/components/imgs-row-scroll/index.vue'
 import PersonPicker from '@/components/person-picker/index.vue'
 import { permissionCheck,getRoles } from '@/utils/util.js'
 import moreInfo from './moreInfo.vue'
-import { productConditionList,productAttributeList,stockStatusList,recycleTypeList,labelList,paymentTabList } from '../js/public.js'
+import { productConditionList,productAttributeList,stockStatusList,recycleTypeList,labelList,paymentTabList,recycleSituationList } from '../js/public.js'
 export default {
     components: {
         TabSelect,
@@ -319,6 +324,7 @@ export default {
                 identifyingPersonId: '',
                 stockStatus: '0',
                 recycleType: '',
+                recycleSituation: '0',
                 recyclePerson: '',
                 recyclePersonId: '',
                 recycleBottomDesc: '',
@@ -376,6 +382,7 @@ export default {
             productConditionIsClear: false,//商品成色是否清空
             productAttributeIsClear: false,//商品属性是否清空
             recycleTypeIsClear: false,//回收类型是否清空
+            recycleSituationIsClear: false,//回收情况是否清空
             stockStatusIsClear: false,//是否入库是否清空
             labelIsClear: false,//商品标签是否清空
             payTypeIsClear: false,//付款方式是否清空
@@ -386,6 +393,7 @@ export default {
             echoInfoProductAttribute:'',//入库回显的时候 商品属性回显
             echoInfoProductCondition:'',//入库回显的时候 商品成色回显
             echoInfoStockStatus:'',//入库回显的时候 是否入库回显
+            echoInfoRecycleSituation:'0',//入库回显的时候 回收情况回显
             isWareHouser: permissionCheck('WAREHOUSER',false),
             formType: '',//表单类型 add：新增 edit：编辑
             xhlSystemSetList: [],//系统设置-列表
@@ -395,6 +403,7 @@ export default {
             recycleTypeList: recycleTypeList,
             labelList: labelList,
             paymentTabList: paymentTabList,
+            recycleSituationList: recycleSituationList,
             moreOptions: {},
             
         }
@@ -425,6 +434,7 @@ export default {
                 this.formData.price = res.data.price || 0//官方指导价校验
                 this.echoInfoPayType = res.data.payType//付款方式回显
                 this.echoInfoRecycleType = res.data.recycleType//回收类型回显
+                this.echoInfoRecycleSituation = res.data.recycleSituation || '0'//回收情况回显
                 this.echoInfoLabel = res.data.label//商品标签回显
                 this.recognitionContent = `品牌：${res.data.dictLabel || '-'}
 来源：${res.data.origin || '-'}
@@ -570,6 +580,7 @@ export default {
                 identifyingPersonId: '',
                 stockStatus: '0',
                 recycleType: '',
+                recycleSituation: '0',
                 label: '',
                 recyclePerson: '',
                 recyclePersonId: '',
@@ -654,6 +665,10 @@ export default {
         handleTabChangeRecycleType(e) {
             this.formData.recycleType = e;
         },
+        // 回收情况
+        handleTabChangeRecycleSituation(e) {
+            this.formData.recycleSituation = e;
+        },
         // 商品标签
         handleTabChangeLabel(e) {
             this.formData.label = e;

pages/wareHouse/components/searchFilter.vue

@@ -22,6 +22,13 @@
                     ref="jtimePickerPopupRef">
                 </jtimePickerPopup>
             </u-form-item>
+            <u-form-item label="机构部门" labelWidth="70" @click="recycleDeptClick">
+                <Cell :val="formData.deptName" :isDelete="true" :border="true" @handleClear="clear('dept')"></Cell>
+                <ba-tree-picker :selectParent="true" v-if="deptList.length > 0" ref="recycleDeptRef" :multiple='false'
+							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
+							textKey="deptName" childrenKey="children" :selectedValues="formData.deptId"
+							:personNames="formData.deptName" />
+            </u-form-item>
             <u-form-item label="回收人员" labelWidth="70" @click="recyclePersonClick">
                 <Cell :val="formData.recyclePerson" :isDelete="true" :border="true" @handleClear="clear('recyclePerson')"></Cell>
                 <PersonPicker ref="recyclePersonPickerRef" title="请选择回收人员" @selectPerson="handleSelectRecyclePerson"></PersonPicker>
@@ -72,6 +79,8 @@ export default {
                 location: '',
                 startTime: '',
                 endTime: '',
+                deptId:'',
+                deptName:'',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -85,14 +94,32 @@ export default {
             // 将导入的变量在data中重新定义，确保模板能够访问
             productAttributeList: productAttributeList,
             stockStatusListAll: stockStatusListAll,
-            
+            deptList: [],
         }
     },
     props: {
     },
     emits: [],
+    mounted() {
+        this.getDeptListAll();
+    },
     methods: {
-        
+        getDeptListAll() {
+            const params = {
+                isDept:2
+            }
+            uni.$u.api.getDeptListAll(params).then(res => {
+                if(res.data.length > 0){
+                    this.deptList = res.data;
+                }else{
+                    uni.$u.toast('暂无机构部门');
+                }
+            })
+        },
+        deptSeletchang(ids, names) {
+            this.formData.deptId = ids[0] || '';
+            this.formData.deptName = names[0] || '';
+        },
         handleSearch() {
             this.$emit('confirm', this.formData);
             this.close();
@@ -106,6 +133,8 @@ export default {
                 location: '',
                 startTime: '',
                 endTime: '',
+                deptId:'',
+                deptName:'',
                 recyclePerson:'',
                 recyclePersonId: '',
                 identifyingPerson:'',
@@ -160,6 +189,13 @@ export default {
                 this.formData.endTime = '';
                 return;
             }
+            // 机构部门
+            if(field == 'dept'){
+                this.formData.deptId = '';
+                this.formData.deptName = '';
+                this.$refs.recycleDeptRef._clear();
+                return;
+            }
             this.formData[field] = '';
         },
         getSelectTime(val) {
@@ -167,6 +203,9 @@ export default {
             this.formData.endTime = this.$dayjs(val.endTime).format('YYYY-MM-DD');
             this.time = this.$dayjs(val.beginTime).format('YYYY-MM-DD') + ' 至 ' + this.$dayjs(val.endTime).format('YYYY-MM-DD');
         },
+        recycleDeptClick() {
+            this.$refs.recycleDeptRef._show();
+        },
         recyclePersonClick() {
             this.$refs.recyclePersonPickerRef.open();
         },

pages/wareHouse/js/public.js

@@ -179,4 +179,26 @@ export const shortTimeList = [{
     key: '上月',
     value: -1
 },
-]
+]
+export const recycleSituationList = [
+    {
+        name: '全套',
+        value: '0',
+    },
+    {
+        name: '单表',
+        value: '1',
+    },
+    {
+        name: '单表头',
+        value: '2',
+    },
+    {
+        name: '附件',
+        value: '3',
+    },
+    {
+        name: '其他',
+        value: '4',
+    },
+]

store/modules/user.js

@@ -61,6 +61,7 @@ export default {
 			const validRoles = [];
 			
 			const hasAdminRole = roles.some(role => role.roleKey && role.roleKey.includes('admin' || 'ADMIN'));
+			console.log('hasAdminRole',hasAdminRole);
 			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,6 +93,13 @@ 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 }); // 仓库

utils/api.js

@@ -14,6 +14,7 @@ const install = (Vue, vm) => {
 		getDicts: (dictType) => http.get('/system/dict/data/type/' + dictType), // 获取字典
 		getPhoneFileterResult: (data = {}) => http.post('/collect/all/casePhoneFilter/getPhoneFileterResult', data), // 滤号
 		listDetpUser: (data = {}) => http.post('/system/user/getDeptCustomer', data), // 查询部门人员列表
+		getDeptListAll: (params = {}) => http.get('/system/dept/listAll', { params }), // 查询企业列表
 		getDeptCustomerByOrg: (data = {}) => http.post('/system/user/getDeptCustomerByOrg', data, { params: data }), // 查询部门人员列表
 		getDeptOwner: (data = {}) => http.post('/system/user/getDeptOwner', data), // 查询部门人员列表
 		listByOrgDataScope: (params = {}) => http.get('/system/user/listByOrgDataScope', { params }), // 查询部门人员列表