wjj 3 päivää sitten
vanhempi
commit
5a2794f0de

+ 18 - 66
src/api/hisStore/storeOrder.js

@@ -1,11 +1,11 @@
 import request from '@/utils/request'
 
 // 查询订单列表
-export function listStoreOrder(data) {
+export function listStoreOrder(query) {
   return request({
     url: '/store/store/storeOrder/list',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
@@ -34,11 +34,11 @@ export function listPromotionOrder(query) {
   })
 }
 // 查询健康商城订单列表
-export function listHealthStoreOrder(data) {
+export function listHealthStoreOrder(query) {
   return request({
     url: '/store/store/storeOrder/healthList',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
@@ -128,39 +128,39 @@ export function delStoreOrder(id) {
 }
 
 // 导出订单
-export function exportStoreOrder(data) {
+export function exportStoreOrder(query) {
   return request({
     url: '/store/store/storeOrder/export',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
 // 导出订单
-export function exportStoreOrderDetails(data) {
+export function exportStoreOrderDetails(query) {
   return request({
     url: '/store/store/storeOrder/exportDetails',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
 
 // 导出订单
-export function exportHealthStoreOrder(data) {
+export function exportHealthStoreOrder(query) {
   return request({
     url: '/store/store/storeOrder/healthExport',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
 // 导出订单
-export function exportHealthStoreOrderDetails(data) {
+export function exportHealthStoreOrderDetails(query) {
   return request({
     url: '/store/store/storeOrder/healthExportDetails',
-    method: 'post',
-    data: data
+    method: 'get',
+    params: query
   })
 }
 
@@ -335,51 +335,3 @@ export function importDeliveryNoteExpressTemplate() {
     method: 'get'
   })
 }
-
-export function queryErpPhone(query) {
-  return request({
-    url: '/store/store/storeOrder/queryErpPhone',
-    method: 'get',
-    params: query
-  })
-}
-
-export function saveErpPhone(data) {
-  return request({
-    url: '/store/store/storeOrder/saveErpPhone',
-    method: 'post',
-    data: data
-  })
-}
-
-export function editErpPhone(data) {
-  return request({
-    url: '/store/store/storeOrder/editErpPhone',
-    method: 'post',
-    data: data
-  })
-}
-
-export function batchCreateErpOrder(data) {
-  return request({
-    url: '/store/store/storeOrder/batchCreateErpOrder',
-    method: 'post',
-    data: data
-  })
-}
-
-export function batchSetErpOrder(data) {
-  return request({
-    url: '/store/store/storeOrder/batchSetErpOrder',
-    method: 'post',
-    data: data
-  })
-}
-
-
-export function getErpAccount() {
-  return request({
-    url: '/store/store/storeOrder/getErpAccount',
-    method: 'get'
-  })
-}

+ 28 - 28
src/views/his/storeOrder/order1.vue

@@ -1219,7 +1219,7 @@ export default {
     this.getDicts("sys_store_order_delivery_status").then(response => {
           this.deliveryStatusOptions = response.data;
     });
-    this.getErpAccountList();
+    //this.getErpAccountList();
     this.getAppMallOptions();
   },
   methods: {
@@ -1477,32 +1477,32 @@ export default {
       this.calculateOrderSummary();
     },
     
-    //获取ERP账户列表
-    async getErpAccountList() {
-      try {
-        const response = await getErpAccount();
-        if (response.code === 200) {
-          const list = response.data || [];
-          this.erpAccountList = [...list];
-          this.erpAccountQueryList = [...list, '未分拣'];
-          // 设置默认值:第一条真实账户
-          if (list.length && !this.queryParams.erpAccount) {
-              this.$set(this.queryParams, 'erpAccount', list[0]);
-              this.getList();
-          }
-        } else {
-          this.$message.error(response.msg || '获取ERP账户列表失败');
-          this.erpAccountList = [];
-        }
+    // //获取ERP账户列表
+    // async getErpAccountList() {
+    //   try {
+    //     const response = await getErpAccount();
+    //     if (response.code === 200) {
+    //       const list = response.data || [];
+    //       this.erpAccountList = [...list];
+    //       this.erpAccountQueryList = [...list, '未分拣'];
+    //       // 设置默认值:第一条真实账户
+    //       if (list.length && !this.queryParams.erpAccount) {
+    //           this.$set(this.queryParams, 'erpAccount', list[0]);
+    //           this.getList();
+    //       }
+    //     } else {
+    //       this.$message.error(response.msg || '获取ERP账户列表失败');
+    //       this.erpAccountList = [];
+    //     }
         
-      } catch (error) {
-        console.error('获取ERP账户列表失败:', error);
-        this.$message.error('获取ERP账户列表失败');
-        this.erpAccountList = [];
-      } finally {
-        this.erpAccountDialog.loading = false;
-      }
-    },
+    //   } catch (error) {
+    //     console.error('获取ERP账户列表失败:', error);
+    //     this.$message.error('获取ERP账户列表失败');
+    //     this.erpAccountList = [];
+    //   } finally {
+    //     this.erpAccountDialog.loading = false;
+    //   }
+    // },
     
     // 新增:计算订单统计信息
     calculateOrderSummary() {
@@ -1614,7 +1614,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('订单ERP账号设置成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP账号设置失败');
@@ -1675,7 +1675,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('ERP订单创建成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP订单创建失败');

+ 28 - 28
src/views/hisStore/storeOrder/healthStoreList.vue

@@ -1258,7 +1258,7 @@ export default {
     })
 
     this.getList()
-    this.getErpAccountList();
+    //this.getErpAccountList();
     this.getAppMallOptions();
   },
   methods: {
@@ -1425,32 +1425,32 @@ export default {
       this.calculateOrderSummary();
     },
     
-    //获取ERP账户列表
-    async getErpAccountList() {
-      try {
-        const response = await getErpAccount();
-        if (response.code === 200) {
-          const list = response.data || [];
-          this.erpAccountList = [...list];
-          this.erpAccountQueryList = [...list, '未分拣'];
-          // 设置默认值:第一条真实账户
-          if (list.length && !this.queryParams.erpAccount) {
-              this.$set(this.queryParams, 'erpAccount', list[0]);
-              this.getList();
-          }
-        } else {
-          this.$message.error(response.msg || '获取ERP账户列表失败');
-          this.erpAccountList = [];
-        }
+    // //获取ERP账户列表
+    // async getErpAccountList() {
+    //   try {
+    //     const response = await getErpAccount();
+    //     if (response.code === 200) {
+    //       const list = response.data || [];
+    //       this.erpAccountList = [...list];
+    //       this.erpAccountQueryList = [...list, '未分拣'];
+    //       // 设置默认值:第一条真实账户
+    //       if (list.length && !this.queryParams.erpAccount) {
+    //           this.$set(this.queryParams, 'erpAccount', list[0]);
+    //           this.getList();
+    //       }
+    //     } else {
+    //       this.$message.error(response.msg || '获取ERP账户列表失败');
+    //       this.erpAccountList = [];
+    //     }
         
-      } catch (error) {
-        console.error('获取ERP账户列表失败:', error);
-        this.$message.error('获取ERP账户列表失败');
-        this.erpAccountList = [];
-      } finally {
-        this.erpAccountDialog.loading = false;
-      }
-    },
+    //   } catch (error) {
+    //     console.error('获取ERP账户列表失败:', error);
+    //     this.$message.error('获取ERP账户列表失败');
+    //     this.erpAccountList = [];
+    //   } finally {
+    //     this.erpAccountDialog.loading = false;
+    //   }
+    // },
     
     // 新增:计算订单统计信息
     calculateOrderSummary() {
@@ -1562,7 +1562,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('订单ERP账号设置成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP账号设置失败');
@@ -1623,7 +1623,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('ERP订单创建成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP订单创建失败');

+ 28 - 28
src/views/hisStore/storeOrder/index.vue

@@ -1316,7 +1316,7 @@ export default {
     });
     this.getList();
     this.getItemsNum();
-    this.getErpAccountList();
+    //this.getErpAccountList();
     this.getAppMallOptions();
   },
   methods: {
@@ -1483,32 +1483,32 @@ export default {
       this.calculateOrderSummary();
     },
     
-    //获取ERP账户列表
-    async getErpAccountList() {
-      try {
-        const response = await getErpAccount();
-        if (response.code === 200) {
-          const list = response.data || [];
-          this.erpAccountList = [...list];
-          this.erpAccountQueryList = [...list, '未分拣'];
-          // 设置默认值:第一条真实账户
-          if (list.length && !this.queryParams.erpAccount) {
-              this.$set(this.queryParams, 'erpAccount', list[0]);
-              this.getList();
-          }
-        } else {
-          this.$message.error(response.msg || '获取ERP账户列表失败');
-          this.erpAccountList = [];
-        }
+    // //获取ERP账户列表
+    // async getErpAccountList() {
+    //   try {
+    //     const response = await getErpAccount();
+    //     if (response.code === 200) {
+    //       const list = response.data || [];
+    //       this.erpAccountList = [...list];
+    //       this.erpAccountQueryList = [...list, '未分拣'];
+    //       // 设置默认值:第一条真实账户
+    //       if (list.length && !this.queryParams.erpAccount) {
+    //           this.$set(this.queryParams, 'erpAccount', list[0]);
+    //           this.getList();
+    //       }
+    //     } else {
+    //       this.$message.error(response.msg || '获取ERP账户列表失败');
+    //       this.erpAccountList = [];
+    //     }
         
-      } catch (error) {
-        console.error('获取ERP账户列表失败:', error);
-        this.$message.error('获取ERP账户列表失败');
-        this.erpAccountList = [];
-      } finally {
-        this.erpAccountDialog.loading = false;
-      }
-    },
+    //   } catch (error) {
+    //     console.error('获取ERP账户列表失败:', error);
+    //     this.$message.error('获取ERP账户列表失败');
+    //     this.erpAccountList = [];
+    //   } finally {
+    //     this.erpAccountDialog.loading = false;
+    //   }
+    // },
     
     // 新增:计算订单统计信息
     calculateOrderSummary() {
@@ -1594,7 +1594,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('订单ERP账号设置成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP账号设置失败');
@@ -1629,7 +1629,7 @@ export default {
         if (response.code === 200) {
           this.$message.success('ERP订单创建成功');
           this.cancelErpAccountDialog();
-          this.getErpAccountList(); // 刷新列表
+          //this.getErpAccountList(); // 刷新列表
           this.getList();
         } else {
           this.$message.error(response.msg || 'ERP订单创建失败');