Merge branch 'user' into dev

src/api/other/logistics.js

@@ -2,7 +2,6 @@ import request from '@/utils/request'
 
 // 查询物流轨迹
 export function getLogisticsListAPI(queryParams) {
-  console.log(queryParams)
   return request({
     url: '/schedule/sent/query_p', // 不会走 token 校验后台
     params: queryParams

src/components/CategoryTree/index.vue

@@ -203,6 +203,15 @@ const getPageList = () => {
 const handleClick = () => {
   hideSideBar.value = !hideSideBar.value
 }
+
+// 重置选中 key
+const setCurrentKey = (key) => {
+  treeRef.value.setCurrentKey(key)
+  queryParams.searchKey = ''
+}
+defineExpose({
+  setCurrentKey
+})
 </script>
 
 <style scoped

src/utils/dict.js

@@ -14,7 +14,6 @@ export function useDict(...args) {
         res.value[dictType] = dicts;
       } else {
         getDicts(dictType).then(resp => {
-          console.log('字典数据', resp.data)
           res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))
           useDictStore().setDict(dictType, res.value[dictType]);
         })

src/views/jimureport/entry.vue

@@ -18,7 +18,6 @@ if (route.fullPath.includes(reportViewURL.substring(1)) || route.fullPath.includ
 } else {
   openUrl += `?${queryStr}`
 }
-console.log(openUrl)
 </script>
 
 <style scoped

src/views/jimureport/manager/index.vue

@@ -294,7 +294,6 @@
       reportId: obj.id,
       pageSize: 100
     })
-    console.log('查询到', res)
     selUserList.value = res.data || []
     showSelUser.value = true
     if (obj.id) {
@@ -341,8 +340,6 @@
         selUserList.value.splice(index, 1)
       }
     }
-
-    console.log(selUserList.value.map(o => o.userId), '当前')
   }
   // 全选反选用户
   const handleSelectAll = (selection) => {
@@ -364,7 +361,6 @@
       })
     }
 
-    console.log(selUserList.value, '当前')
   }
 
   // 确定分配给用户

src/views/licenses/qualityIns/index.vue

@@ -297,7 +297,6 @@ const submitForm = async () => {
       formData.fileList = []
       proxy.$refs.formRef.resetFields()
     } else {
-      console.log('校验失败')
     }
   })
 }

src/views/login.vue

@@ -176,7 +176,6 @@ async function loginByType(type, data) {
       router.push({ path: redirect.value || "/", query: param2Obj(redirect.value) });
     }
   }).catch((err) => {
-    console.log(err)
     accountPassLoading.value = false;
     autoLoginLoading.value = false;
   })

src/views/mobile/components/XLMobileUpload/index.vue

@@ -114,7 +114,6 @@ const supportedTypes = computed(() => {
     if (getMobileType() === 'ios') {
       return 'image/*,video/*'
     } else {
-      console.log('anzhuo2')
       if (selectedMediaType.value === 'image') {
         return 'image/*'
       } else {
@@ -136,7 +135,6 @@ const customUploadClick = () => {
     })
   } else {
     // 安卓设备：显示拍照/录像方式确认菜单
-    console.log('anzhuo1')
     show.value = true
   }
 }

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/categoryInformation.vue

@@ -325,7 +325,6 @@ const handlePriceChange = async () => {
 }
 // 口味生产日期设置
 const handleTasteChange = async (index) => {
-  console.log(selectedTypeObj.value)
   const prop = typeMap[selectedTypeObj.value.label].tasteDateKey
   await createInspectionTaskDetailAPI({
     taskDetail: {

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/taskList.vue

@@ -97,7 +97,6 @@ const finished = ref(true);
 const refreshLoading = ref(false)
 const getInspectionTaskListFn = async () => {
   const res = await getInspectionTaskListAPI(query)
-  console.log(res, 'res')
   resultList.value = [...resultList.value, ...res.data.rows]
   finished.value = res.data.total <= resultList.value.length
 }
@@ -154,13 +153,11 @@ const handleClickStore = (item) => {
 const search = () => {
   query.pageNum = 1
   resultList.value = []
-  console.log('zoulema')
   getInspectionTaskListFn()
 }
 
 // 删除任务
 const deleteFn = async (item, index) => {
-  // console.log(item)
   // await deleteInspectionTaskAPI({
   //   rstdId: item.rstId
   // })

src/views/mobile/pages/cp_activity/promotion/plan/editing/index.vue

@@ -283,7 +283,6 @@ const errorTemWlSctMessage = ref('')
 const errorPrdClassMessage = ref('')
 // 校验午休结束时间
 const validatorNoonInTime = (value, obj) => {
-  console.log(form.noonOutTime.length > 0, '午休结束判断该')
   if (form.noonOutTime.length > 0) {
     if (!value) {
       errorNoonInTimeMessage.value = '请选择午休结束时间'

src/views/mobile/pages/cp_activity/promotion/plan/index/index.vue

@@ -106,7 +106,6 @@ const showSearch = ref(false)
 // 从新增页面跳转回来需要刷新列表
 watch(() => route.path, (newPath, oldPath) => {
   if (oldPath.includes('/promotion_plan_editing') && newPath === '/promotion_plan') {
-    console.log('刷新页面？')
     planSearch.value.resetFn()
   }
 });

src/views/promotion/display_schedule/tabs/schedule.vue

@@ -1054,7 +1054,6 @@
       // 关联的公式计算列，需要特殊处理
       for (const str of col.requestKey) {
         const obj = tableColumns.value.find(item => item.prop == str)
-        console.log(obj, str, 'y')
         if (obj.type === 'formula') {
           obj.func(row)
         }

src/views/promotion/display_schedule/tabs/schedule_dis.vue

@@ -762,7 +762,6 @@
     // 关联的公式计算列，需要特殊处理
     for (const str of col.requestKey) {
       const obj = tableColumns.value.find(item => item.prop === str)
-      console.log('obj', obj)
       if (obj.type === 'formula') {
         obj.func(row)
       }

src/views/promotion/display_schedule/tabs/snack.vue

@@ -498,7 +498,6 @@
     // 关联的公式计算列，需要特殊处理
     for (const str of col.requestKey) {
       const obj = tableColumns.value.find(item => item.prop === str)
-      console.log('obj', obj)
       if (obj.type === 'formula') {
         obj.func(row)
       }

src/views/scm/logistics_receipt/index.vue

@@ -254,7 +254,6 @@ const columns = ref([
     //       return 0
     //     }
     //   }))
-    //   console.log(maxPhotos, 'maxphotos')
     //   // 计算需要的列数，每列最多2张图片
     //   const columns = Math.ceil(maxPhotos / 2)
     //   if (columns === 0) return 200
@@ -359,7 +358,6 @@ getLogisticsReceiptList()
 // 查看物流轨迹
 const handleLogisticsTrack = (row) => {
   const obj = logisticsTrack.value.find(item => item.code.includes(row.transport * 1))
-  console.log(obj)
   if (isExternal(obj?.url)) {
     window.open(obj.url + row[obj.dataKey], '_blank')
   } else {