Bladeren bron

伙伴商地址

Lijingyang 1 maand geleden
bovenliggende
commit
8cb7e6dbcf
5 gewijzigde bestanden met toevoegingen van 681 en 0 verwijderingen
  1. 1 0
      package.json
  2. 63 0
      src/api/order/partaddress/index.ts
  3. 201 0
      src/api/order/partaddress/types.ts
  4. 9 0
      src/api/partner.ts
  5. 407 0
      src/views/order/partaddress/index.vue

+ 1 - 0
package.json

@@ -29,6 +29,7 @@
     "axios": "1.8.4",
     "crypto-js": "4.2.0",
     "echarts": "5.6.0",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "2.9.8",
     "file-saver": "2.0.5",
     "highlight.js": "11.9.0",

+ 63 - 0
src/api/order/partaddress/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { PartaddressVO, PartaddressForm, PartaddressQuery } from '@/api/order/partaddress/types';
+
+/**
+ * 查询伙伴商地址列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listPartaddress = (query?: PartaddressQuery): AxiosPromise<PartaddressVO[]> => {
+  return request({
+    url: '/customer/partaddress/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询伙伴商地址详细
+ * @param id
+ */
+export const getPartaddress = (id: string | number): AxiosPromise<PartaddressVO> => {
+  return request({
+    url: '/customer/partaddress/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增伙伴商地址
+ * @param data
+ */
+export const addPartaddress = (data: PartaddressForm) => {
+  return request({
+    url: '/customer/partaddress',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改伙伴商地址
+ * @param data
+ */
+export const updatePartaddress = (data: PartaddressForm) => {
+  return request({
+    url: '/customer/partaddress',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除伙伴商地址
+ * @param id
+ */
+export const delPartaddress = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/customer/partaddress/' + id,
+    method: 'delete'
+  });
+};

+ 201 - 0
src/api/order/partaddress/types.ts

@@ -0,0 +1,201 @@
+export interface PartaddressVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 伙伴商编号
+   */
+  partnerNo: string;
+
+  /**
+   * 伙伴商名称
+   */
+  partnerName?: string;
+
+  /**
+   * 伙伴商ID
+   */
+  partnerId: string | number;
+
+  /**
+   * 配送公司名称
+   */
+  shippingCompany: string;
+
+  /**
+   * 发货人姓名
+   */
+  shipperName: string;
+
+  /**
+   * 发货人电话
+   */
+  shipperPhone: string;
+
+  /**
+   * 邮政编码
+   */
+  shippingPostCode: string;
+
+  /**
+   * 省
+   */
+  shippingProvincial: string;
+
+  /**
+   * 市
+   */
+  shippingCity: string;
+
+  /**
+   * 区/县
+   */
+  shippingCounty: string;
+
+  /**
+   * 详细地址
+   */
+  shippingAddress: string;
+
+  /**
+   * 推送状态(例如:0-未推送, 1-已推送, 16-推送失败)
+   */
+  pushStatus: string;
+
+  /**
+   * 是否为自身地址(1-是, 0-否)
+   */
+  isSelf: string;
+
+  /**
+   * 地址类型(1-注册地址, 2-经营地址, 3-发货地址)
+   */
+  type: string;
+
+  /**
+   * 地址编码
+   */
+  addressNo: string;
+
+  /**
+   * 状态(0正常 1停用)
+   */
+  status: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface PartaddressForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 伙伴商编号
+   */
+  partnerNo?: string;
+
+  /**
+   * 伙伴商名称
+   */
+  partnerName?: string;
+
+  /**
+   * 伙伴商ID
+   */
+  partnerId?: string | number;
+
+  /**
+   * 配送公司名称
+   */
+  shippingCompany?: string;
+
+  /**
+   * 发货人姓名
+   */
+  shipperName?: string;
+
+  /**
+   * 发货人电话
+   */
+  shipperPhone?: string;
+
+  /**
+   * 邮政编码
+   */
+  shippingPostCode?: string;
+
+  /**
+   * 省
+   */
+  shippingProvincial?: string;
+
+  /**
+   * 市
+   */
+  shippingCity?: string;
+
+  /**
+   * 区/县
+   */
+  shippingCounty?: string;
+
+  /**
+   * 详细地址
+   */
+  shippingAddress?: string;
+
+  /**
+   * 推送状态(例如:0-未推送, 1-已推送, 16-推送失败)
+   */
+  pushStatus?: string;
+
+  /**
+   * 是否为自身地址(1-是, 0-否)
+   */
+  isSelf?: string;
+
+  /**
+   * 地址类型(1-注册地址, 2-经营地址, 3-发货地址)
+   */
+  type?: string;
+
+  /**
+   * 地址编码
+   */
+  addressNo?: string;
+
+  /**
+   * 状态(0正常 1停用)
+   */
+  status?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface PartaddressQuery extends PageQuery {
+
+  /**
+   * 伙伴商编号
+   */
+  partnerNo?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

+ 9 - 0
src/api/partner.ts

@@ -17,6 +17,15 @@ export function updatePartnerInfo(data: any) {
   });
 }
 
+// 查询伙伴商列表
+export function listPartnerInfo(query?: any) {
+  return request({
+    url: '/customer/partnerInfo/list',
+    method: 'get',
+    params: query
+  });
+}
+
 // 获取伙伴商银行列表
 export function getPartnerBankList(partnerId: number) {
   return request({

+ 407 - 0
src/views/order/partaddress/index.vue

@@ -0,0 +1,407 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="伙伴商编号" prop="partnerNo" label-width="90px">
+              <el-input v-model="queryParams.partnerNo" placeholder="请输入伙伴商编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['partnerAddress:partaddress:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['partnerAddress:partaddress:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['partnerAddress:partaddress:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['partnerAddress:partaddress:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="partaddressList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="false" />
+        <el-table-column label="伙伴商编号" align="center" prop="partnerNo" />
+        <el-table-column label="伙伴商名称" align="center" prop="partnerName" />
+        <el-table-column label="地址编码" align="center" prop="addressNo" />
+        <el-table-column label="姓名" align="center" prop="shipperName" />
+        <el-table-column label="电话" align="center" prop="shipperPhone" />
+        <el-table-column label="邮政编码" align="center" prop="shippingPostCode" />
+        <el-table-column label="省" align="center" prop="shippingProvincial" />
+        <el-table-column label="市" align="center" prop="shippingCity" />
+        <el-table-column label="区" align="center" prop="shippingCounty" />
+        <el-table-column label="详细地址" align="center" prop="shippingAddress" />
+        <el-table-column label="默认地址" align="center" prop="isSelf">
+          <template #default="scope">
+            <span>{{ Number(scope.row.isSelf) === 1 ? '是' : '否' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['partnerAddress:partaddress:edit']">修改</el-button>
+            <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['partnerAddress:partaddress:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+
+    <!-- 添加或修改伙伴商地址对话框 -->
+    <el-dialog
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="650px"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <el-form
+        ref="partaddressFormRef"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="企业名称:" prop="partnerId" required>
+              <el-select 
+                v-model="form.partnerId" 
+                placeholder="请选择企业名称" 
+                clearable 
+                filterable
+                @change="handlePartnerChange"
+              >
+                <el-option
+                  v-for="item in partnerOptions"
+                  :key="item.id"
+                  :label="item.partnerName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="伙伴商编号:" prop="partnerNo">
+              <el-input v-model="form.partnerNo" disabled placeholder="自动带出" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="收货人:" prop="shipperName" required>
+              <el-input v-model="form.shipperName" placeholder="请输入收货人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号码:" prop="shipperPhone" required>
+              <el-input v-model="form.shipperPhone" placeholder="请输入手机号码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="邮政编码:" prop="shippingPostCode">
+              <el-input v-model="form.shippingPostCode" placeholder="请输入邮政编码" />
+            </el-form-item>
+          </el-col>
+          
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="地址:" prop="shippingProvincial" required>
+              <el-cascader
+                v-model="selectedAddressRegion"
+                :options="regionOptions"
+                placeholder="请选择"
+                clearable
+                filterable
+                style="width: 100%;"
+                @change="handleAddressRegionChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="详细地址:" prop="shippingAddress" required>
+              <el-input
+                v-model="form.shippingAddress"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入详细地址"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="默认地址:">
+              <el-switch v-model="form.isSelf" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          
+        </el-row>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">取消</el-button>
+          <el-button type="primary" @click="submitForm" :loading="buttonLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Partaddress" lang="ts">
+import { listPartaddress, getPartaddress, delPartaddress, addPartaddress, updatePartaddress } from '@/api/order/partaddress';
+import { PartaddressVO, PartaddressQuery, PartaddressForm } from '@/api/order/partaddress/types';
+import { listPartnerInfo } from '@/api/partner';
+import { regionData, codeToText } from 'element-china-area-data';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const regionOptions = ref(regionData);
+const selectedAddressRegion = ref<string[]>([]);
+const partnerOptions = ref<any[]>([]);
+
+const partaddressList = ref<PartaddressVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const partaddressFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const getPartnerNameList = async () => {
+  const res = await listPartnerInfo();
+  partnerOptions.value = res.rows || [];
+};
+
+const handlePartnerChange = (val: string | number) => {
+  const selected = partnerOptions.value.find(item => item.id === val);
+  if (selected) {
+    form.value.partnerNo = selected.partnerNo;
+    form.value.partnerName = selected.partnerName;
+  } else {
+    form.value.partnerNo = undefined;
+    form.value.partnerName = undefined;
+  }
+};
+
+const handleAddressRegionChange = (value: any) => {
+  if (value && value.length === 3) {
+    form.value.shippingProvincial = codeToText[value[0]];
+    form.value.shippingCity = codeToText[value[1]];
+    form.value.shippingCounty = codeToText[value[2]];
+  } else {
+    form.value.shippingProvincial = undefined;
+    form.value.shippingCity = undefined;
+    form.value.shippingCounty = undefined;
+  }
+};
+
+const initFormData: PartaddressForm = {
+  id: undefined,
+  partnerNo: undefined,
+  partnerId: undefined,
+  partnerName: undefined,
+  shippingCompany: undefined,
+  shipperName: undefined,
+  shipperPhone: undefined,
+  shippingPostCode: undefined,
+  shippingProvincial: undefined,
+  shippingCity: undefined,
+  shippingCounty: undefined,
+  shippingAddress: undefined,
+  pushStatus: undefined,
+  isSelf: undefined,
+  type: undefined,
+  addressNo: undefined,
+  status: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<PartaddressForm, PartaddressQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    partnerNo: undefined,
+    params: {
+    }
+  },
+  rules: {
+    partnerId: [{ required: true, message: "企业名称不能为空", trigger: "change" }],
+    shipperName: [{ required: true, message: "发货人姓名不能为空", trigger: "blur" }],
+    shipperPhone: [{ required: true, message: "发货人电话不能为空", trigger: "blur" }],
+    shippingProvincial: [{ required: true, message: "地址不能为空", trigger: "change" }],
+    shippingAddress: [{ required: true, message: "详细地址不能为空", trigger: "blur" }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询伙伴商地址列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listPartaddress(queryParams.value);
+  partaddressList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  selectedAddressRegion.value = [];
+  partaddressFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: PartaddressVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加伙伴商地址";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: PartaddressVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getPartaddress(_id);
+  Object.assign(form.value, res.data);
+  if (res.data.shippingProvincial && res.data.shippingCity && res.data.shippingCounty) {
+    try {
+      let pCode = '';
+      let cCode = '';
+      let dCode = '';
+
+      for (const p of regionOptions.value) {
+        if (p.label === res.data.shippingProvincial) {
+          pCode = p.value;
+          for (const c of p.children || []) {
+            if (c.label === res.data.shippingCity) {
+              cCode = c.value;
+              for (const d of c.children || []) {
+                if (d.label === res.data.shippingCounty) {
+                  dCode = d.value;
+                  break;
+                }
+              }
+              break;
+            }
+          }
+          break;
+        }
+      }
+
+      if (pCode && cCode && dCode) {
+        selectedAddressRegion.value = [pCode, cCode, dCode];
+      }
+    } catch (e) {
+      console.error('Failed to parse region codes', e);
+    }
+  }
+  dialog.visible = true;
+  dialog.title = "修改伙伴商地址";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  partaddressFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updatePartaddress(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addPartaddress(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: PartaddressVO) => {
+  const _ids = row?.id || ids.value;
+  proxy?.$modal.confirm('是否确认删除伙伴商地址编号为"' + _ids + '"的数据项?').then(async () => {
+    loading.value = true;
+    return await delPartaddress(_ids);
+  }).then(() => {
+    getList();
+    proxy?.$modal.msgSuccess("删除成功");
+  }).finally(() => {
+    loading.value = false;
+  });
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('partnerAddress/partaddress/export', {
+    ...queryParams.value
+  }, `partaddress_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+  getPartnerNameList();
+});
+</script>