feat(scm/logistics_receipt): 新增：供应链模块-物流回单菜单：对勤策物流回单数据统一管理查询和修改状态等功能

src/api/index.js

@@ -25,6 +25,7 @@ export * from './monitor/online'
 export * from './monitor/server'
 export * from './promotion/plan'
 export * from './promotion/task'
+export * from './scm/logistics_receipt'
 export * from './system/dict/data'
 export * from './system/dict/type'
 export * from './system/attendance'

src/api/scm/logistics_receipt.js

+import request from '@/utils/request'
+
+// 勤策发货单列表查询
+export const getLogisticsReceiptListAPI = (params) => {
+  return request({
+    url: '/bi/ordersent/query/page',
+    params
+  })
+}
+
+// 勤策发货单-回单照片是否完整&物流状态设置
+export const setLogisticsReceiptStatusAPI = (data) => {
+  return request({
+    url: '/bi/ordersent/core/update',
+    method: 'PUT',
+    data
+  })
+}
+

src/layout/components/Navbar.vue

@@ -105,8 +105,9 @@ const showQuit = !window.h5sdk; // 判断飞书客户端内，则不显示退出
 const showVersionNoticeVisible = ref(false) // 判断版本通知是否出现
 const nowVersion = ref('') // 当前最新版本
 
-// 判断是否有新版本出现
-onMounted(() => {
+// 判断是否有新版本出现（监听 pinia 值的变化）
+watch(() => versionStore.version, (newVal, oldVal) => {
+  console.log('versionStore.version', versionStore.version)
   const oldVersion = proxy.$cache.local.get('version')
   const versionObj = versionStore.version[0]
   nowVersion.value = versionObj.version
@@ -114,6 +115,7 @@ onMounted(() => {
     handleVersionList()
   }
 })
+
 // 展示版本通知弹框
 const showVersionFn = () => {
   handleVersionList()

src/permission.js

@@ -36,23 +36,24 @@ router.beforeEach((to, from, next) => {
         useUserStore().getInfo().then(() => {
           isRelogin.show = false
           usePermissionStore().generateRoutes().then(accessRoutes => {
-            // 生成可访问路由表
-            accessRoutes.forEach(route => {
-              if (!isHttp(route.path)) {
-                router.addRoute(route) 
-              }
+            // 获取版本信息
+            useVersionStore().getVersion().then((res) => {
+              // 生成可访问路由表
+              accessRoutes.forEach(route => {
+                if (!isHttp(route.path)) {
+                  router.addRoute(route)
+                }
+              })
+              next({ ...to, replace: true })
             })
-            next({ ...to, replace: true }) 
           })
-          
         }).catch(err => {
           useUserStore().logOut().then(() => {
             ElMessage.error(err)
             next({ path: '/' })
           })
         })
-        // 获取版本信息
-        useVersionStore().getVersion()
+
       } else {
         next()
       }

src/utils/dict.js

@@ -14,6 +14,7 @@ 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/promotion/task/index.vue

@@ -106,7 +106,8 @@
       <el-dialog :title="photoLookInfoObj.storeName"
         v-model="photoDialogVisible"
         width="60%"
-        draggable overflow>
+        draggable
+        overflow>
         <p>活动记录 ID :{{ photoLookInfoObj.id }}</p>
         <p>活动时间 :{{ photoLookInfoObj.createDate }}</p>
         <el-card v-for="obj in photoDialogList"
@@ -115,9 +116,10 @@
           <div class="content">
             <el-result :title="item.time"
               :sub-title="item.title"
-              v-for="item in obj.list">
+              v-for="item, index in obj.list">
               <template #icon>
                 <el-image :src="item.photoUrl"
+                  :initial-index="index"
                   :preview-src-list="[...obj.list.map(o => o.photoUrl)]" />
               </template>
             </el-result>