销售订单和商场订单导入导出

src/api/hisStore/storeOrder.js

@@ -203,6 +203,15 @@ export function exportShippingOrder(query) {
   })
 }
 
+// 导出健康商城发货单
+export function healthExportShippingOrder(query) {
+  return request({
+    url: '/store/store/storeOrder/healthExportShippingOrder',
+    method: 'get',
+    params: query
+  })
+}
+
 
 
 
@@ -342,6 +351,14 @@ export function importDeliveryNoteExpressTemplate() {
   })
 }
 
+// 导入发货单模板
+export function importShippingOrderTemplate() {
+  return request({
+    url: '/store/store/storeOrder/importShippingOrderTemplate',
+    method: 'get'
+  })
+}
+
 export function queryErpPhone(query) {
   return request({
     url: '/store/store/storeOrder/queryErpPhone',
@@ -389,3 +406,11 @@ export function getErpAccount() {
     method: 'get'
   })
 }
+
+// 查询小程序列表（用于下拉选择）
+export function getMiniProgramList() {
+  return request({
+    url: '/store/store/storeOrder/getMiniProgramList',
+    method: 'get'
+  })
+}

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -321,15 +321,6 @@
         >导出订单明细(明文)
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          icon="el-icon-s-order"
-          size="mini"
-          type="warning"
-          @click="openDeliveryNote"
-        >批量导入物流单号
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['store:storeOrder:healthExportShippingOrder']"
@@ -342,23 +333,24 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          v-hasPermi="['store:storeOrder:healthExportShippingOrder']"
-          icon="el-icon-tickets"
+          v-hasPermi="['store:storeOrder:importShippingOrder']"
+          icon="el-icon-upload2"
+          plain
           size="mini"
           type="success"
-          @click="handleExportShippingOrder"
-        >导出发货单
+          @click="openDeliveryNote"
+        >导入发货单
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          v-hasPermi="['store:storeOrder:remove']"
+          :disabled="multiple"
           icon="el-icon-delete"
+          plain
           size="mini"
-          :disabled="multiple"
+          type="danger"
           @click="handleOrderDelete"
-          v-hasPermi="['store:storeOrder:remove']"
         >删除
         </el-button>
       </el-col>
@@ -1009,7 +1001,8 @@ import {
   saveErpPhone,
   editErpPhone,
   batchCreateErpOrder,
-  batchSetErpOrder
+  batchSetErpOrder,
+  importShippingOrderTemplate
 } from '@/api/hisStore/storeOrder'
 import { getUserList } from '@/api/hisStore/user'
 import { getAddressList } from '@/api/hisStore/userAddress'
@@ -2468,7 +2461,7 @@ export default {
     },
     //发货单模板下载
     importDeliveryNoteTemplate() {
-      importDeliveryNoteExpressTemplate().then((response) => {
+      importShippingOrderTemplate().then((response) => {
         this.download(response.msg)
       })
     },

src/views/hisStore/storeOrder/index.vue

@@ -323,15 +323,6 @@
         >导出订单明细
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          icon="el-icon-s-order"
-          size="mini"
-          type="warning"
-          @click="openDeliveryNote"
-        >批量导入物流单号
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['store:storeOrder:export:details']"
@@ -362,6 +353,17 @@
         >导出发货单
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['store:storeOrder:importShippingOrder']"
+          icon="el-icon-upload2"
+          plain
+          size="mini"
+          type="success"
+          @click="openDeliveryNote"
+        >导入发货单
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['store:storeOrder:remove']"
@@ -1079,7 +1081,9 @@ import {
   importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails, exportShippingOrder,
   getErpAccount,
   queryErpPhone,
-  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder
+  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,
+  importShippingOrderTemplate,
+  getMiniProgramList
 } from '@/api/hisStore/storeOrder'
 import { getUserList } from '@/api/hisStore/user'
 import { getAddressList } from '@/api/hisStore/userAddress'
@@ -2577,19 +2581,18 @@ export default {
     },
     getAppList() {
       this.miniAppList = []
-      const key = 'courseMa.config'
-      getConfigByKey(key).then(response => {
-        const { code, data } = response
-        if (code === 200) {
-          let value = data?.configValue
-          if (value) {
-            console.log('打印-----------------》', value)
-            const appList = JSON.parse(value)
-            this.miniAppList = appList.filter(v => v.type === '1').map(v => {
-              return { appId: v.appid, appName: v.name }
-            })
-          }
+      // 使用订单模块的小程序列表接口，排除公众号，数据更全面
+      getMiniProgramList().then(response => {
+        if (response.code === 200 && response.data) {
+          this.miniAppList = response.data.map(v => {
+            return { appId: v.appid, appName: v.name }
+          })
+          console.log('获取小程序列表成功，数量：', this.miniAppList.length)
         }
+      }).catch(error => {
+        console.error('获取小程序列表失败:', error)
+        this.$message.error('获取小程序列表失败')
+        this.miniAppList = []
       })
     },
     // 提交发货单