merge修改jimu的list冲突

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/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
   }