Merge branch 'dev'

src/layout/components/Navbar.vue

@@ -107,10 +107,7 @@ const nowVersion = ref('') // 当前最新版本
 
 // 判断是否有新版本出现（监听 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
   if (oldVersion !== nowVersion.value) {
     handleVersionList()
   }
@@ -124,6 +121,7 @@ const showVersionFn = () => {
 // 处理版本通知数据结构
 const handleVersionList = () => {
   const versionObj = versionStore.version[0]
+  nowVersion.value = versionObj.version
   showVersionNoticeVisible.value = true
   // 组织版本内容数据
   showVersionList.value = versionObj.changes.map(o => {

src/views/jimureport/design/index.vue

@@ -60,17 +60,36 @@
               <template #default="{ row }">
                 <div>
                   <svg-icon icon-class="bg-document"></svg-icon>
-                  <el-link :href="getReportPreviewUrl(row)"
+                  <el-link :href="getReportEditUrl(row)"
                     target="_blank"
                     style="margin-left: 10px">{{ row.name }}</el-link>
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="是否被分享"
+              key="hasShare"
+              prop="hasShare"
+              align="center"
+              width="120"
+              sortable>
+              <!-- 使用 tag 标记颜色 -->
+              <template #default="{ row }">
+                <el-tag :type="row.shareViewUrl ? 'success' : 'danger'">{{ row.shareViewUrl ? '是' : '否'
+                }}</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="操作"
               class-name="small-padding fixed-width"
               align="left"
               width="200">
               <template #default="scope">
+                <xl-tool-tip content="浏览报表"
+                  placement="top">
+                  <el-button link
+                    type="primary"
+                    icon="View"
+                    @click="handleView(scope.row)"></el-button>
+                </xl-tool-tip>
                 <xl-tool-tip content="分享报表"
                   placement="top">
                   <el-button link
@@ -236,15 +255,15 @@ const getReportList = async () => {
 }
 getReportList()
 // 报表预览地址
-const getReportPreviewUrl = (row) => {
-  return `${reportBaseDomain}${reportShareViewURL}${row.shareViewUrl}`
+const getReportEditUrl = (row) => {
+  return `${reportBaseDomain}${reportEditURL}/${row.id}?&token=${getToken()}&tenantId=${userStore.$state.userInfo.deptId}`
 }
 
 /********* 报表功能按钮 ***********/
 // 新建报表
 const handleAdd = async () => {
   const res = await addReportAPI()
-  window.open(`${reportBaseDomain}${reportEditURL}/${res.result.id}?menuType=${queryParams.reportType}&token=${getToken()}&tenantId=${userStore.$state.userInfo.deptId}`)
+  window.open(`${reportBaseDomain}${reportEditURL}/${res.result.id}?menuType=${queryParams.reportType}`)
 }
 // 导入报表
 const handleImport = () => {
@@ -263,6 +282,10 @@ const handleImport = () => {
   })
 
 }
+// 浏览报表
+const handleView = (row) => {
+  window.open(`${reportBaseDomain}${reportViewURL}/${row.id}?token=${getToken()}&tenantId=${userStore.$state.userInfo.deptId}`)
+}
 
 // 分享报表
 const shareReportUrl = ref('') // 分享报表地址链接
@@ -309,6 +332,7 @@ const handleConfirm = async () => {
   document.body.removeChild(input)
   proxy.$modal.msgSuccess('链接已复制到剪切板')
   dialogVisible.value = false
+  getReportList()
 }
 // 点击分享地址复制
 function copyTextSuccess() {

src/views/jimureport/list/index.vue

@@ -75,11 +75,11 @@
           sortable>
           <!-- 使用 tag 标记颜色 -->
           <template #default="{ row }">
-            <el-tag :type="row.hasShare === true ? 'success' : 'danger'">{{ row.hasShare === 1 ? '是' : '否' }}</el-tag>
+            <el-tag :type="row.hasShare === true ? 'success' : 'danger'">{{ row.hasShare === true ? '是' : '否' }}</el-tag>
           </template>
         </el-table-column>
         <!-- 操作预览 -->
-        <el-table-column label="操作"
+        <!-- <el-table-column label="操作"
           key="operation"
           align="center"
           width="120">
@@ -93,7 +93,7 @@
             </el-tooltip>
 
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <pagination v-show="total > 0"

src/views/jimureport/manager/index.vue

@@ -83,6 +83,17 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="是否被分享"
+          key="hasShare"
+          prop="hasShare"
+          align="center"
+          width="120"
+          sortable>
+          <!-- 使用 tag 标记颜色 -->
+          <template #default="{ row }">
+            <el-tag :type="row.hasShare === true ? 'success' : 'danger'">{{ row.hasShare === true ? '是' : '否' }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作"
           class-name="small-padding fixed-width"
           align="left"

src/views/scm/logistics_receipt/index.vue

@@ -6,13 +6,6 @@
         inline
         label-position="left">
         <el-row>
-          <el-form-item label="DD 单号查询"
-            prop="ddNo">
-            <el-input v-model="queryParams.ddNo"
-              clearable
-              placeholder="输入要查询的 DD 单号"
-              @input="getLogisticsReceiptList" />
-          </el-form-item>
           <el-form-item label="安徽/北京单据编号"
             prop="sentNo">
             <el-input v-model="queryParams.sentNo"
@@ -21,6 +14,20 @@
               @input="getLogisticsReceiptList"
               style="width: 250px;" />
           </el-form-item>
+          <el-form-item label="快递单号"
+            prop="expressNo">
+            <el-input v-model="queryParams.expressNo"
+              clearable
+              placeholder="输入要查询的快递单号"
+              @input="getLogisticsReceiptList" />
+          </el-form-item>
+          <el-form-item label="DD 单号查询"
+            prop="ddNo">
+            <el-input v-model="queryParams.ddNo"
+              clearable
+              placeholder="输入要查询的 DD 单号"
+              @input="getLogisticsReceiptList" />
+          </el-form-item>
           <el-form-item label="物流公司编码"
             prop="transport">
             <el-input v-model="queryParams.transport"
@@ -29,13 +36,6 @@
               @input="getLogisticsReceiptList"
               style="width: 220px;" />
           </el-form-item>
-          <el-form-item label="快递单号"
-            prop="expressNo">
-            <el-input v-model="queryParams.expressNo"
-              clearable
-              placeholder="输入要查询的快递单号"
-              @input="getLogisticsReceiptList" />
-          </el-form-item>
           <el-form-item label="订单状态"
             prop="isOperateEnd">
             <el-select v-model="queryParams.isOperateEnd"
@@ -180,23 +180,13 @@ const logisticsTrack = ref([
   }
 ])
 const columns = ref([
-  {
-    label: '发货单 ID',
-    prop: 'sendId',
-    width: 100,
-    fixed: 'left'
-  },
-  {
-    label: 'DD 单号',
-    prop: 'ddNo',
-    width: 170,
-    fixed: 'left'
-  },
   {
     label: '安徽单据编号',
     prop: 'ahSentNo',
     width: 180,
+    fixed: 'left'
   },
+
   {
     label: '北京单据编号',
     prop: 'bjSentNo',
@@ -207,6 +197,11 @@ const columns = ref([
     prop: 'expressNo',
     width: 150
   },
+  {
+    label: 'DD 单号',
+    prop: 'ddNo',
+    width: 170
+  },
   {
     label: '版本号',
     prop: 'bjSentVersion',
@@ -234,7 +229,7 @@ const columns = ref([
   },
   {
     label: '签收时间',
-    prop: 'operateEndDateTime',
+    prop: 'operateEndDatetime',
     width: 180
   },
   {
@@ -275,6 +270,11 @@ const columns = ref([
     prop: 'updateTime',
     width: 180
   },
+  {
+    label: '发货单 ID',
+    prop: 'sendId',
+    width: 100,
+  },
   {
     label: '物流轨迹',
     prop: 'logisticsTrack',
@@ -370,8 +370,10 @@ const formatter = (row, columns, value) => {
   // 判断有值再转换
   if (columns.property === 'type') {
     return typeDict.value.find(item => item.value === value)?.label
-  } else if (columns.property === 'createTime' || columns.property === 'updateTime') {
+  } else if (columns.property === 'createTime' || columns.property === 'updateTime' || columns.property === 'operateEndDatetime') {
     return parseTime(value, '{y}-{m}-{d} {h}:{i}:{s}')
+  } else if (columns.property === 'postDate') {
+    return parseTime(value, '{y}-{m}-{d}')
   } else {
     return value
   }